copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

finish jingle file transfer session for files without hash

This commit is contained in:
Andrey Gursky 2016-12-15 23:41:14 +01:00 committed by Philipp Hörist
parent 21700051f8
commit 8c51eb72b9
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui_interface.py
View File

@ -988,11 +988,6 @@ class Interface:
session = gajim.connections[account].get_jingle_session(jid=None, session = gajim.connections[account].get_jingle_session(jid=None,
sid=file_props.sid) sid=file_props.sid)
ft_win = self.instances['file_transfers'] ft_win = self.instances['file_transfers']
if not file_props.hash_:
# We disn't get the hash, sender probably don't support that
jid = file_props.sender
self.popup_ft_result(account, jid, file_props)
ft_win.set_status(file_props, 'ok')
h = Hashes() h = Hashes()
try: try:
file_ = open(file_props.file_name, 'rb') file_ = open(file_props.file_name, 'rb')
@ -1027,14 +1022,25 @@ class Interface:
if file_props.stalled or file_props.paused: if file_props.stalled or file_props.paused:
return return
if file_props.type_ == 'r' and file_props.hash_: # we receive a file if file_props.type_ == 'r': # we receive a file
gajim.socks5queue.remove_receiver(file_props.sid, True, True) gajim.socks5queue.remove_receiver(file_props.sid, True, True)
# we compare hashes
if file_props.session_type == 'jingle': if file_props.session_type == 'jingle':
# Compare hashes in a new thread if file_props.hash_:
# We compare hashes in a new thread
self.hashThread = Thread(target=self.__compare_hashes, self.hashThread = Thread(target=self.__compare_hashes,
args=(account, file_props)) args=(account, file_props))
self.hashThread.start() self.hashThread.start()
else:
# We disn't get the hash, sender probably don't support that
jid = file_props.sender
self.popup_ft_result(account, jid, file_props)
ft.set_status(file_props, 'ok')
session = gajim.connections[account].get_jingle_session(jid=None,
sid=file_props.sid)
# End jingle session
# TODO: only if there are no other parallel downloads in this session
if session:
session.end_session()
else: # we send a file else: # we send a file
jid = file_props.receiver jid = file_props.receiver
gajim.socks5queue.remove_sender(file_props.sid, True, True) gajim.socks5queue.remove_sender(file_props.sid, True, True)