From 5981396ac4186698ce535f7a6d953147845c4103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Sun, 11 Nov 2018 10:40:48 +0100
Subject: [PATCH] Pass account to plugins when encrypting a file
---
gajim/common/modules/httpupload.py | 2 +-
gajim/gui_interface.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gajim/common/modules/httpupload.py b/gajim/common/modules/httpupload.py
index 97f16987fd..1cb6aaa135 100644
--- a/gajim/common/modules/httpupload.py
+++ b/gajim/common/modules/httpupload.py
@@ -167,7 +167,7 @@ class HTTPUpload:
return
if encryption is not None:
- app.interface.encrypt_file(file, self._request_slot)
+ app.interface.encrypt_file(file, self._account, self._request_slot)
else:
self._request_slot(file)
diff --git a/gajim/gui_interface.py b/gajim/gui_interface.py
index 07527541cd..e62646ac44 100644
--- a/gajim/gui_interface.py
+++ b/gajim/gui_interface.py
@@ -1141,13 +1141,13 @@ class Interface:
chat_control.session,
groupchat)
- def encrypt_file(self, file, callback):
+ def encrypt_file(self, file, account, callback):
app.nec.push_incoming_event(HTTPUploadProgressEvent(
None, status='encrypt', file=file))
encryption = file.encryption
plugin = app.plugin_manager.encryption_plugins[encryption]
if hasattr(plugin, 'encrypt_file'):
- plugin.encrypt_file(file, None, callback)
+ plugin.encrypt_file(file, account, callback)
else:
app.nec.push_incoming_event(HTTPUploadProgressEvent(
None, status='close', file=file))
--
GitLab