Commit 77f90fbe authored by Philipp Hörist's avatar Philipp Hörist
Browse files

[omemo] Make python-cryptography mandatory

parent c5e927eb
...@@ -30,7 +30,6 @@ from plugins import GajimPlugin ...@@ -30,7 +30,6 @@ from plugins import GajimPlugin
from plugins.helpers import log_calls from plugins.helpers import log_calls
from nbxmpp.simplexml import Node from nbxmpp.simplexml import Node
from nbxmpp import NS_CORRECT, NS_ADDRESS from nbxmpp import NS_CORRECT, NS_ADDRESS
from .file_decryption import FileDecryption
from .xmpp import ( from .xmpp import (
NS_NOTIFY, NS_OMEMO, NS_EME, BundleInformationAnnouncement, NS_NOTIFY, NS_OMEMO, NS_EME, BundleInformationAnnouncement,
...@@ -41,6 +40,7 @@ from .xmpp import ( ...@@ -41,6 +40,7 @@ from .xmpp import (
IQ_CALLBACK = {} IQ_CALLBACK = {}
CRYPTOGRAPHY_MISSING = 'You are missing Python-Cryptography'
AXOLOTL_MISSING = 'You are missing Python-Axolotl or use an outdated version' AXOLOTL_MISSING = 'You are missing Python-Axolotl or use an outdated version'
PROTOBUF_MISSING = 'OMEMO cant import Google Protobuf, you can find help in ' \ PROTOBUF_MISSING = 'OMEMO cant import Google Protobuf, you can find help in ' \
'the GitHub Wiki' 'the GitHub Wiki'
...@@ -55,6 +55,12 @@ DB_DIR_NEW = configpaths.gajimpaths['MY_DATA'] ...@@ -55,6 +55,12 @@ DB_DIR_NEW = configpaths.gajimpaths['MY_DATA']
log = logging.getLogger('gajim.plugin_system.omemo') 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: try:
import google.protobuf import google.protobuf
except Exception as e: except Exception as e:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment