Merge pull request #1921 from session-foundation/fix-delete-group-crash

Fix crashes when leaving a stuck state group

Author: ThomasSession

app/src/main/java/org/thoughtcrime/securesms/groups/GroupLeavingWorker.kt

@@ -140,15 +140,24 @@ class GroupLeavingWorker @AssistedInject constructor(
 
                     // We now have an admin option to leave group so we need a way of Deleting the group
                     // even if there are more admins
-                    if (weAreTheOnlyAdmin || deleteGroup) {
-                        configFactory.withMutableGroupConfigs(groupId) { configs ->
-                            configs.groupInfo.destroyGroup()
+                    if ((weAreTheOnlyAdmin || deleteGroup)) {
+                        try {
+                            configFactory.withMutableGroupConfigs(groupId) { configs ->
+                                configs.groupInfo.destroyGroup()
+                            }
+
+                            // Must wait until the config is pushed, otherwise if we go through the rest
+                            // of the code it will destroy the conversation, destroying the necessary configs
+                            // along the way, we won't be able to push the "destroyed" state anymore.
+                            configFactory.waitUntilGroupConfigsPushed(groupId, timeoutMills = 0L)
+                        } catch (e: CancellationException) {
+                            throw e
+                        } catch (e: Throwable) {
+                            // If the destruction of group can't be done, there's nothing
+                            // else we can do. So we will proceed with the rest where
+                            // we remove the group entry from the database.
+                            Log.e(TAG, "Error while destroying group $groupId. Proceeding...", e)
                         }
-
-                        // Must wait until the config is pushed, otherwise if we go through the rest
-                        // of the code it will destroy the conversation, destroying the necessary configs
-                        // along the way, we won't be able to push the "destroyed" state anymore.
-                        configFactory.waitUntilGroupConfigsPushed(groupId, timeoutMills = 0L)
                     }
                 }
 

gradle/libs.versions.toml

@@ -29,7 +29,7 @@ kotlinVersion = "2.3.0"
 kryoVersion = "5.6.2"
 kspVersion = "2.3.3"
 legacySupportV13Version = "1.0.0"
-libsessionUtilAndroidVersion = "1.1.0"
+libsessionUtilAndroidVersion = "1.1.0-5-gb9061a4"
 media3ExoplayerVersion = "1.8.0"
 mockitoCoreVersion = "5.21.0"
 navVersion = "2.9.6"