Merge branch 'dev' into techdebt/remove-guava

Author: ThomasSession

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt

@@ -1138,7 +1138,9 @@ class ConversationViewModel @AssistedInject constructor(
                 showMessage(application.getString(R.string.banUserBanned))
 
                 // ..so we can now delete all their messages in this thread from local storage & remove the views.
-                repository.deleteAllLocalMessagesInThreadFromSenderOfMessage(messageRecord)
+                withContext(Dispatchers.IO) {
+                    repository.deleteAllLocalMessagesInThreadFromSenderOfMessage(messageRecord)
+                }
             }
             .onFailure {
                 showMessage(application.getString(R.string.banErrorFailed))

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)
                     }
                 }
 

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

@@ -589,21 +589,19 @@ class GroupManagerV2Impl @Inject constructor(
             }
 
             // Send out the promote message to the members concurrently
-            val promoteMessage = GroupUpdated(
-                GroupUpdateMessage.newBuilder()
-                    .setPromoteMessage(
-                        GroupUpdatePromoteMessage.newBuilder()
-                            .setGroupIdentitySeed(ByteString.copyFrom(adminKey).substring(0, 32))
-                            .setName(groupName)
-                    )
-                    .build()
-            )
-
             val promotionDeferred = members.associateWith { member ->
                 async {
                     // The promotion message shouldn't be persisted to avoid being retried automatically
                     messageSender.sendNonDurably(
-                        message = promoteMessage,
+                        message = GroupUpdated(
+                            GroupUpdateMessage.newBuilder()
+                                .setPromoteMessage(
+                                    GroupUpdatePromoteMessage.newBuilder()
+                                        .setGroupIdentitySeed(ByteString.copyFrom(adminKey).substring(0, 32))
+                                        .setName(groupName)
+                                )
+                                .build()
+                        ),
                         address = Address.fromSerialized(member.hexString),
                         isSyncMessage = false,
                     )

gradle/libs.versions.toml

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