From 653e8200cae245ddbaf259e61ead766345b86eea Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Mon, 24 Jul 2023 15:10:33 -0400
Subject: [PATCH] Fixes a crash when onNewIntent is called before onCreate

---
 .../vitorpamplona/amethyst/ui/MainActivity.kt  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 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 e0161cff5..10060f348 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt
@@ -158,15 +158,17 @@ class MainActivity : AppCompatActivity() {
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
 
-        val uri = intent?.data?.toString()
-        val startingPage = uriToRoute(uri)
+        if (this::navController.isInitialized) {
+            val uri = intent?.data?.toString()
+            val startingPage = uriToRoute(uri)
 
-        startingPage?.let { route ->
-            val currentRoute = getRouteWithArguments(navController)
-            if (!isSameRoute(currentRoute, route)) {
-                navController.navigate(route) {
-                    popUpTo(Route.Home.route)
-                    launchSingleTop = true
+            startingPage?.let { route ->
+                val currentRoute = getRouteWithArguments(navController)
+                if (!isSameRoute(currentRoute, route)) {
+                    navController.navigate(route) {
+                        popUpTo(Route.Home.route)
+                        launchSingleTop = true
+                    }
                 }
             }
         }