hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[omemo] Fix file download

Browse Source
This commit is contained in:
lovetox
2021-01-08 23:34:59 +01:00
parent 5289feabde
commit 608fc71113
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
omemo/file_crypto.py
View File

@@ -23,7 +23,6 @@ from urllib.parse import urlparse, unquote
from gi.repository import GLib from gi.repository import GLib
from gi.repository import Soup from gi.repository import Soup
from gajim.common import app
from gajim.common import configpaths from gajim.common import configpaths
from gajim.common.helpers import write_file_async from gajim.common.helpers import write_file_async
from gajim.common.helpers import open_file from gajim.common.helpers import open_file
@@ -33,6 +32,7 @@ from gajim.common.filetransfer import FileTransfer
from gajim.plugins.plugins_i18n import _ from gajim.plugins.plugins_i18n import _
from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import DialogButton
from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.dialogs import ConfirmationDialog
from gajim.gui.filetransfer_progress import FileTransferProgress
from omemo.backend.aes import aes_decrypt_file from omemo.backend.aes import aes_decrypt_file
@@ -73,13 +73,13 @@ class FileDecryption:
file_path.parent.mkdir(mode=0o700, exist_ok=True) file_path.parent.mkdir(mode=0o700, exist_ok=True)
transfer = OMEMODownload(instance.account, transfer = OMEMODownload(instance.account,
self._cancel_download,
urlparts, urlparts,
file_path, file_path,
key, key,
iv) iv)
app.interface.show_httpupload_progress(transfer) transfer.connect('cancel', self._cancel_download)
FileTransferProgress(transfer)
self._download_content(transfer) self._download_content(transfer)
instance.plugin_modified = True instance.plugin_modified = True
@@ -93,9 +93,10 @@ class FileDecryption:
self._session.queue_message(message, self._on_finished, transfer) self._session.queue_message(message, self._on_finished, transfer)
def _cancel_download(self, transfer): def _cancel_download(self, transfer, _signalname):
message = transfer.get_soup_message() message = transfer.get_soup_message()
self._session.cancel_message(message, Soup.Status.CANCELLED) self._session.cancel_message(message, Soup.Status.CANCELLED)
transfer.set_cancelled()
@staticmethod @staticmethod
def _on_got_headers(message, transfer): def _on_got_headers(message, transfer):
@@ -212,8 +213,8 @@ class OMEMODownload(FileTransfer):
FTState.STARTED: _('Downloading…'), FTState.STARTED: _('Downloading…'),
} }
def __init__(self, account, cancel_func, urlparts, path, key, iv): def __init__(self, account, urlparts, path, key, iv):
FileTransfer.__init__(self, account, cancel_func=cancel_func) FileTransfer.__init__(self, account)
self._urlparts = urlparts self._urlparts = urlparts
self.path = path self.path = path