Fix TopBar visibility reset after onResume in MultiSelect

signalapp · Jan 11, 2025 · f3e9043 · f3e9043
1 parent 81af290
commit f3e9043
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
@@ -176,6 +176,10 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f
       .findViewById<View>(R.id.fragment_container)
       .findNavController()
       .addOnDestinationChangedListener(destinationChangedListener)
+
+    if(conversationListTabsViewModel.isMultiSelectOpen()) {
+      presentToolbarForMultiselect()
+    }
   }
 
   override fun onPause() {

diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/tabs/ConversationListTabsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/tabs/ConversationListTabsViewModel.kt
@@ -74,6 +74,10 @@ class ConversationListTabsViewModel(startingTab: ConversationListTab, repository
     performStoreUpdate { it.copy(visibilityState = it.visibilityState.copy(isMultiSelectOpen = true)) }
   }
 
+  fun isMultiSelectOpen(): Boolean {
+    return store.state.visibilityState.isMultiSelectOpen
+  }
+
   fun onMultiSelectFinished() {
     performStoreUpdate { it.copy(visibilityState = it.visibilityState.copy(isMultiSelectOpen = false)) }
   }