From 77f90fbe67b5ffcf27dbb25e2837ff9acd86b2b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Wed, 5 Apr 2017 20:06:26 +0200 Subject: [omemo] Make python-cryptography mandatory --- omemo/omemoplugin.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'omemo') diff --git a/omemo/omemoplugin.py b/omemo/omemoplugin.py index 055ffb7..eec31c5 100644 --- a/omemo/omemoplugin.py +++ b/omemo/omemoplugin.py @@ -30,7 +30,6 @@ from plugins import GajimPlugin from plugins.helpers import log_calls from nbxmpp.simplexml import Node from nbxmpp import NS_CORRECT, NS_ADDRESS -from .file_decryption import FileDecryption from .xmpp import ( NS_NOTIFY, NS_OMEMO, NS_EME, BundleInformationAnnouncement, @@ -41,6 +40,7 @@ from .xmpp import ( IQ_CALLBACK = {} +CRYPTOGRAPHY_MISSING = 'You are missing Python-Cryptography' AXOLOTL_MISSING = 'You are missing Python-Axolotl or use an outdated version' PROTOBUF_MISSING = 'OMEMO cant import Google Protobuf, you can find help in ' \ 'the GitHub Wiki' @@ -55,6 +55,12 @@ DB_DIR_NEW = configpaths.gajimpaths['MY_DATA'] log = logging.getLogger('gajim.plugin_system.omemo') +try: + from .file_decryption import FileDecryption +except Exception as e: + log.exception(e) + ERROR_MSG = CRYPTOGRAPHY_MISSING + try: import google.protobuf except Exception as e: -- cgit v1.2.3