Core: old invite codes ignored

sneerteam · Sep 25, 2015 · 1bfe4a1 · 1bfe4a1
1 parent 2cf1092
commit 1bfe4a1
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/core/src/main/clojure/sneer/convo.clj b/core/src/main/clojure/sneer/convo.clj
@@ -93,8 +93,13 @@
 ; SessionSummary(long id, String type, String title, String date, String unread)
 ; ChatMessage(long id, String text, boolean isOwn, String date)
 (defn- to-foreign [own-puk {:keys [id nick invite-code messages sessions]}]
-  (let [pretty-time (time/pretty-printer)]
-    (Convo. id nick (encode-invite own-puk invite-code)
+  (let [pretty-time (time/pretty-printer)
+        invite (if (seq messages)   ;Some contacts from old versions, for some reason, still have a pending invite code even after they have messages. In those cases we ignore the invite code.
+                 nil
+                 (encode-invite own-puk invite-code))]
+    (Convo. id
+            nick
+            invite
             (->ChatMessageList messages pretty-time)
             (->SessionSummaryList sessions pretty-time))))