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

[httpupload] Fail on missing python-cryptography

Browse Source 
Show an error message when OMEMO is activated,
but python-cryptography is missing
This commit is contained in:
Philipp Hörist
2017-04-05 17:24:19 +02:00
parent f329d17483
commit 1bfad56821
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
httpupload/httpupload.py
View File

@@ -163,8 +163,6 @@ class Base(object):
self.set_button_state(state, self.controls[jid]) self.set_button_state(state, self.controls[jid])
def encryption_activated(self, jid): def encryption_activated(self, jid):
if not ENCRYPTION_AVAILABLE:
return False
for plugin in gajim.plugin_manager.active_plugins: for plugin in gajim.plugin_manager.active_plugins:
if type(plugin).__name__ == 'OmemoPlugin': if type(plugin).__name__ == 'OmemoPlugin':
state = plugin.get_omemo_state(self.account) state = plugin.get_omemo_state(self.account)
@@ -196,6 +194,12 @@ class Base(object):
return return
encrypted = self.encryption_activated(jid) encrypted = self.encryption_activated(jid)
if encrypted and not ENCRYPTION_AVAILABLE:
ErrorDialog(
_('Error'),
'Please install python-cryptography for encrypted uploads',
transient_for=chat_control.parent_win.window)
return
size = os.path.getsize(path) size = os.path.getsize(path)
key, iv = None, None key, iv = None, None
if encrypted: if encrypted: