Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 21:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't exit multiselect mode when swapping screens.

Browse Source
This commit is contained in:
Alex Hart
2025-09-19 09:37:01 -03:00
committed by Jeffrey Starke
parent c901639ce8
commit 3df2fa53e8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/main/MainToolbarViewModel.kt
View File

@@ -83,7 +83,7 @@ class MainToolbarViewModel : ViewModel() {
fun isInActionMode(): Boolean = state.value.mode == MainToolbarMode.ACTION_MODE
fun presentToolbarForConversationListFragment() {
setToolbarMode(MainToolbarMode.FULL, destination = MainNavigationListLocation.CHATS, overwriteSearchMode = false)
setToolbarMode(MainToolbarMode.FULL, destination = MainNavigationListLocation.CHATS, overwriteExtraMode = false)
}
fun presentToolbarForConversationListArchiveFragment() {
@@ -113,16 +113,16 @@ class MainToolbarViewModel : ViewModel() {
fun setToolbarMode(
mode: MainToolbarMode,
destination: MainNavigationListLocation? = null,
overwriteSearchMode: Boolean = true
overwriteExtraMode: Boolean = true
) {
val previousMode = internalStateFlow.value.mode
val newMode = if (previousMode == MainToolbarMode.SEARCH && !overwriteSearchMode) {
val newMode = if ((previousMode == MainToolbarMode.SEARCH || previousMode == MainToolbarMode.ACTION_MODE) && !overwriteExtraMode) {
previousMode
} else {
mode
}
val newSearchQuery = if (previousMode == MainToolbarMode.SEARCH && !overwriteSearchMode) {
val newSearchQuery = if (previousMode == MainToolbarMode.SEARCH && !overwriteExtraMode) {
internalStateFlow.value.searchQuery
} else {
""