diff --git a/sat/plugins/plugin_xep_0384.py b/sat/plugins/plugin_xep_0384.py index 3ff6e370..01178f90 100644 --- a/sat/plugins/plugin_xep_0384.py +++ b/sat/plugins/plugin_xep_0384.py @@ -56,7 +56,7 @@ PLUGIN_INFO = { 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_DEVICES = NS_OMEMO + ".devicelist" NS_OMEMO_BUNDLE = NS_OMEMO + ".bundles:{device_id}" @@ -801,7 +801,7 @@ class OMEMO(object): expect_problems = {} cache = client._xep_0384_cache for problem in problems: - if isinstance(problem, omemo_excpt.UntrustedException): + if isinstance(problem, omemo_excpt.TrustException): untrusted[unicode(hash(problem))] = problem if isinstance(problem, omemo_excpt.MissingBundleException): pb_entity = jid.JID(problem.bare_jid) @@ -966,7 +966,7 @@ class OMEMO(object): try: try: plaintext = yield omemo_session.decryptMessage(**kwargs) - except omemo_excpt.UntrustedException: + except omemo_excpt.TrustException: post_treat.addCallback(client.encryption.markAsUntrusted) kwargs['allow_untrusted'] = True plaintext = yield omemo_session.decryptMessage(**kwargs) diff --git a/setup.py b/setup.py index f21946bf..24be1571 100644 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ install_requires = [ 'urwid >= 1.2.0', 'urwid-satext >= 0.6.1', 'wokkel >= 0.7.1', - 'omemo == 0.10.3', # FIXME: we block to this version until bĂȘta + 'omemo', 'omemo_backend_signal', ]