From 6ea96795cb7d6d376b13dd4aa10ebd6982cf1d01 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Tue, 9 Jun 2026 10:47:58 -0300 Subject: [PATCH] Fix detail pane state getting stuck after cancelled predictive back gesture. Co-authored-by: Greyson Parrelli --- .../securesms/main/MainNavigationViewModel.kt | 8 -------- .../thoughtcrime/securesms/window/AppScaffoldNavigator.kt | 4 ++++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationViewModel.kt index 8d7d826310..cdbde08bf2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationViewModel.kt @@ -382,13 +382,5 @@ class MainNavigationViewModel( } return result } - - override suspend fun seekBack(backNavigationBehavior: BackNavigationBehavior, fraction: Float) { - super.seekBack(backNavigationBehavior, fraction) - - if (fraction == 0f) { - lockPaneToSecondary = true - } - } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffoldNavigator.kt b/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffoldNavigator.kt index b1f14b3d7c..0c75554dd5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffoldNavigator.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffoldNavigator.kt @@ -58,6 +58,10 @@ open class AppScaffoldNavigator @RememberInComposition constructor(private va } override suspend fun seekBack(backNavigationBehavior: BackNavigationBehavior, fraction: Float) { + if (fraction == 0f && state == NavigationState.SEEK) { + state = NavigationState.ENTER + } + if (fraction > 0f && state != NavigationState.SEEK) { state = NavigationState.SEEK }