From 6cbee81e723ac64aea32f88110501ad92ac83d5d Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Wed, 2 Aug 2023 13:29:04 -0400
Subject: [PATCH] Moves onCreate intent evaluation to the App Navigation

---
 .../java/com/vitorpamplona/amethyst/ui/MainActivity.kt     | 3 ---
 .../vitorpamplona/amethyst/ui/navigation/AppNavigation.kt  | 7 ++++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt
index 85d688c6d..bf51126e9 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt
@@ -56,9 +56,6 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val uri = intent?.data?.toString()
-        val startingPage = uriToRoute(uri)
-
         LocalPreferences.migrateSingleUserPrefs()
         val language = LocalPreferences.getPreferredLanguage()
         if (language.isNotBlank()) {
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt
index 13bc33732..4bbf9a4f6 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt
@@ -65,7 +65,6 @@ fun AppNavigation(
 
     navController: NavHostController,
     accountViewModel: AccountViewModel,
-    startingPage: String? = null,
     themeViewModel: ThemeViewModel
 ) {
     val scope = rememberCoroutineScope()
@@ -250,7 +249,10 @@ fun AppNavigation(
         }
     }
 
-    var actionableNextPage by remember { mutableStateOf(startingPage) }
+    val activity = LocalContext.current.getActivity()
+    var actionableNextPage by remember {
+        mutableStateOf(uriToRoute(activity.intent?.data?.toString()?.ifBlank { null }))
+    }
     actionableNextPage?.let {
         LaunchedEffect(it) {
             navController.navigate(it) {
@@ -261,7 +263,6 @@ fun AppNavigation(
         actionableNextPage = null
     }
 
-    val activity = LocalContext.current.getActivity()
     DisposableEffect(navController) {
         val consumer = Consumer<Intent> { intent ->
             val uri = intent?.data?.toString()