# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1553069317 -3600
# Node ID 88f10630d5ea0234ed93ef733c0a795f22a6767f
# Parent  26d6ac4e4a66d8d6b33a4cfdf9df98cad7076ea4
plugin XEP-0384: removed version restriction, it is now compatible with (and require) last version of python-omemo (0.10.4)

diff -r 26d6ac4e4a66 -r 88f10630d5ea sat/plugins/plugin_xep_0384.py
--- a/sat/plugins/plugin_xep_0384.py	Sat Mar 16 14:39:02 2019 +0100
+++ b/sat/plugins/plugin_xep_0384.py	Wed Mar 20 09:08:37 2019 +0100
@@ -56,7 +56,7 @@
     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 @@
         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 @@
         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 -r 26d6ac4e4a66 -r 88f10630d5ea setup.py
--- a/setup.py	Sat Mar 16 14:39:02 2019 +0100
+++ b/setup.py	Wed Mar 20 09:08:37 2019 +0100
@@ -50,7 +50,7 @@
     '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',
 ]