Move try catch to the global handler

This way the same behavior is exercised both when using the lambda directly and when we use the LocalUriHandler composition local.
HedvigInsurance · Jan 8, 2025 · 3ca5964 · 3ca5964
1 parent 5e80aa4
commit 3ca5964
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/app/app/src/main/kotlin/com/hedvig/android/app/ui/HedvigApp.kt b/app/app/src/main/kotlin/com/hedvig/android/app/ui/HedvigApp.kt
@@ -106,14 +106,7 @@ internal fun HedvigApp(
           hedvigDeepLinkContainer = hedvigDeepLinkContainer,
           externalNavigator = externalNavigator,
           shouldShowRequestPermissionRationale = shouldShowRequestPermissionRationale,
-          openUrl = { uri ->
-            try {
-              deepLinkFirstUriHandler.openUri(uri)
-            } catch (e: IllegalArgumentException) {
-              logcat(LogPriority.ERROR) { "Tried to open uri: $uri but got IllegalArgumentException" }
-              // todo: not sure we need it, it's more for it not to crash while we still not getting proper uri for addon etc
-            }
-          },
+          openUrl = deepLinkFirstUriHandler::openUri,
           finishApp = finishApp,
           market = marketManager.market.collectAsStateWithLifecycle().value,
           imageLoader = imageLoader,

diff --git a/app/app/src/main/kotlin/com/hedvig/android/app/urihandler/DeepLinkFirstUriHandler.kt b/app/app/src/main/kotlin/com/hedvig/android/app/urihandler/DeepLinkFirstUriHandler.kt
@@ -3,6 +3,7 @@ package com.hedvig.android.app.urihandler
 import androidx.compose.ui.platform.UriHandler
 import androidx.core.net.toUri
 import androidx.navigation.NavController
+import com.hedvig.android.logger.LogPriority
 import com.hedvig.android.logger.logcat
 
 /**
@@ -14,13 +15,17 @@ internal class DeepLinkFirstUriHandler(
   private val delegate: UriHandler,
 ) : UriHandler {
   override fun openUri(uri: String) {
-    if (navController.graph.hasDeepLink(uri.toUri())) {
-      logcat { "DeepLinkFirstUriHandler will try to navigate to uri:$uri" }
-      navController.navigate(uri.toUri())
-      logcat { "DeepLinkFirstUriHandler did deep link to uri:$uri" }
-    } else {
-      logcat { "DeepLinkFirstUriHandler falling back to default UriHandler for uri:$uri" }
-      delegate.openUri(uri)
+    try {
+      if (navController.graph.hasDeepLink(uri.toUri())) {
+        logcat { "DeepLinkFirstUriHandler will try to navigate to uri:$uri" }
+        navController.navigate(uri.toUri())
+        logcat { "DeepLinkFirstUriHandler did deep link to uri:$uri" }
+      } else {
+        logcat { "DeepLinkFirstUriHandler falling back to default UriHandler for uri:$uri" }
+        delegate.openUri(uri)
+      }
+    } catch (e: IllegalArgumentException) {
+      logcat(LogPriority.ERROR) { "Tried to open uri: $uri but got IllegalArgumentException" }
     }
   }
 }