From 6fba1b0153a07becb50aa20c4ea302d326e16173 Mon Sep 17 00:00:00 2001 From: jeffrey-signal Date: Tue, 9 Dec 2025 09:26:57 -0500 Subject: [PATCH] Remove redundant total members count parameter from recipient picker callbacks. --- .../securesms/groups/ui/addmembers/AddMembersActivity.kt | 2 +- .../securesms/groups/ui/addtogroup/AddToGroupsActivity.kt | 2 +- .../groups/ui/creategroup/CreateGroupActivity.kt | 6 +++--- .../groups/ui/creategroup/CreateGroupViewModel.kt | 6 ++---- .../securesms/recipients/ui/RecipientPicker.kt | 8 +++----- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.kt index 32b7f68d7f..e06fbfd29c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.kt @@ -121,7 +121,7 @@ private fun AddMembersScreen( override fun onFindByUsername() = findByLauncher.launch(FindByMode.USERNAME) override fun onFindByPhoneNumber() = findByLauncher.launch(FindByMode.PHONE_NUMBER) override suspend fun shouldAllowSelection(selection: RecipientSelection): Boolean = viewModel.shouldAllowSelection(selection) - override fun onSelectionChanged(newSelections: List, totalMembersCount: Int) = viewModel.onSelectionChanged(newSelections) + override fun onSelectionChanged(newSelections: List) = viewModel.onSelectionChanged(newSelections) override fun onPendingRecipientSelectionsConsumed() = viewModel.clearPendingRecipientSelections() override fun onDoneClicked() = viewModel.addSelectedMembers() override fun onAddConfirmed(recipientIds: Set) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupsActivity.kt index 4517b85ed3..de38063ad9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupsActivity.kt @@ -101,7 +101,7 @@ private fun AddToGroupsScreen( val callbacks = remember { object : UiCallbacks { override fun onSearchQueryChanged(query: String) = viewModel.onSearchQueryChanged(query) - override fun onSelectionChanged(newSelections: List, totalMembersCount: Int) = viewModel.selectGroups(newSelections) + override fun onSelectionChanged(newSelections: List) = viewModel.selectGroups(newSelections) override fun addToSelectedGroups() = viewModel.addToSelectedGroups() override fun onAddConfirmed(groupRecipient: Recipient) = viewModel.addToGroups(listOf(groupRecipient)) override fun onUserMessageDismissed(userMessage: UserMessage) = viewModel.clearUserMessage() diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.kt index 040d81597c..8f80a8f3bf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.kt @@ -117,7 +117,7 @@ private fun CreateGroupScreen( override fun onFindByUsername() = findByLauncher.launch(FindByMode.USERNAME) override fun onFindByPhoneNumber() = findByLauncher.launch(FindByMode.PHONE_NUMBER) override suspend fun shouldAllowSelection(selection: RecipientSelection): Boolean = viewModel.shouldAllowSelection(selection) - override fun onSelectionChanged(newSelections: List, totalMembersCount: Int) = viewModel.onSelectionChanged(newSelections, totalMembersCount) + override fun onSelectionChanged(newSelections: List) = viewModel.onSelectionChanged(newSelections) override fun onPendingRecipientSelectionsConsumed() = viewModel.clearPendingRecipientSelections() override fun onNextClicked(): Unit = viewModel.continueToGroupDetails() override fun onUserMessageDismissed(userMessage: UserMessage) = viewModel.clearUserMessage() @@ -155,8 +155,8 @@ private fun CreateGroupScreenUi( val title = if (uiState.newSelections.isNotEmpty()) { pluralStringResource( id = R.plurals.CreateGroupActivity__s_members, - count = uiState.totalMembersCount, - NumberFormat.getInstance().format(uiState.totalMembersCount) + count = uiState.newSelections.size, + NumberFormat.getInstance().format(uiState.newSelections.size) ) } else { stringResource(R.string.CreateGroupActivity__select_members) diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupViewModel.kt index e2c82ae1a3..d5ee2d4123 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupViewModel.kt @@ -62,12 +62,11 @@ class CreateGroupViewModel : ViewModel() { } } - fun onSelectionChanged(newSelections: List, totalMembersCount: Int) { + fun onSelectionChanged(newSelections: List) { internalUiState.update { it.copy( searchQuery = "", - newSelections = newSelections, - totalMembersCount = totalMembersCount + newSelections = newSelections ) } } @@ -125,7 +124,6 @@ data class CreateGroupUiState( val searchQuery: String = "", val selectionLimits: SelectionLimits = RemoteConfig.groupLimits.excludingSelf(), val newSelections: List = emptyList(), - val totalMembersCount: Int = 0, val isLookingUpRecipient: Boolean = false, val pendingRecipientSelections: Set = emptySet(), val pendingDestination: NavTarget? = null, diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/RecipientPicker.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/RecipientPicker.kt index 5c89e3ee1c..6924f4c521 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/RecipientPicker.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/RecipientPicker.kt @@ -213,8 +213,7 @@ private fun RecipientSearchResultsList( callbacks.listActions.onPendingRecipientSelectionsConsumed() callbacks.listActions.onSelectionChanged( - newSelections = fragment.selectedContacts, - totalMembersCount = fragment.totalMemberCount + newSelections = fragment.selectedContacts ) } } @@ -290,8 +289,7 @@ private fun ContactSelectionListFragment.setUpCallbacks( override fun onSelectionChanged() { callbacks.listActions.onSelectionChanged( - newSelections = fragment.selectedContacts, - totalMembersCount = fragment.totalMemberCount + newSelections = fragment.selectedContacts ) } }) @@ -411,7 +409,7 @@ class RecipientPickerCallbacks( fun onSearchQueryChanged(query: String) suspend fun shouldAllowSelection(selection: RecipientSelection): Boolean fun onRecipientSelected(selection: RecipientSelection) - fun onSelectionChanged(newSelections: List, totalMembersCount: Int) = Unit + fun onSelectionChanged(newSelections: List) = Unit fun onPendingRecipientSelectionsConsumed() = Unit fun onContactsListReset() = Unit