From 698fb868a78ca7c5482fedfcfccf22b9a1be62a4 Mon Sep 17 00:00:00 2001 From: Percy Wegmann Date: Fri, 10 May 2024 08:01:14 -0500 Subject: [PATCH] android: only navigate to main if navController is initialized Updates #cleanup Signed-off-by: Percy Wegmann --- android/src/main/java/com/tailscale/ipn/MainActivity.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/android/src/main/java/com/tailscale/ipn/MainActivity.kt b/android/src/main/java/com/tailscale/ipn/MainActivity.kt index 5401b42..4759197 100644 --- a/android/src/main/java/com/tailscale/ipn/MainActivity.kt +++ b/android/src/main/java/com/tailscale/ipn/MainActivity.kt @@ -265,7 +265,9 @@ class MainActivity : ComponentActivity() { override fun onNewIntent(intent: Intent?) { super.onNewIntent(intent) if (intent?.getBooleanExtra(START_AT_ROOT, false) == true) { - navController.popBackStack(route = "main", inclusive = false) + if (this::navController.isInitialized) { + navController.popBackStack(route = "main", inclusive = false) + } } }