diff -Nru gajim-omemo-2.7.12/CHANGELOG gajim-omemo-2.7.13/CHANGELOG --- gajim-omemo-2.7.12/CHANGELOG 2020-12-27 00:54:48.000000000 +0000 +++ gajim-omemo-2.7.13/CHANGELOG 2021-01-11 00:05:36.000000000 +0000 @@ -1,3 +1,6 @@ +2.7.13 / 2021-01-08 +- Fix file download + 2.7.12 / 2020-12-06 - Adapt to Gajim changes diff -Nru gajim-omemo-2.7.12/debian/changelog gajim-omemo-2.7.13/debian/changelog --- gajim-omemo-2.7.12/debian/changelog 2020-12-31 16:40:11.000000000 +0000 +++ gajim-omemo-2.7.13/debian/changelog 2021-01-11 00:08:57.000000000 +0000 @@ -1,3 +1,9 @@ +gajim-omemo (2.7.13-1) unstable; urgency=medium + + * New upstream bug fix release: Fix file download + + -- Martin Mon, 11 Jan 2021 00:08:57 +0000 + gajim-omemo (2.7.12-2) unstable; urgency=medium * Re-upload to unstable diff -Nru gajim-omemo-2.7.12/debian/control gajim-omemo-2.7.13/debian/control --- gajim-omemo-2.7.12/debian/control 2020-12-31 16:40:07.000000000 +0000 +++ gajim-omemo-2.7.13/debian/control 2021-01-11 00:08:46.000000000 +0000 @@ -3,7 +3,7 @@ Uploaders: Martin Section: net Priority: optional -Build-Depends: debhelper-compat (= 11), +Build-Depends: debhelper-compat (= 12), dh-python, python3 Standards-Version: 4.1.4 @@ -15,7 +15,7 @@ Package: gajim-omemo Architecture: all Depends: ${misc:Depends}, - gajim (>= 1.2.91~), + gajim (>= 1.3.0~), python3-axolotl (>= 0.2.2~), python3-cryptography, python3-pkg-resources diff -Nru gajim-omemo-2.7.12/file_crypto.py gajim-omemo-2.7.13/file_crypto.py --- gajim-omemo-2.7.12/file_crypto.py 2020-12-27 00:54:48.000000000 +0000 +++ gajim-omemo-2.7.13/file_crypto.py 2021-01-11 00:05:36.000000000 +0000 @@ -23,7 +23,6 @@ from gi.repository import GLib from gi.repository import Soup -from gajim.common import app from gajim.common import configpaths from gajim.common.helpers import write_file_async from gajim.common.helpers import open_file @@ -33,6 +32,7 @@ from gajim.plugins.plugins_i18n import _ from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog +from gajim.gui.filetransfer_progress import FileTransferProgress from omemo.backend.aes import aes_decrypt_file @@ -73,13 +73,13 @@ file_path.parent.mkdir(mode=0o700, exist_ok=True) transfer = OMEMODownload(instance.account, - self._cancel_download, urlparts, file_path, key, iv) - app.interface.show_httpupload_progress(transfer) + transfer.connect('cancel', self._cancel_download) + FileTransferProgress(transfer) self._download_content(transfer) instance.plugin_modified = True @@ -93,9 +93,10 @@ 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() self._session.cancel_message(message, Soup.Status.CANCELLED) + transfer.set_cancelled() @staticmethod def _on_got_headers(message, transfer): @@ -212,8 +213,8 @@ FTState.STARTED: _('Downloading…'), } - def __init__(self, account, cancel_func, urlparts, path, key, iv): - FileTransfer.__init__(self, account, cancel_func=cancel_func) + def __init__(self, account, urlparts, path, key, iv): + FileTransfer.__init__(self, account) self._urlparts = urlparts self.path = path diff -Nru gajim-omemo-2.7.12/manifest.ini gajim-omemo-2.7.13/manifest.ini --- gajim-omemo-2.7.12/manifest.ini 2020-12-27 00:54:48.000000000 +0000 +++ gajim-omemo-2.7.13/manifest.ini 2021-01-11 00:05:36.000000000 +0000 @@ -1,7 +1,7 @@ [info] name: OMEMO short_name: omemo -version: 2.7.12 +version: 2.7.13 description: OMEMO is an XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption based on Axolotl and PEP. You need to install some dependencies, detailed in the installation instructions for your system in the GitLab wiki. authors: Bahtiar `kalkin-` Gadimov Daniel Gultsch