#1274 fix: after tapping the notification, do not navigate to the adv…

…anced triggers bottom sheet after a configuration change
keymapperorg · Dec 8, 2024 · de67923 · de67923
1 parent 8e02a62
commit de67923
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/app/src/main/java/io/github/sds100/keymapper/ActivityViewModel.kt b/app/src/main/java/io/github/sds100/keymapper/ActivityViewModel.kt
@@ -21,6 +21,7 @@ class ActivityViewModel(
     PopupViewModel by PopupViewModelImpl(),
     NavigationViewModel by NavigationViewModelImpl() {
 
+    var handledActivityLaunchIntent: Boolean = false
     var previousNightMode: Int? = null
 
     fun onCantFindAccessibilitySettings() {

diff --git a/app/src/main/java/io/github/sds100/keymapper/BaseMainActivity.kt b/app/src/main/java/io/github/sds100/keymapper/BaseMainActivity.kt
@@ -68,6 +68,10 @@ abstract class BaseMainActivity : AppCompatActivity() {
         // Must launch when the activity is resumed
         // so the nav controller can be found
         launchRepeatOnLifecycle(Lifecycle.State.RESUMED) {
+            if (viewModel.handledActivityLaunchIntent) {
+                return@launchRepeatOnLifecycle
+            }
+
             when (intent.action) {
                 ACTION_SHOW_ACCESSIBILITY_SETTINGS_NOT_FOUND_DIALOG -> {
                     viewModel.onCantFindAccessibilitySettings()
@@ -82,6 +86,8 @@ abstract class BaseMainActivity : AppCompatActivity() {
                     )
                 }
             }
+
+            viewModel.handledActivityLaunchIntent = true
         }
     }