fix: try to query ssid if we don't have a valid one yet

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/foreground/autotunnel/AutoTunnelService.kt

@@ -22,6 +22,7 @@ import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model.A
 import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model.AutoTunnelState
 import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model.NetworkState
 import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
+import com.zaneschepke.wireguardautotunnel.service.network.WifiService
 import com.zaneschepke.wireguardautotunnel.service.notification.NotificationAction
 import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
 import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
@@ -29,6 +30,7 @@ import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
 import com.zaneschepke.wireguardautotunnel.util.extensions.cancelWithMessage
+import com.zaneschepke.wireguardautotunnel.util.extensions.getCurrentWifiName
 import com.zaneschepke.wireguardautotunnel.util.extensions.isReachable
 import com.zaneschepke.wireguardautotunnel.util.extensions.onNotRunning
 import dagger.hilt.android.AndroidEntryPoint
@@ -240,7 +242,19 @@ class AutoTunnelService : LifecycleService() {
 			combineSettings(),
 			combineNetworkEventsJob(),
 		) { double, networkState ->
-			AutoTunnelState(tunnelService.get().vpnState.value, networkState, double.first, double.second)
+			// quick fix for bug where when first setting up auto tunneling we probably want to query for ssid right away
+			var netState: NetworkState? = null
+			if (networkState.wifiName == Constants.UNREADABLE_SSID && double.first.isTunnelOnWifiEnabled) {
+				if (double.first.isWifiNameByShellEnabled) {
+					netState = networkState.copy(wifiName = rootShell.get().getCurrentWifiName())
+				} else if (networkState.capabilities != null) {
+					netState = networkState.copy(
+						wifiName =
+						WifiService.getNetworkName(networkState.capabilities, this@AutoTunnelService),
+					)
+				}
+			}
+			AutoTunnelState(tunnelService.get().vpnState.value, netState ?: networkState, double.first, double.second)
 		}.collect { state ->
 			Timber.d("Network state: ${state.networkState}")
 			autoTunnelStateFlow.update {
@@ -265,6 +279,7 @@ class AutoTunnelService : LifecycleService() {
 				mobileData.available,
 				false,
 				wifi.name,
+				wifi.capabilities,
 			)
 		}.distinctUntilChanged().filterNot { it.isWifiConnected && it.wifiName == null }
 	}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/foreground/autotunnel/model/NetworkState.kt

@@ -1,8 +1,11 @@
 package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model
 
+import android.net.NetworkCapabilities
+
 data class NetworkState(
 	val isWifiConnected: Boolean = false,
 	val isMobileDataConnected: Boolean = false,
 	val isEthernetConnected: Boolean = false,
 	val wifiName: String? = null,
+	val capabilities: NetworkCapabilities? = null,
 )

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/network/EthernetService.kt

@@ -57,8 +57,8 @@ constructor(
 		emit(NetworkStatus.Unavailable())
 	}.map {
 		when (it) {
-			is NetworkStatus.Available, is NetworkStatus.CapabilitiesChanged -> Status(true, null)
+			is NetworkStatus.Available, is NetworkStatus.CapabilitiesChanged -> Status(true, null, null)
-			is NetworkStatus.Unavailable -> Status(false, null)
+			is NetworkStatus.Unavailable -> Status(false, null, null)
 		}
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/network/MobileDataService.kt

@@ -56,8 +56,8 @@ constructor(
 		emit(NetworkStatus.Unavailable())
 	}.map {
 		when (it) {
-			is NetworkStatus.Available, is NetworkStatus.CapabilitiesChanged -> Status(true, null)
+			is NetworkStatus.Available, is NetworkStatus.CapabilitiesChanged -> Status(true, null, null)
-			is NetworkStatus.Unavailable -> Status(false, null)
+			is NetworkStatus.Unavailable -> Status(false, null, null)
 		}
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/network/Status.kt

@@ -1,6 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.service.network
 
+import android.net.NetworkCapabilities
+
 data class Status(
 	val available: Boolean,
 	val name: String?,
+	val capabilities: NetworkCapabilities?,
 )

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/network/WifiService.kt

@@ -114,27 +114,32 @@ constructor(
 				if (available || ssid == null || ssid == Constants.UNREADABLE_SSID) {
 					available = false
 					Timber.d("Getting SSID from capabilities")
-					ssid = getNetworkName(it.networkCapabilities)
+					ssid = if (settingsRepository.getSettings().isWifiNameByShellEnabled) {
+						rootShell.get().getCurrentWifiName()
+					} else {
+						getNetworkName(it.networkCapabilities, context)
+					}
 				}
-				emit(Status(true, ssid))
+				emit(Status(true, ssid, it.networkCapabilities))
 			}
-			is NetworkStatus.Unavailable -> emit(Status(false, null))
+			is NetworkStatus.Unavailable -> emit(Status(false, null, null))
 		}
 	}
 
-	private suspend fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
+	companion object {
-		if (settingsRepository.getSettings().isWifiNameByShellEnabled) return rootShell.get().getCurrentWifiName()
+		fun getNetworkName(networkCapabilities: NetworkCapabilities, context: Context): String? {
-		var ssid = networkCapabilities.getWifiName()
+			var ssid = networkCapabilities.getWifiName()
-		if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
+			if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
-			val wifiManager =
+				val wifiManager =
-				context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+					context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
 
-			@Suppress("DEPRECATION")
+				@Suppress("DEPRECATION")
-			val info = wifiManager.connectionInfo
+				val info = wifiManager.connectionInfo
-			if (info.supplicantState === SupplicantState.COMPLETED) {
+				if (info.supplicantState === SupplicantState.COMPLETED) {
-				ssid = info.ssid
+					ssid = info.ssid
+				}
 			}
+			return ssid?.trim('"')
 		}
-		return ssid?.trim('"')
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/autotunnel/advanced/PeerActions.kt

@@ -1,5 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.advanced
-
-enum class PeerActions {
-	EXCLUDE_LAN,
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunneloptions/config/ConfigScreen.kt

@@ -66,8 +66,8 @@ import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavControll
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.advanced.InterfaceActions
+import com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions.config.model.InterfaceActions
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.advanced.PeerActions
+import com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions.config.model.PeerActions
 import com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions.config.model.InterfaceProxy
 import com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions.config.model.PeerProxy
 import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunneloptions/config/model/InterfaceActions.kt

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.advanced
+package com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions.config.model
 
 enum class InterfaceActions {
 	TOGGLE_AMNEZIA_VALUES,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunneloptions/config/model/PeerActions.kt

@@ -0,0 +1,5 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions.config.model
+
+enum class PeerActions {
+	EXCLUDE_LAN,
+}