Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 18:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when selecting a group to add a recipient.

Browse Source
This commit is contained in:
jeffrey-signal
2026-02-17 11:38:58 -05:00
committed by Alex Hart
parent 2c4d3b3ee4
commit b81c1eb65c
7 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchMediator.kt
View File

@@ -43,6 +43,7 @@ class ContactSearchMediator(
private val fragment: Fragment,
private val fixedContacts: Set<ContactSearchKey> = setOf(),
selectionLimits: SelectionLimits,
private val isMultiSelect: Boolean = true,
displayOptions: ContactSearchAdapter.DisplayOptions,
mapStateToConfiguration: (ContactSearchState) -> ContactSearchConfiguration,
private val callbacks: Callbacks = SimpleCallbacks(),
@@ -61,6 +62,7 @@ class ContactSearchMediator(
fragment,
ContactSearchViewModel.Factory(
selectionLimits = selectionLimits,
isMultiSelect = isMultiSelect,
repository = ContactSearchRepository(),
performSafetyNumberChecks = performSafetyNumberChecks,
arbitraryRepository = arbitraryRepository,

9
app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel.kt
View File

@@ -33,6 +33,7 @@ import org.whispersystems.signalservice.api.util.Preconditions
class ContactSearchViewModel(
private val savedStateHandle: SavedStateHandle,
private val selectionLimits: SelectionLimits,
private val isMultiSelect: Boolean,
private val contactSearchRepository: ContactSearchRepository,
private val performSafetyNumberChecks: Boolean,
private val arbitraryRepository: ArbitraryRepository?,
@@ -116,7 +117,11 @@ class ContactSearchViewModel(
safetyNumberRepository.batchSafetyNumberCheck(newSelectionEntries)
}
internalSelectedContacts.update { it + newSelectionEntries }
if (!isMultiSelect && newSelectionEntries.isNotEmpty()) {
internalSelectedContacts.update { newSelectionEntries.toSet() }
} else {
internalSelectedContacts.update { it + newSelectionEntries }
}
}
}
@@ -172,6 +177,7 @@ class ContactSearchViewModel(
class Factory(
private val selectionLimits: SelectionLimits,
private val isMultiSelect: Boolean = true,
private val repository: ContactSearchRepository,
private val performSafetyNumberChecks: Boolean,
private val arbitraryRepository: ArbitraryRepository?,
@@ -183,6 +189,7 @@ class ContactSearchViewModel(
ContactSearchViewModel(
savedStateHandle = handle,
selectionLimits = selectionLimits,
isMultiSelect = isMultiSelect,
contactSearchRepository = repository,
performSafetyNumberChecks = performSafetyNumberChecks,
arbitraryRepository = arbitraryRepository,