From efec40ff57439fcadb506978769b52437fe97273 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 14 Jul 2021 16:04:12 -0400
Subject: [PATCH] Fix crash with GV2 group repair during storage sync.

---
 .../java/org/thoughtcrime/securesms/database/GroupDatabase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
index 99fccef88..6c1745a33 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
@@ -466,7 +466,7 @@ private static final String[] GROUP_PROJECTION = {
     GroupId.V2 groupId = GroupId.v2(groupMasterKey);
 
     if (getGroupV1ByExpectedV2(groupId).isPresent()) {
-      throw new MissedGroupMigrationInsertException(groupId);
+      Log.w(TAG, "There already exists a V1 group that should be migrated into this group. But if the recipient already exists, there's not much we can do here.");
     }
 
     SQLiteDatabase db = databaseHelper.getWritableDatabase();