plugin XEP-0384: removed version restriction, it is now compatible with (and require) last version of python-omemo (0.10.4)
This commit is contained in:
parent
8ce1861529
commit
ace2f57027
2 changed files with 4 additions and 4 deletions
|
|
@ -56,7 +56,7 @@ PLUGIN_INFO = {
|
||||||
C.PI_DESCRIPTION: _(u"""Implementation of OMEMO"""),
|
C.PI_DESCRIPTION: _(u"""Implementation of OMEMO"""),
|
||||||
}
|
}
|
||||||
|
|
||||||
OMEMO_MIN_VER = (0, 10, 3)
|
OMEMO_MIN_VER = (0, 10, 4)
|
||||||
NS_OMEMO = "eu.siacs.conversations.axolotl"
|
NS_OMEMO = "eu.siacs.conversations.axolotl"
|
||||||
NS_OMEMO_DEVICES = NS_OMEMO + ".devicelist"
|
NS_OMEMO_DEVICES = NS_OMEMO + ".devicelist"
|
||||||
NS_OMEMO_BUNDLE = NS_OMEMO + ".bundles:{device_id}"
|
NS_OMEMO_BUNDLE = NS_OMEMO + ".bundles:{device_id}"
|
||||||
|
|
@ -801,7 +801,7 @@ class OMEMO(object):
|
||||||
expect_problems = {}
|
expect_problems = {}
|
||||||
cache = client._xep_0384_cache
|
cache = client._xep_0384_cache
|
||||||
for problem in problems:
|
for problem in problems:
|
||||||
if isinstance(problem, omemo_excpt.UntrustedException):
|
if isinstance(problem, omemo_excpt.TrustException):
|
||||||
untrusted[unicode(hash(problem))] = problem
|
untrusted[unicode(hash(problem))] = problem
|
||||||
if isinstance(problem, omemo_excpt.MissingBundleException):
|
if isinstance(problem, omemo_excpt.MissingBundleException):
|
||||||
pb_entity = jid.JID(problem.bare_jid)
|
pb_entity = jid.JID(problem.bare_jid)
|
||||||
|
|
@ -966,7 +966,7 @@ class OMEMO(object):
|
||||||
try:
|
try:
|
||||||
try:
|
try:
|
||||||
plaintext = yield omemo_session.decryptMessage(**kwargs)
|
plaintext = yield omemo_session.decryptMessage(**kwargs)
|
||||||
except omemo_excpt.UntrustedException:
|
except omemo_excpt.TrustException:
|
||||||
post_treat.addCallback(client.encryption.markAsUntrusted)
|
post_treat.addCallback(client.encryption.markAsUntrusted)
|
||||||
kwargs['allow_untrusted'] = True
|
kwargs['allow_untrusted'] = True
|
||||||
plaintext = yield omemo_session.decryptMessage(**kwargs)
|
plaintext = yield omemo_session.decryptMessage(**kwargs)
|
||||||
|
|
|
||||||
2
setup.py
2
setup.py
|
|
@ -50,7 +50,7 @@ install_requires = [
|
||||||
'urwid >= 1.2.0',
|
'urwid >= 1.2.0',
|
||||||
'urwid-satext >= 0.6.1',
|
'urwid-satext >= 0.6.1',
|
||||||
'wokkel >= 0.7.1',
|
'wokkel >= 0.7.1',
|
||||||
'omemo == 0.10.3', # FIXME: we block to this version until bêta
|
'omemo',
|
||||||
'omemo_backend_signal',
|
'omemo_backend_signal',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue