Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Malte L
gajim-plugins
Commits
77f90fbe
Commit
77f90fbe
authored
Apr 05, 2017
by
Philipp Hörist
Browse files
[omemo] Make python-cryptography mandatory
parent
c5e927eb
Changes
1
Hide whitespace changes
Inline
Side-by-side
omemo/omemoplugin.py
View file @
77f90fbe
...
@@ -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
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment