Fix : Manage members QA pt.4 (#1881)

* Send control message before exception

* Add sorting by accountId when showing new dialogs

* cleanup

* cleanup for readability

* Cleanups

Author: jbsession

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

@@ -622,39 +622,35 @@ class GroupManagerV2Impl @Inject constructor(
                     .mapNotNull { (member, result) ->
                         configs.groupMembers.get(member.hexString)?.apply {
                             if (result.isFailure) {
-                                configs.groupMembers.get(member.hexString)?.let { member ->
-                                    member.setPromotionFailed()
-                                    configs.groupMembers.set(member)
-                                }
+                                setPromotionFailed()
                             }
                         }
                     }
                     .forEach(configs.groupMembers::set)
             }
 
+            if (!isRepromote) {
+                messageSender.sendAndAwait(message, Address.fromSerialized(group.hexString))
+            }
+
             val failedMembers = promotedByMemberIDs
                 .filterValues { it.isFailure }
                 .keys
-                .toList()
+                .map { it.hexString }
 
             if (failedMembers.isNotEmpty()) {
                 val cause = promotedByMemberIDs.values
-                    .firstOrNull { it.isFailure }
-                    ?.exceptionOrNull()
+                    .firstOrNull { it.isFailure }?.exceptionOrNull()
                     ?: RuntimeException("Failed to promote ${failedMembers.size} member(s)")
 
                 throw GroupInviteException(
                     isPromotion = true,
-                    inviteeAccountIds = failedMembers.map { it.hexString },
+                    inviteeAccountIds = failedMembers,
                     groupName = groupName ?: "",
                     isReinvite = isRepromote,
                     underlying = cause
                 )
             }
-
-            if (!isRepromote) {
-                messageSender.sendAndAwait(message, Address.fromSerialized(group.hexString))
-            }
         }
     }
 

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

@@ -90,7 +90,8 @@ class InviteMembersViewModel @AssistedInject constructor(
         selected: Set<SelectedContact>,
     ): InviteContactsDialogState {
         val count = selected.size
-        val firstMember = selected.firstOrNull()
+        val sortedMembers = selected.sortedBy { it.address }
+        val firstMember = sortedMembers.firstOrNull()
 
         val body: CharSequence = when (count) {
             1 -> {
@@ -103,7 +104,7 @@ class InviteMembersViewModel @AssistedInject constructor(
                 }
             }
             2 -> {
-                val secondMember = selected.elementAtOrNull(1)?.name
+                val secondMember = sortedMembers.elementAtOrNull(1)?.name
                 Phrase.from(context, R.string.membersInviteShareDescriptionTwo)
                     .put(NAME_KEY, firstMember?.name)
                     .put(OTHER_NAME_KEY, secondMember)

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

@@ -303,7 +303,8 @@ class ManageGroupMembersViewModel @AssistedInject constructor(
         group: String
     ): RemoveMembersDialogState {
         val count = selected.size
-        val firstMember = selected.firstOrNull()
+        val sortedMembers = selected.sortedBy { it.accountId }
+        val firstMember = sortedMembers.firstOrNull()
 
         val body: CharSequence = when (count) {
             1 -> Phrase.from(context, R.string.groupRemoveDescription)
@@ -312,7 +313,7 @@ class ManageGroupMembersViewModel @AssistedInject constructor(
                 .format()
 
             2 -> {
-                val secondMember = selected.elementAtOrNull(1)?.name
+                val secondMember = sortedMembers.elementAtOrNull(1)?.name
                 Phrase.from(context, R.string.groupRemoveDescriptionTwo)
                     .put(NAME_KEY, firstMember?.name)
                     .put(OTHER_NAME_KEY, secondMember)

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

@@ -137,7 +137,8 @@ class PromoteMembersViewModel @AssistedInject constructor(
         selected: Set<GroupMemberState>
     ): String {
         val count = selected.size
-        val firstMember = selected.firstOrNull()
+        val sortedMembers = selected.sortedBy { it.accountId }
+        val firstMember = sortedMembers.firstOrNull()
 
         val body: CharSequence = when (count) {
             1 -> {
@@ -147,7 +148,7 @@ class PromoteMembersViewModel @AssistedInject constructor(
             }
 
             2 -> {
-                val secondMember = selected.elementAtOrNull(1)?.name
+                val secondMember = sortedMembers.elementAtOrNull(1)?.name
                 Phrase.from(context, R.string.adminPromoteTwoDescription)
                     .put(NAME_KEY, firstMember?.name)
                     .put(OTHER_NAME_KEY, secondMember)