From d50bb1df1d6d40ce793b51d909d178e3a678660e Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Sun, 2 Sep 2018 16:23:42 +0200
Subject: [PATCH] OMEMO: properly handle item-not-found in
 refreshRepublishDeviceList.

Fixes SMACK-830
---
 .../org/jivesoftware/smackx/omemo/OmemoService.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
index cb329f488..d29d3339c 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
@@ -46,6 +46,7 @@ import org.jivesoftware.smack.XMPPException;
 
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Stanza;
+import org.jivesoftware.smack.packet.StanzaError;
 import org.jivesoftware.smackx.carbons.packet.CarbonExtension;
 import org.jivesoftware.smackx.mam.MamManager;
 import org.jivesoftware.smackx.muc.MultiUserChat;
@@ -656,10 +657,20 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
 
         // refreshOmemoDeviceList;
         OmemoDeviceListElement publishedList;
+
         try {
             publishedList = fetchDeviceList(connection, userDevice.getJid());
         } catch (PubSubException.NotAPubSubNodeException e) {
+            // Node is not a PubSub node. This might happen on some ejabberd servers.
             publishedList = null;
+        } catch (XMPPException.XMPPErrorException e) {
+            if (e.getStanzaError().getCondition() == StanzaError.Condition.item_not_found) {
+                // Items not found -> items do not exist
+                publishedList = null;
+            } else {
+                // Some other error -> throw
+                throw e;
+            }
         }
         if (publishedList == null) {
             publishedList = new OmemoDeviceListElement_VAxolotl(Collections.<Integer>emptySet());