fix: nav backstack bug

app/src/main/java/com/zaneschepke/wireguardautotunnel/MainActivity.kt

@@ -357,7 +357,11 @@ class MainActivity : AppCompatActivity() {
 								}
 							}
 							BackHandler {
-								if (navController.previousBackStackEntry == null || !navController.popBackStack()) {
+								if (navController.currentDestination?.route != Route.Main::class.qualifiedName) {
+									if (!navController.popBackStack(Route.Main, false)) {
+										navController.goFromRoot(Route.Main)
+									}
+								} else {
 									this@MainActivity.finish()
 								}
 							}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/BaseTunnel.kt

@@ -69,7 +69,6 @@ abstract class BaseTunnel(
 					Timber.d("Skipping redundant state update for ${tunnelConf.id}: $newState")
 					current
 				} else {
-					Timber.d("Updating tunnel ${tunnelConf.id} in activeTunnels as state is $newState, with stats")
 					val updated = existingState.copy(
 						status = newState,
 						statistics = stats ?: existingState.statistics,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/TunnelRowItem.kt

@@ -60,20 +60,21 @@ fun TunnelRowItem(
 	val isTv = context.isRunningOnTv()
 
 	val leadingIconColor = if (!isActive) Color.Gray else tunnelState.statistics.asColor()
-	val leadingIcon = when {
+
-		tunnel.isPrimaryTunnel -> Icons.Rounded.Star
+	val (leadingIcon, size) = when {
-		tunnel.isMobileDataTunnel -> Icons.Rounded.Smartphone
+		tunnel.isPrimaryTunnel -> Pair(Icons.Rounded.Star, 16.dp)
-		tunnel.isEthernetTunnel -> Icons.Rounded.SettingsEthernet
+		tunnel.isMobileDataTunnel -> Pair(Icons.Rounded.Smartphone, 16.dp)
-		else -> Icons.Rounded.Circle
+		tunnel.isEthernetTunnel -> Pair(Icons.Rounded.SettingsEthernet, 16.dp)
+		else -> Pair(Icons.Rounded.Circle, 14.dp)
 	}
 
 	ExpandingRowListItem(
 		leading = {
 			Icon(
 				leadingIcon,
-				leadingIcon.name,
+				stringResource(R.string.status),
 				tint = leadingIconColor,
-				modifier = Modifier.size(16.dp),
+				modifier = Modifier.size(size),
 			)
 		},
 		text = tunnel.tunName,

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/UiExtensions.kt

@@ -1,21 +1,15 @@
 package com.zaneschepke.wireguardautotunnel.util.extensions
 
 import androidx.navigation.NavController
-import androidx.navigation.NavGraph.Companion.findStartDestination
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.isCurrentRoute
 
 fun NavController.goFromRoot(route: Route) {
 	if (currentBackStackEntry?.isCurrentRoute(route::class) == true) return
 	this.navigate(route) {
-		// Pop up to the start destination of the graph to
+		popUpTo(Route.Main) {
-		// avoid building up a large stack of destinations
-		// on the back stack as users select items
-		popUpTo(graph.findStartDestination().id) {
 			saveState = true
 		}
-		// Avoid multiple copies of the same destination when
-		// reselecting the same item
 		launchSingleTop = true
 	}
 }

app/src/main/res/values/strings.xml

@@ -246,4 +246,5 @@
 	<string name="service_running_error">service not running error</string>
     <string name="inactive">Inactive</string>
 	<string name="active">Active</string>
+	<string name="status">Status</string>
 </resources>

networkmonitor/src/main/java/com/zaneschepke/networkmonitor/AndroidNetworkMonitor.kt

@@ -131,10 +131,6 @@ class AndroidNetworkMonitor(
 				wifiConnected = false
 				trySend(WifiState(connected = false, ssid = null))
 			}
-
-			override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
-				Timber.d("Wi-Fi onCapabilitiesChanged: network=$network, networkCapabilities=$networkCapabilities")
-			}
 		}
 
 		val request = NetworkRequest.Builder()