From c54b91ee088273987e5df2adf772bd746ca5d5a7 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Sun, 29 May 2022 20:46:17 +0200
Subject: [PATCH] Revert SettingsActivity initial route behavior

---
 .../java/de/mm20/launcher2/ui/settings/SettingsActivity.kt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt
index 6d97d4fb..61349d03 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt
@@ -60,8 +60,9 @@ class SettingsActivity : BaseActivity() {
         setContent {
             val navController = rememberAnimatedNavController()
 
-            val initialRoute = remember {
-                intent.getStringExtra("de.mm20.launcher2.settings.ROUTE") ?: "settings"
+            LaunchedEffect(intent) {
+                intent.getStringExtra(EXTRA_ROUTE)
+                    ?.let { navController.navigate(it) }
             }
 
             val cardStyle by remember {
@@ -76,7 +77,7 @@ class SettingsActivity : BaseActivity() {
                 LauncherTheme {
                     AnimatedNavHost(
                         navController = navController,
-                        startDestination = initialRoute,
+                        startDestination = "settings",
                         exitTransition = { fadeOut(tween(300, 300)) },
                         enterTransition = { fadeIn(tween(200)) },
                         popEnterTransition = { fadeIn(tween(0)) },