Replace all call to navigateToUri with the catching one (#6294)

TimoPtr · web-flow · commit 6b497e66400e · 2026-01-21T19:43:53.000+01:00
* Replace all call to navigateToUri with the catching one

* Fix lint issue
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/OnboardingNavigation.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/OnboardingNavigation.kt
@@ -34,13 +34,13 @@ import io.homeassistant.companion.android.onboarding.serverdiscovery.navigation.
 import io.homeassistant.companion.android.onboarding.serverdiscovery.navigation.serverDiscoveryScreen
 import io.homeassistant.companion.android.onboarding.sethomenetwork.navigation.navigateToSetHomeNetworkRoute
 import io.homeassistant.companion.android.onboarding.sethomenetwork.navigation.setHomeNetworkScreen
+import io.homeassistant.companion.android.onboarding.wearmtls.navigation.URL_MTLS_DOCUMENTATION
 import io.homeassistant.companion.android.onboarding.wearmtls.navigation.navigateToWearMTLS
 import io.homeassistant.companion.android.onboarding.wearmtls.navigation.wearMTLSScreen
 import io.homeassistant.companion.android.onboarding.welcome.navigation.WelcomeRoute
 import io.homeassistant.companion.android.onboarding.welcome.navigation.welcomeScreen
 import io.homeassistant.companion.android.util.canGoBack
 import io.homeassistant.companion.android.util.compose.navigateToUri
-import io.homeassistant.companion.android.util.compose.navigateToUriCatching
 import kotlinx.serialization.Serializable
 
 @VisibleForTesting
@@ -132,7 +132,7 @@ internal fun NavGraphBuilder.onboarding(
                 }
             },
             onLearnMoreClick = {
-                navController.navigateToUri(URL_GETTING_STARTED_DOCUMENTATION)
+                navController.navigateToUri(URL_GETTING_STARTED_DOCUMENTATION, onShowSnackbar)
             },
         )
         commonScreens(navController = navController, onShowSnackbar = onShowSnackbar)
@@ -156,7 +156,7 @@ internal fun NavGraphBuilder.onboarding(
             },
             onShowSnackbar = onShowSnackbar,
             onHelpClick = {
-                navController.navigateToUri(URL_GETTING_STARTED_DOCUMENTATION)
+                navController.navigateToUri(URL_GETTING_STARTED_DOCUMENTATION, onShowSnackbar)
             },
         )
         localFirstScreen(
@@ -183,7 +183,7 @@ internal fun NavGraphBuilder.onboarding(
         )
         locationSharingScreen(
             onHelpClick = {
-                navController.navigateToUri(URL_GETTING_STARTED_DOCUMENTATION)
+                navController.navigateToUri(URL_GETTING_STARTED_DOCUMENTATION, onShowSnackbar)
             },
             onGotoNextScreen = { serverId, hasPlainTextAccess ->
                 navController.navigateToLocationForSecureConnectionConditionally(
@@ -199,7 +199,7 @@ internal fun NavGraphBuilder.onboarding(
         )
         locationForSecureConnectionScreen(
             onHelpClick = {
-                navController.navigateToUri(URL_SECURITY_LEVEL_DOCUMENTATION)
+                navController.navigateToUri(URL_SECURITY_LEVEL_DOCUMENTATION, onShowSnackbar)
             },
             onGotoNextScreen = { allowInsecureConnection, serverId ->
                 if (allowInsecureConnection) {
@@ -219,7 +219,7 @@ internal fun NavGraphBuilder.onboarding(
 
         setHomeNetworkScreen(
             onHelpClick = {
-                navController.navigateToUri(URL_SECURITY_LEVEL_DOCUMENTATION)
+                navController.navigateToUri(URL_SECURITY_LEVEL_DOCUMENTATION, onShowSnackbar)
             },
             onGotoNextScreen = {
                 onOnboardingDone()
@@ -257,7 +257,7 @@ private fun NavGraphBuilder.commonScreens(
         },
         onManualSetupClick = navController::navigateToManualServer,
         onHelpClick = {
-            navController.navigateToUri(URL_GETTING_STARTED_DOCUMENTATION)
+            navController.navigateToUri(URL_GETTING_STARTED_DOCUMENTATION, onShowSnackbar)
         },
     )
     manualServerScreen(
@@ -266,7 +266,7 @@ private fun NavGraphBuilder.commonScreens(
             navController.navigateToConnection(it.toString())
         },
         onHelpClick = {
-            navController.navigateToUri(URL_GETTING_STARTED_DOCUMENTATION)
+            navController.navigateToUri(URL_GETTING_STARTED_DOCUMENTATION, onShowSnackbar)
         },
     )
     connectionScreen(
@@ -295,7 +295,7 @@ private fun NavGraphBuilder.commonScreens(
         },
         onBackClick = navController::popBackStack,
         onOpenExternalLink = {
-            navController.navigateToUriCatching(it.toString(), onShowSnackbar = onShowSnackbar)
+            navController.navigateToUri(it.toString(), onShowSnackbar = onShowSnackbar)
         },
     )
 }
@@ -423,15 +423,13 @@ internal fun NavGraphBuilder.wearOnboarding(
                 }
             },
             onHelpClick = {
-                navController.navigateToUri(URL_GETTING_STARTED_DOCUMENTATION)
+                navController.navigateToUri(URL_GETTING_STARTED_DOCUMENTATION, onShowSnackbar)
             },
         )
         wearMTLSScreen(
             onBackClick = navController::popBackStack,
             onHelpClick = {
-                navController.navigateToUri(
-                    "https://companion.home-assistant.io/docs/getting_started/#tls-client-authentication",
-                )
+                navController.navigateToUri(URL_MTLS_DOCUMENTATION, onShowSnackbar)
             },
             onNext = onOnboardingDone,
         )
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/locationforsecureconnection/LocationForSecureConnectionScreen.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/locationforsecureconnection/LocationForSecureConnectionScreen.kt
@@ -64,7 +64,7 @@ private enum class SelectionKey {
 fun LocationForSecureConnectionScreen(
     viewModel: LocationForSecureConnectionViewModel,
     onGoToNextScreen: (allowInsecureConnection: Boolean) -> Unit,
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     onShowSnackbar: suspend (message: String, action: String?) -> Boolean,
     modifier: Modifier = Modifier,
     onBackClick: (() -> Unit)? = null,
@@ -92,7 +92,7 @@ fun LocationForSecureConnectionScreen(
 internal fun LocationForSecureConnectionScreen(
     initialAllowInsecureConnection: Boolean?,
     onAllowInsecureConnection: (allowInsecureConnection: Boolean) -> Unit,
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     onShowSnackbar: suspend (message: String, action: String?) -> Boolean,
     modifier: Modifier = Modifier,
     onBackClick: (() -> Unit)? = null,
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/locationforsecureconnection/navigation/LocationForSecureConnectionNavigation.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/locationforsecureconnection/navigation/LocationForSecureConnectionNavigation.kt
@@ -20,7 +20,7 @@ internal fun NavController.navigateToLocationForSecureConnection(serverId: Int,
 }
 
 internal fun NavGraphBuilder.locationForSecureConnectionScreen(
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     onGotoNextScreen: (allowInsecureConnection: Boolean, serverId: Int) -> Unit,
     onShowSnackbar: suspend (message: String, action: String?) -> Boolean,
 ) {
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/locationsharing/LocationSharingScreen.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/locationsharing/LocationSharingScreen.kt
@@ -40,7 +40,7 @@ private val MaxContentWidth = MaxButtonWidth
 
 @Composable
 internal fun LocationSharingScreen(
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     onGoToNextScreen: () -> Unit,
     viewModel: LocationSharingViewModel,
     modifier: Modifier = Modifier,
@@ -55,7 +55,7 @@ internal fun LocationSharingScreen(
 
 @Composable
 internal fun LocationSharingScreen(
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     onGoToNextScreen: () -> Unit,
     onLocationSharingResponse: (enabled: Boolean) -> Unit,
     modifier: Modifier = Modifier,
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/locationsharing/navigation/LocationSharingNavigation.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/locationsharing/navigation/LocationSharingNavigation.kt
@@ -21,7 +21,7 @@ internal fun NavController.navigateToLocationSharing(
 }
 
 internal fun NavGraphBuilder.locationSharingScreen(
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     onGotoNextScreen: (serverId: Int, hasPlainTextAccess: Boolean) -> Unit,
 ) {
     composable<LocationSharingRoute> {
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/manualserver/ManualServerScreen.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/manualserver/ManualServerScreen.kt
@@ -53,7 +53,7 @@ private val delayBeforeError = 500.milliseconds
 internal fun ManualServerScreen(
     onBackClick: () -> Unit,
     onConnectTo: (URL) -> Unit,
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     viewModel: ManualServerViewModel,
     modifier: Modifier = Modifier,
 ) {
@@ -79,7 +79,7 @@ internal fun ManualServerScreen(
     isServerUrlValid: Boolean,
     onBackClick: () -> Unit,
     onConnectClick: () -> Unit,
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     onServerUrlChange: (String) -> Unit,
     serverUrl: String,
     modifier: Modifier = Modifier,
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/manualserver/navigation/ManualServerNavigation.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/manualserver/navigation/ManualServerNavigation.kt
@@ -19,7 +19,7 @@ internal fun NavController.navigateToManualServer(navOptions: NavOptions? = null
 internal fun NavGraphBuilder.manualServerScreen(
     onBackClick: () -> Unit,
     onConnectTo: (URL) -> Unit,
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
 ) {
     composable<ManualServerRoute> {
         ManualServerScreen(
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/nameyourdevice/NameYourDeviceScreen.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/nameyourdevice/NameYourDeviceScreen.kt
@@ -46,7 +46,7 @@ import io.homeassistant.companion.android.util.compose.HAPreviews
 @Composable
 internal fun NameYourDeviceScreen(
     onBackClick: () -> Unit,
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     viewModel: NameYourDeviceViewModel,
     modifier: Modifier = Modifier,
 ) {
@@ -68,7 +68,7 @@ internal fun NameYourDeviceScreen(
 
 @Composable
 internal fun NameYourDeviceScreen(
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     onBackClick: () -> Unit,
     deviceName: String,
     onDeviceNameChange: (String) -> Unit,
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/nameyourdevice/navigation/NameYourDeviceNavigation.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/nameyourdevice/navigation/NameYourDeviceNavigation.kt
@@ -25,7 +25,7 @@ internal fun NavGraphBuilder.nameYourDeviceScreen(
     onBackClick: () -> Unit,
     onDeviceNamed: (serverId: Int, hasPlainTextAccess: Boolean, isPubliclyAccessible: Boolean) -> Unit,
     onShowSnackbar: suspend (message: String, action: String?) -> Boolean,
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
 ) {
     composable<NameYourDeviceRoute> {
         val viewModel: NameYourDeviceViewModel = hiltViewModel()
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/nameyourweardevice/navigation/NameYourWearDeviceNavigation.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/nameyourweardevice/navigation/NameYourWearDeviceNavigation.kt
@@ -35,7 +35,7 @@ internal fun NavController.navigateToNameYourWearDevice(
 
 internal fun NavGraphBuilder.nameYourWearDeviceScreen(
     onBackClick: () -> Unit,
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     onDeviceNamed: (deviceName: String, serverUrl: String, authCode: String, neededMTLS: Boolean) -> Unit,
 ) {
     composable<NameYourWearDeviceRoute> {
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/serverdiscovery/ServerDiscoveryScreen.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/serverdiscovery/ServerDiscoveryScreen.kt
@@ -95,7 +95,7 @@ private val MaxContentWidth = MaxButtonWidth
 internal fun ServerDiscoveryScreen(
     onBackClick: () -> Unit,
     onConnectClick: (server: URL) -> Unit,
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     onManualSetupClick: () -> Unit,
     viewModel: ServerDiscoveryViewModel,
     modifier: Modifier = Modifier,
@@ -119,7 +119,7 @@ internal fun ServerDiscoveryScreen(
     onBackClick: () -> Unit,
     onConnectClick: (server: URL) -> Unit,
     onDismissOneServerFound: () -> Unit,
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     onManualSetupClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/serverdiscovery/navigation/ServerDiscoveryNavigation.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/serverdiscovery/navigation/ServerDiscoveryNavigation.kt
@@ -38,7 +38,7 @@ internal fun NavController.navigateToServerDiscovery(
 internal fun NavGraphBuilder.serverDiscoveryScreen(
     onConnectClick: (server: URL) -> Unit,
     onBackClick: () -> Unit,
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     onManualSetupClick: () -> Unit,
 ) {
     composable<ServerDiscoveryRoute> {
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/sethomenetwork/SetHomeNetworkScreen.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/sethomenetwork/SetHomeNetworkScreen.kt
@@ -56,7 +56,7 @@ internal const val VPN_TAG = "vpn_tag"
 
 @Composable
 fun SetHomeNetworkScreen(
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     onGotoNextScreen: () -> Unit,
     viewModel: SetHomeNetworkViewModel,
     modifier: Modifier = Modifier,
@@ -85,7 +85,7 @@ fun SetHomeNetworkScreen(
 
 @Composable
 internal fun SetHomeNetworkScreen(
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     onNextClick: () -> Unit,
     currentWifiNetwork: String,
     onCurrentWifiNetworkChange: (String) -> Unit,
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/sethomenetwork/navigation/SetHomeNetworkNavigation.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/sethomenetwork/navigation/SetHomeNetworkNavigation.kt
@@ -15,7 +15,7 @@ internal fun NavController.navigateToSetHomeNetworkRoute(serverId: Int, navOptio
     navigate(SetHomeNetworkRoute(serverId), navOptions)
 }
 
-internal fun NavGraphBuilder.setHomeNetworkScreen(onGotoNextScreen: () -> Unit, onHelpClick: () -> Unit) {
+internal fun NavGraphBuilder.setHomeNetworkScreen(onGotoNextScreen: () -> Unit, onHelpClick: suspend () -> Unit) {
     composable<SetHomeNetworkRoute> {
         SetHomeNetworkScreen(
             onGotoNextScreen = onGotoNextScreen,
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/wearmtls/WearMTLSScreen.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/wearmtls/WearMTLSScreen.kt
@@ -56,7 +56,7 @@ private val MaxTextWidth = MaxButtonWidth
 
 @Composable
 internal fun WearMTLSScreen(
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     onBackClick: () -> Unit,
     onNext: (certUri: Uri, certPassword: String) -> Unit,
     viewModel: WearMTLSViewModel,
@@ -81,7 +81,7 @@ internal fun WearMTLSScreen(
 
 @Composable
 internal fun WearMTLSScreen(
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     onBackClick: () -> Unit,
     onNext: (certUri: Uri, certPassword: String) -> Unit,
     onPasswordChange: (String) -> Unit,
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/wearmtls/navigation/WearMTLSNavigation.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/wearmtls/navigation/WearMTLSNavigation.kt
@@ -10,6 +10,9 @@ import androidx.navigation.toRoute
 import io.homeassistant.companion.android.onboarding.wearmtls.WearMTLSScreen
 import kotlinx.serialization.Serializable
 
+internal const val URL_MTLS_DOCUMENTATION =
+    "https://companion.home-assistant.io/docs/getting_started/#tls-client-authentication"
+
 @Serializable
 internal class WearMTLSRoute(val deviceName: String, val serverUrl: String, val authCode: String)
 
@@ -26,7 +29,7 @@ internal fun NavController.navigateToWearMTLS(
 }
 
 internal fun NavGraphBuilder.wearMTLSScreen(
-    onHelpClick: () -> Unit,
+    onHelpClick: suspend () -> Unit,
     onBackClick: () -> Unit,
     onNext: (deviceName: String, serverUrl: String, authCode: String, certUri: Uri, certPassword: String) -> Unit,
 ) {
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/welcome/WelcomeScreen.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/welcome/WelcomeScreen.kt
@@ -17,6 +17,7 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
@@ -32,12 +33,17 @@ import io.homeassistant.companion.android.common.compose.theme.HATextStyle
 import io.homeassistant.companion.android.common.compose.theme.HAThemeForPreview
 import io.homeassistant.companion.android.common.compose.theme.MaxButtonWidth
 import io.homeassistant.companion.android.util.compose.HAPreviews
+import kotlinx.coroutines.launch
 
 private val ICON_SIZE = 120.dp
 private val MaxTextWidth = MaxButtonWidth
 
 @Composable
-internal fun WelcomeScreen(onConnectClick: () -> Unit, onLearnMoreClick: () -> Unit, modifier: Modifier = Modifier) {
+internal fun WelcomeScreen(
+    onConnectClick: () -> Unit,
+    onLearnMoreClick: suspend () -> Unit,
+    modifier: Modifier = Modifier,
+) {
     Column(
         modifier = modifier
             .fillMaxSize()
@@ -80,7 +86,9 @@ private fun ColumnScope.WelcomeText() {
 }
 
 @Composable
-private fun BottomButtons(onConnectClick: () -> Unit, onLearnMoreClick: () -> Unit) {
+private fun BottomButtons(onConnectClick: () -> Unit, onLearnMoreClick: suspend () -> Unit) {
+    val coroutineScope = rememberCoroutineScope()
+
     Column(
         modifier = Modifier.fillMaxWidth(),
         horizontalAlignment = Alignment.CenterHorizontally,
@@ -94,7 +102,11 @@ private fun BottomButtons(onConnectClick: () -> Unit, onLearnMoreClick: () -> Un
 
         HAPlainButton(
             text = stringResource(commonR.string.welcome_learn_more),
-            onClick = onLearnMoreClick,
+            onClick = {
+                coroutineScope.launch {
+                    onLearnMoreClick()
+                }
+            },
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(bottom = HADimens.SPACE6),
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/welcome/navigation/WelcomeNavigation.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/welcome/navigation/WelcomeNavigation.kt
@@ -14,7 +14,7 @@ internal fun NavController.navigateToWelcome(navOptions: NavOptions? = null) {
     navigate(route = WelcomeRoute, navOptions)
 }
 
-internal fun NavGraphBuilder.welcomeScreen(onConnectClick: () -> Unit, onLearnMoreClick: () -> Unit) {
+internal fun NavGraphBuilder.welcomeScreen(onConnectClick: () -> Unit, onLearnMoreClick: suspend () -> Unit) {
     composable<WelcomeRoute> {
         WelcomeScreen(onConnectClick = onConnectClick, onLearnMoreClick = onLearnMoreClick)
     }
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/util/compose/NavControllerExt.kt b/app/src/main/kotlin/io/homeassistant/companion/android/util/compose/NavControllerExt.kt
@@ -2,22 +2,19 @@ package io.homeassistant.companion.android.util.compose
 
 import androidx.compose.ui.platform.AndroidUriHandler
 import androidx.navigation.NavController
+import io.homeassistant.companion.android.BuildConfig
 import io.homeassistant.companion.android.common.R as commonR
 import timber.log.Timber
 
-fun NavController.navigateToUri(uri: String) {
-    AndroidUriHandler(context).openUri(uri)
-}
-
-suspend fun NavController.navigateToUriCatching(
+suspend fun NavController.navigateToUri(
     uri: String,
     onShowSnackbar: suspend (message: String, action: String?) -> Boolean,
 ) {
     try {
         AndroidUriHandler(context).openUri(uri)
     } catch (e: IllegalArgumentException) {
-        // Don't log e to not leak the URL in the log
-        Timber.e("Failed to navigate to uri")
+        // Don't log e in release to not leak the URL in the log
+        Timber.e(e.takeIf { BuildConfig.DEBUG }, "Failed to navigate to uri")
         onShowSnackbar(context.getString(commonR.string.fail_to_navigate_to_uri, uri), null)
     }
 }
diff --git a/app/src/test/kotlin/io/homeassistant/companion/android/onboarding/BaseOnboardingNavigationTest.kt b/app/src/test/kotlin/io/homeassistant/companion/android/onboarding/BaseOnboardingNavigationTest.kt
diff --git a/app/src/test/kotlin/io/homeassistant/companion/android/onboarding/WearOnboardingNavigationTest.kt b/app/src/test/kotlin/io/homeassistant/companion/android/onboarding/WearOnboardingNavigationTest.kt
diff --git a/app/src/test/kotlin/io/homeassistant/companion/android/onboarding/locationforsecureconnection/navigation/LocationForSecureConnectionNavigationTest.kt b/app/src/test/kotlin/io/homeassistant/companion/android/onboarding/locationforsecureconnection/navigation/LocationForSecureConnectionNavigationTest.kt
diff --git a/app/src/test/kotlin/io/homeassistant/companion/android/onboarding/manualserver/navigation/ManualServerNavigationTest.kt b/app/src/test/kotlin/io/homeassistant/companion/android/onboarding/manualserver/navigation/ManualServerNavigationTest.kt
diff --git a/app/src/test/kotlin/io/homeassistant/companion/android/onboarding/serverdiscovery/navigation/ServerDiscoveryNavigationTest.kt b/app/src/test/kotlin/io/homeassistant/companion/android/onboarding/serverdiscovery/navigation/ServerDiscoveryNavigationTest.kt
diff --git a/app/src/test/kotlin/io/homeassistant/companion/android/onboarding/sethomenetwork/navigation/SetHomeNetworkNavigationTest.kt b/app/src/test/kotlin/io/homeassistant/companion/android/onboarding/sethomenetwork/navigation/SetHomeNetworkNavigationTest.kt
diff --git a/app/src/test/kotlin/io/homeassistant/companion/android/onboarding/welcome/navigation/WelcomeNavigationTest.kt b/app/src/test/kotlin/io/homeassistant/companion/android/onboarding/welcome/navigation/WelcomeNavigationTest.kt
diff --git a/common/src/main/kotlin/io/homeassistant/companion/android/common/compose/composable/HATopBar.kt b/common/src/main/kotlin/io/homeassistant/companion/android/common/compose/composable/HATopBar.kt

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ internal fun NavController.navigateToLocationForSecureConnection(serverId: Int,`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`internal fun NavGraphBuilder.locationForSecureConnectionScreen(`
`23`		`- onHelpClick: () -> Unit,`
	`23`	`+ onHelpClick: suspend () -> Unit,`
`24`	`24`	`onGotoNextScreen: (allowInsecureConnection: Boolean, serverId: Int) -> Unit,`
`25`	`25`	`onShowSnackbar: suspend (message: String, action: String?) -> Boolean,`
`26`	`26`	`) {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ internal fun NavController.navigateToLocationSharing(`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`internal fun NavGraphBuilder.locationSharingScreen(`
`24`		`- onHelpClick: () -> Unit,`
	`24`	`+ onHelpClick: suspend () -> Unit,`
`25`	`25`	`onGotoNextScreen: (serverId: Int, hasPlainTextAccess: Boolean) -> Unit,`
`26`	`26`	`) {`
`27`	`27`	`composable<LocationSharingRoute> {`