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

Prevent search state from clearing if user did not send a message.

Browse Source
This commit is contained in:
Alex Hart
2025-04-24 16:24:21 -03:00
committed by Cody Henthorne
parent d6eb675fd0
commit 3aefd3bdc6
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
View File

@@ -141,7 +141,7 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f
}
private fun presentToolbarForConversationListFragment() {
toolbarViewModel.setToolbarMode(MainToolbarMode.FULL, destination = MainNavigationListLocation.CHATS)
toolbarViewModel.setToolbarMode(MainToolbarMode.FULL, destination = MainNavigationListLocation.CHATS, overwriteSearchMode = false)
}
private fun presentToolbarForConversationListArchiveFragment() {

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

@@ -74,14 +74,29 @@ class MainToolbarViewModel : ViewModel() {
}
@JvmOverloads
fun setToolbarMode(mode: MainToolbarMode, destination: MainNavigationListLocation? = null) {
fun setToolbarMode(
mode: MainToolbarMode,
destination: MainNavigationListLocation? = null,
overwriteSearchMode: Boolean = true
) {
val previousMode = internalStateFlow.value.mode
internalStateFlow.update {
it.copy(mode = mode, destination = destination ?: it.destination, searchQuery = "")
val newMode = if (previousMode == MainToolbarMode.SEARCH && !overwriteSearchMode) {
previousMode
} else {
mode
}
emitPossibleSearchStateChangeEvent(previousMode, mode)
val newSearchQuery = if (previousMode == MainToolbarMode.SEARCH && !overwriteSearchMode) {
internalStateFlow.value.searchQuery
} else {
""
}
internalStateFlow.update {
it.copy(mode = newMode, destination = destination ?: it.destination, searchQuery = newSearchQuery)
}
emitPossibleSearchStateChangeEvent(previousMode, newMode)
}
fun setProxyState(proxyState: MainToolbarState.ProxyState) {