fix getting info of file when receiving a file request
This commit is contained in:
parent
566273af2c
commit
7149a2c568
|
@ -2001,9 +2001,12 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
|
||||||
else:
|
else:
|
||||||
file_tag = desc.getTag('request').getTag('file')
|
file_tag = desc.getTag('request').getTag('file')
|
||||||
h = file_tag.getTag('hash')
|
h = file_tag.getTag('hash')
|
||||||
|
h = h.getData() if h else None
|
||||||
n = file_tag.getTag('name')
|
n = file_tag.getTag('name')
|
||||||
|
n = n.getData() if n else None
|
||||||
pjid = gajim.get_jid_without_resource(self.fjid)
|
pjid = gajim.get_jid_without_resource(self.fjid)
|
||||||
file_info = self.conn.get_file_info(pjid, hash_=h, name=n)
|
file_info = self.conn.get_file_info(pjid, hash_=h,
|
||||||
|
name=n,account=self.conn.name)
|
||||||
self.file_props.file_name = file_info['file-name']
|
self.file_props.file_name = file_info['file-name']
|
||||||
self.file_props.sender = self.conn._ft_get_our_jid()
|
self.file_props.sender = self.conn._ft_get_our_jid()
|
||||||
self.file_props.receiver = self.fjid
|
self.file_props.receiver = self.fjid
|
||||||
|
|
|
@ -161,7 +161,6 @@ class ConnectionJingle(object):
|
||||||
return c.transport.sid
|
return c.transport.sid
|
||||||
|
|
||||||
def __hash_support(self, contact):
|
def __hash_support(self, contact):
|
||||||
|
|
||||||
if contact.supports(xmpp.NS_HASHES):
|
if contact.supports(xmpp.NS_HASHES):
|
||||||
if contact.supports(xmpp.NS_HASHES_MD5):
|
if contact.supports(xmpp.NS_HASHES_MD5):
|
||||||
return 'md5'
|
return 'md5'
|
||||||
|
@ -171,7 +170,6 @@ class ConnectionJingle(object):
|
||||||
return 'sha-256'
|
return 'sha-256'
|
||||||
elif contact.supports(xmpp.NS_HASHES_SHA512):
|
elif contact.supports(xmpp.NS_HASHES_SHA512):
|
||||||
return 'sha-512'
|
return 'sha-512'
|
||||||
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def iter_jingle_sessions(self, jid, sid=None, media=None):
|
def iter_jingle_sessions(self, jid, sid=None, media=None):
|
||||||
|
@ -194,7 +192,7 @@ class ConnectionJingle(object):
|
||||||
# to be requested again.
|
# to be requested again.
|
||||||
self.files.append(file_)
|
self.files.append(file_)
|
||||||
|
|
||||||
def get_file_info(self, peerjid, hash_=None, name=None):
|
def get_file_info(self, peerjid, hash_=None, name=None, account=None):
|
||||||
if hash_:
|
if hash_:
|
||||||
for f in self.files: # DEBUG
|
for f in self.files: # DEBUG
|
||||||
#if f['hash'] == '1294809248109223':
|
#if f['hash'] == '1294809248109223':
|
||||||
|
|
|
@ -520,9 +520,12 @@ class JingleSession(object):
|
||||||
if request:
|
if request:
|
||||||
self.request = True
|
self.request = True
|
||||||
h = request.getTag('file').getTag('hash')
|
h = request.getTag('file').getTag('hash')
|
||||||
|
h = h.getData() if h else None
|
||||||
n = request.getTag('file').getTag('name')
|
n = request.getTag('file').getTag('name')
|
||||||
|
n = n.getData() if n else None
|
||||||
pjid = gajim.get_jid_without_resource(self.peerjid)
|
pjid = gajim.get_jid_without_resource(self.peerjid)
|
||||||
file_info = self.connection.get_file_info(pjid, h, n)
|
file_info = self.connection.get_file_info(pjid, h, n,
|
||||||
|
self.connection.name)
|
||||||
if not file_info:
|
if not file_info:
|
||||||
log.warning('The peer ' + pjid + \
|
log.warning('The peer ' + pjid + \
|
||||||
' is requesting a ' + \
|
' is requesting a ' + \
|
||||||
|
|
Loading…
Reference in New Issue