From 2391cffa978037132dcbeda53ad74478f9f486a6 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Fri, 13 Dec 2019 18:26:40 +0100
Subject: [PATCH] Avoid returning empty set of deviceIds in caching store

---
 .../org/jivesoftware/smackx/omemo/CachingOmemoStore.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/CachingOmemoStore.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/CachingOmemoStore.java
index 780951243..766141b5c 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/CachingOmemoStore.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/CachingOmemoStore.java
@@ -75,7 +75,13 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
         if (persistent != null) {
             return persistent.localDeviceIdsOf(localUser);
         } else {
-            return new TreeSet<>(); //TODO: ?
+            SortedSet<Integer> deviceIds = new TreeSet<>();
+            for (OmemoDevice device : caches.keySet()) {
+                if (device.getJid().equals(localUser)) {
+                    deviceIds.add(device.getDeviceId());
+                }
+            }
+            return deviceIds;
         }
     }