(android) Guard uri parsing in app view navigation

ACINQ · Dec 15, 2023 · fe17cfe · fe17cfe
1 parent 59e0e9a
commit fe17cfe
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/AppView.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/AppView.kt
@@ -172,7 +172,11 @@ fun AppView(
                         navArgument("next") { type = NavType.StringType; nullable = true }
                     ),
                 ) {
-                    val intent = it.arguments?.getParcelable<Intent>(NavController.KEY_DEEP_LINK_INTENT)
+                    val intent = try {
+                        it.arguments?.getParcelable<Intent>(NavController.KEY_DEEP_LINK_INTENT)
+                    } catch (e: Exception) {
+                        null
+                    }
                     val nextScreenLink = intent?.data?.getQueryParameter("next")?.decodeURLPart()
                     StartupView(
                         appVM = appVM,
@@ -244,7 +248,11 @@ fun AppView(
                         navDeepLink { uriPattern = "scanview:{data}" },
                     )
                 ) {
-                    val intent = it.arguments?.getParcelable<Intent>(NavController.KEY_DEEP_LINK_INTENT)
+                    val intent = try {
+                        it.arguments?.getParcelable<Intent>(NavController.KEY_DEEP_LINK_INTENT)
+                    } catch (e: Exception) {
+                        null
+                    }
                     RequireStarted(walletState, nextUri = "scanview:${intent?.data?.toString()}") {
                         val input = intent?.data?.toString()?.substringAfter("scanview:")?.takeIf {
                             // prevents forwarding an internal deeplink intent coming from androidx-navigation framework.