From 8465936715351078d81369f0c6a8c969ea02a919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= <pep@bouah.net>
Date: Fri, 30 Nov 2018 17:00:07 +0000
Subject: [PATCH] xep_0384: Handle NoEligibleDevicesException
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
---
 plugin.py | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/plugin.py b/plugin.py
index 0feda51..cc35166 100644
--- a/plugin.py
+++ b/plugin.py
@@ -8,7 +8,7 @@
 
 import logging
 
-from typing import Dict, List, Union
+from typing import Any, Dict, List, Union
 
 import os
 import json
@@ -26,7 +26,7 @@ log = logging.getLogger(__name__)
 
 HAS_OMEMO = True
 try:
-    from omemo.exceptions import MissingBundleException
+    from omemo.exceptions import MissingBundleException, NoEligibleDevicesException
     from omemo import SessionManager, ExtendedPublicBundle
     from omemo.util import generateDeviceID
     from omemo.backends import Backend
@@ -73,6 +73,9 @@ class XEP0384(Exception): pass
 class MissingOwnKey(XEP0384): pass
 
 
+class NoEligibleDevices(XEP0384): pass
+
+
 class XEP_0384(BasePlugin):
 
     """
@@ -280,6 +283,9 @@ class XEP_0384(BasePlugin):
         )
         return body
 
+    def _fetching_bundle(self, jid: str, exn: Exception, key: str, _val: Any) -> bool:
+        return isinstance(exn, MissingBundleException) and key == jid
+
     async def encrypt_message(self, plaintext: str, recipients: List[JID]) -> Encrypted:
         """
         Returns an encrypted payload to be placed into a message.
@@ -313,6 +319,22 @@ class XEP_0384(BasePlugin):
                     if bundle is not None:
                         devices = bundles.setdefault(key, {})
                         devices[val] = bundle
+                elif isinstance(exn, NoEligibleDevicesException):
+                    # This error is apparently returned every time the omemo
+                    # lib couldn't find a device to encrypt to for a
+                    # particular JID.
+                    # In case there is also an MissingBundleException in the
+                    # returned errors, ignore this and retry later, assuming
+                    # the fetching of the bundle succeeded. TODO: Ensure that it
+                    # did.
+                    # This exception is mostly useful when a contact does not
+                    # do OMEMO, or hasn't published any device list for any
+                    # other reason.
+
+                    if any(self._fetching_bundle(key, *err) for err in errors):
+                        continue
+
+                    raise NoEligibleDevices(key)
 
             break