From: AsamK <asamk@gmx.de>
Date: Fri, 27 Mar 2020 14:33:27 +0000 (+0100)
Subject: Fix potential crash that could happen when legacy thread.id is null or empty
X-Git-Tag: v0.6.6~4
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/416f43b225f20e6b40292d00e05ddd9733f3cc2d?ds=sidebyside

Fix potential crash that could happen when legacy thread.id is null or empty
---

diff --git a/src/main/java/org/asamk/signal/storage/SignalAccount.java b/src/main/java/org/asamk/signal/storage/SignalAccount.java
index ebf7a846..e806794f 100644
--- a/src/main/java/org/asamk/signal/storage/SignalAccount.java
+++ b/src/main/java/org/asamk/signal/storage/SignalAccount.java
@@ -203,6 +203,9 @@ public class SignalAccount {
             LegacyJsonThreadStore threadStore = jsonProcessor.convertValue(threadStoreNode, LegacyJsonThreadStore.class);
             // Migrate thread info to group and contact store
             for (ThreadInfo thread : threadStore.getThreads()) {
+                if (thread.id == null || thread.id.isEmpty()) {
+                    continue;
+                }
                 try {
                     ContactInfo contactInfo = contactStore.getContact(new SignalServiceAddress(null, thread.id));
                     if (contactInfo != null) {