From 11b6394a87b5292bde450d63d4e306616e662815 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 28 Apr 2020 10:38:25 -0400
Subject: [PATCH] Fix issue with group storage IDs.

---
 .../securesms/storage/StorageSyncHelper.java         | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
index 23cf903d67..1ebe8075e2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
@@ -117,7 +117,17 @@ public final class StorageSyncHelper {
 
     for (RecipientSettings insert : inserts) {
       storageInserts.add(StorageSyncModels.localToRemoteRecord(insert, archivedRecipients));
-      completeIds.add(StorageId.forContact(insert.getStorageId()));
+
+      switch (insert.getGroupType()) {
+        case NONE:
+          completeIds.add(StorageId.forContact(insert.getStorageId()));
+          break;
+        case SIGNAL_V1:
+          completeIds.add(StorageId.forGroupV1(insert.getStorageId()));
+          break;
+        default:
+          throw new AssertionError("Unsupported type!");
+      }
     }
 
     if (accountInsert.isPresent()) {