chore(deps): bump androidGradlePlugin

Bumps `androidGradlePlugin` from 8.8.0-alpha05 to 8.10.0-beta01.

Updates `com.android.application` from 8.8.0-alpha05 to 8.10.0-beta01

Updates `com.android.library` from 8.8.0-alpha05 to 8.10.0-beta01

---
updated-dependencies:
- dependency-name: com.android.application
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.android.library
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

README.md

@@ -4,7 +4,7 @@ WG Tunnel
 
 <div align="center">
 
-An alternative Android client app for [WireGuard®](https://www.wireguard.com/)
+An alternative Android client app for [WireGuard](https://www.wireguard.com/)
 and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 <br />
 <br />
@@ -23,14 +23,14 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 [![Google Play](https://img.shields.io/badge/Google_Play-414141?style=for-the-badge&logo=google-play&logoColor=white)](https://play.google.com/store/apps/details?id=com.zaneschepke.wireguardautotunnel)
 [![F-Droid](https://img.shields.io/static/v1?style=for-the-badge&message=F-Droid&color=1976D2&logo=F-Droid&logoColor=FFFFFF&label=)](https://f-droid.org/packages/com.zaneschepke.wireguardautotunnel/)
 [![Personal](https://img.shields.io/static/v1?style=for-the-badge&message=Personal&color=1976D2&logo=F-Droid&logoColor=FFFFFF&label=)](https://github.com/zaneschepke/fdroid)
+[![Obtainium](https://img.shields.io/badge/Obtainium-414141?style=for-the-badge&logo=Obtainium&logoColor=white)](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22com.zaneschepke.wireguardautotunnel%22%2C%22url%22%3A%22https%3A%2F%2Fgithub.com%2Fzaneschepke%2Fwgtunnel%22%2C%22author%22%3A%22zaneschepke%22%2C%22name%22%3A%22WG%20Tunnel%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22includePrereleases%5C%22%3Afalse%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22filterReleaseNotesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22verifyLatestTag%5C%22%3Atrue%2C%5C%22sortMethodChoice%5C%22%3A%5C%22date%5C%22%2C%5C%22useLatestAssetDateAsReleaseDate%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%2C%5C%22trackOnly%5C%22%3Afalse%2C%5C%22versionExtractionRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22matchGroupToUse%5C%22%3A%5C%22%5C%22%2C%5C%22versionDetection%5C%22%3Atrue%2C%5C%22releaseDateAsVersion%5C%22%3Afalse%2C%5C%22useVersionCodeAsOSVersion%5C%22%3Afalse%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22invertAPKFilter%5C%22%3Afalse%2C%5C%22autoApkFilterByArch%5C%22%3Atrue%2C%5C%22appName%5C%22%3A%5C%22WG%20Tunnel%5C%22%2C%5C%22appAuthor%5C%22%3A%5C%22Zane%20Schepke%5C%22%2C%5C%22shizukuPretendToBeGooglePlay%5C%22%3Afalse%2C%5C%22allowInsecure%5C%22%3Afalse%2C%5C%22exemptFromBackgroundUpdates%5C%22%3Afalse%2C%5C%22skipUpdateNotifications%5C%22%3Afalse%2C%5C%22about%5C%22%3A%5C%22%5C%22%2C%5C%22refreshBeforeDownload%5C%22%3Afalse%7D%22%2C%22overrideSource%22%3Anull%7D)
 
 </div>
 
 <div align="center">
 
-[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/rbRRNh6H7V)
-[![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/wgtunnel)
-
+[<img  src="https://img.shields.io/badge/Telegram-26A5E4.svg?style=for-the-badge&logo=Telegram&logoColor=white">](https://t.me/wgtunnel)
+[<img src="https://img.shields.io/badge/Matrix-000000.svg?style=for-the-badge&logo=Matrix&logoColor=white">](https://matrix.to/#/#wg-tunnel:matrix.zaneschepke.com)
 </div>
 
 <details open="open">
@@ -49,7 +49,7 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 <div style="text-align: left;">
 
 ## About
-Inspired by the official [wireguard-android](https://github.com/WireGuard/wireguard-android) app, WG Tunnel was created to address features and support missing from the official app. This app combines support for both [WireGuard®](https://www.wireguard.com/)
+Inspired by the official [wireguard-android](https://github.com/WireGuard/wireguard-android) app, WG Tunnel was created to address features and support missing from the official app. This app combines support for both [WireGuard](https://www.wireguard.com/)
 and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/), with its primary feature of auto-tunneling (on-demand tunneling).
 
 </div>
@@ -61,14 +61,14 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/), with its pr
 Thank you to the following:
 
 - All of the users that have helped contribute to the project with ideas, translations, feedback, bug reports, testing, and donations.
-- [WireGuard®](https://www.wireguard.com/) - © Jason A. Donenfeld (https://github.com/WireGuard/wireguard-android)
+- [WireGuard](https://www.wireguard.com/) - Jason A. Donenfeld (https://github.com/WireGuard/wireguard-android)
 
 - [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) - Amnezia Team (https://github.com/amnezia-vpn/amneziawg-android)
 
 ## Screenshots
 
 </div>
-<div style="display: flex; flex-wrap: wrap; justify-content: center; gap: 10px;">
+<div style="display: flex; flex-wrap: wrap; justify-content: left; gap: 10px;">
  <img label="Main" src="fastlane/metadata/android/en-US/images/phoneScreenshots/main_screen.png" width="200" />
  <img label="Settings" src="fastlane/metadata/android/en-US/images/phoneScreenshots/settings_screen.png" width="200" />
   <img label="Auto" src="fastlane/metadata/android/en-US/images/phoneScreenshots/auto_screen.png" width="200" />

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/service/ServiceManager.kt

@@ -4,8 +4,6 @@ import android.app.Service
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
-import com.zaneschepke.wireguardautotunnel.core.service.tile.AutoTunnelControlTile
-import com.zaneschepke.wireguardautotunnel.core.service.tile.TunnelControlTile
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
@@ -20,7 +18,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeoutOrNull
 import timber.log.Timber
 
@@ -36,8 +33,6 @@ class ServiceManager @Inject constructor(
 
 	var autoTunnelService = CompletableDeferred<AutoTunnelService>()
 	var backgroundService = CompletableDeferred<TunnelForegroundService>()
-	var autoTunnelTile = CompletableDeferred<AutoTunnelControlTile>()
-	var tunnelControlTile = CompletableDeferred<TunnelControlTile>()
 
 	private fun <T : Service> startService(cls: Class<T>, background: Boolean) {
 		runCatching {
@@ -65,15 +60,15 @@ class ServiceManager @Inject constructor(
 					?: throw IllegalStateException("AutoTunnelService start timed out")
 				service.start()
 				_autoTunnelActive.update { true }
-				updateAutoTunnelTile()
 			}.onFailure {
 				Timber.e(it)
 				_autoTunnelActive.update { false }
 			}
 		}
+		updateAutoTunnelTile()
 	}
 
-	fun startBackgroundService(tunnelConf: TunnelConf) {
+	fun startTunnelForegroundService(tunnelConf: TunnelConf) {
 		applicationScope.launch(ioDispatcher) {
 			if (backgroundService.isCompleted) return@launch
 			runCatching {
@@ -88,7 +83,19 @@ class ServiceManager @Inject constructor(
 		}
 	}
 
-	fun stopBackgroundService() {
+	fun updateTunnelForegroundServiceNotification(tunnelConf: TunnelConf) {
+		applicationScope.launch(ioDispatcher) {
+			if (!backgroundService.isCompleted) return@launch
+			runCatching {
+				val service = backgroundService.await()
+				service.start(tunnelConf)
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
+
+	fun stopTunnelForegroundService() {
 		applicationScope.launch(ioDispatcher) {
 			if (!backgroundService.isCompleted) return@launch
 			runCatching {
@@ -107,34 +114,12 @@ class ServiceManager @Inject constructor(
 		}
 	}
 
-	suspend fun updateAutoTunnelTile() {
-		withContext(ioDispatcher) {
-			runCatching {
-				val service = withTimeoutOrNull(SERVICE_START_TIMEOUT) { autoTunnelTile.await() }
-					?: run {
-						context.requestAutoTunnelTileServiceUpdate()
-						return@withContext
-					}
-				service.updateTileState()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
+	fun updateAutoTunnelTile() {
+		context.requestAutoTunnelTileServiceUpdate()
 	}
 
-	suspend fun updateTunnelTile() {
-		withContext(ioDispatcher) {
-			runCatching {
-				val service = withTimeoutOrNull(SERVICE_START_TIMEOUT) { tunnelControlTile.await() }
-					?: run {
-						context.requestTunnelTileServiceStateUpdate()
-						return@withContext
-					}
-				service.updateTileState()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
+	fun updateTunnelTile() {
+		context.requestTunnelTileServiceStateUpdate()
 	}
 
 	fun stopAutoTunnel() {

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/service/TunnelForegroundService.kt

@@ -49,12 +49,12 @@ class TunnelForegroundService : LifecycleService() {
 	}
 
 	fun stop() {
-		stopForeground(STOP_FOREGROUND_REMOVE)
 		stopSelf()
 	}
 
 	override fun onDestroy() {
 		serviceManager.backgroundService = CompletableDeferred()
+		ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
 		super.onDestroy()
 	}
 

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/service/tile/AutoTunnelControlTile.kt

@@ -4,57 +4,61 @@ import android.content.Intent
 import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class AutoTunnelControlTile : TileService() {
+class AutoTunnelControlTile : TileService(), LifecycleOwner {
 	@Inject
 	lateinit var appDataRepository: AppDataRepository
 
 	@Inject
 	lateinit var serviceManager: ServiceManager
 
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
+	private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
 
 	override fun onCreate() {
 		super.onCreate()
-		serviceManager.autoTunnelTile.complete(this)
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
 	}
 
 	override fun onDestroy() {
 		super.onDestroy()
-		serviceManager.autoTunnelTile = CompletableDeferred()
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
 	}
 
 	override fun onStartListening() {
 		super.onStartListening()
-		serviceManager.autoTunnelTile.complete(this)
-		applicationScope.launch {
-			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
-			updateTileState()
+		Timber.d("Start listening called for auto tunnel tile")
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
+		lifecycleScope.launch {
+			serviceManager.autoTunnelActive.collect {
+				if (it) setActive() else setInactive()
+			}
 		}
-	}
-
-	fun updateTileState() {
-		serviceManager.autoTunnelActive.value.let {
-			if (it) setActive() else setInactive()
+		lifecycleScope.launch {
+			appDataRepository.tunnels.flow.collect {
+				if (it.isEmpty()) {
+					setUnavailable()
+				} else {
+					if (qsTile.state == Tile.STATE_ACTIVE) setInactive()
+				}
+			}
 		}
 	}
 
 	override fun onClick() {
 		super.onClick()
 		unlockAndRun {
-			applicationScope.launch {
+			lifecycleScope.launch {
 				if (serviceManager.autoTunnelActive.value) {
 					serviceManager.stopAutoTunnel()
 					setInactive()
@@ -97,4 +101,7 @@ class AutoTunnelControlTile : TileService() {
 			qsTile.updateTile()
 		}
 	}
+
+	override val lifecycle: Lifecycle
+		get() = lifecycleRegistry
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/service/tile/TunnelControlTile.kt

@@ -5,58 +5,63 @@ import android.os.Build
 import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class TunnelControlTile : TileService() {
+class TunnelControlTile : TileService(), LifecycleOwner {
 	@Inject
 	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
-
 	@Inject
 	lateinit var serviceManager: ServiceManager
 
 	@Inject
 	lateinit var tunnelManager: TunnelManager
 
+	private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
+
+	private var isCollecting = false
+
 	override fun onCreate() {
 		super.onCreate()
-		serviceManager.tunnelControlTile.complete(this)
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
 	}
 
 	override fun onDestroy() {
 		super.onDestroy()
-		serviceManager.tunnelControlTile = CompletableDeferred()
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
 	}
 
 	override fun onStartListening() {
 		super.onStartListening()
-		Timber.d("Start listening called")
-		serviceManager.tunnelControlTile.complete(this)
-		applicationScope.launch {
-			updateTileState()
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
+		Timber.d("Start listening called for tunnel tile")
+		if (isCollecting) return
+		isCollecting = true
+		lifecycleScope.launch {
+			tunnelManager.activeTunnels.collect {
+				updateTileState()
+			}
 		}
 	}
 
-	fun updateTileState() = applicationScope.launch {
+	private fun updateTileState() = lifecycleScope.launch {
 		val tunnels = appDataRepository.tunnels.getAll()
 		if (tunnels.isEmpty()) return@launch setUnavailable()
 		with(tunnelManager.activeTunnels.value) {
 			if (isNotEmpty()) if (size == 1) {
-				tunnels.firstOrNull { it.id == keys.first() }?.let { return@launch updateTile(it.tunName, true) }
+				tunnels.firstOrNull { it.id == keys.first().id }?.let { return@launch updateTile(it.tunName, true) }
 			} else {
 				return@launch updateTile(getString(R.string.multiple), true)
 			}
@@ -69,7 +74,7 @@ class TunnelControlTile : TileService() {
 	override fun onClick() {
 		super.onClick()
 		unlockAndRun {
-			applicationScope.launch {
+			lifecycleScope.launch {
 				if (tunnelManager.activeTunnels.value.isNotEmpty()) return@launch tunnelManager.stopTunnel()
 				appDataRepository.getStartTunnelConfig()?.let {
 					tunnelManager.startTunnel(it)
@@ -132,4 +137,6 @@ class TunnelControlTile : TileService() {
 			Timber.e(it)
 		}
 	}
+	override val lifecycle: Lifecycle
+		get() = lifecycleRegistry
 }

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

@@ -1,5 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
+import com.wireguard.android.backend.BackendException
 import com.wireguard.android.backend.Tunnel
 import com.zaneschepke.networkmonitor.NetworkMonitor
 import com.zaneschepke.networkmonitor.NetworkStatus
@@ -8,12 +9,10 @@ import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider.Companion.CHECK_INTERVAL
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendError
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
@@ -23,23 +22,23 @@ import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
 import com.zaneschepke.wireguardautotunnel.util.extensions.cancelWithMessage
+import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
 import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.atomic.AtomicBoolean
 
-open class BaseTunnel(
+abstract class BaseTunnel(
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 	@ApplicationScope private val applicationScope: CoroutineScope,
 	private val networkMonitor: NetworkMonitor,
@@ -48,167 +47,71 @@ open class BaseTunnel(
 	private val notificationManager: NotificationManager,
 ) : TunnelProvider {
 
-	internal val tunnels = MutableStateFlow<List<TunnelConf>>(emptyList())
+	companion object {
+		const val CHECK_INTERVAL = 1000L
+	}
 
-	private val _tunnelStates = MutableStateFlow<Map<Int, TunnelState>>(emptyMap())
+	protected val activeTuns = MutableStateFlow<Map<TunnelConf, TunnelState>>(emptyMap())
+	override val activeTunnels = activeTuns.asStateFlow()
 
-	private val tunnelJobs = ConcurrentHashMap<Int, Job>()
+	private val tunnelJobs = ConcurrentHashMap<Int, MutableList<Job>>()
 
-	private val isNetworkAvailable = AtomicBoolean(false)
+	protected val mutex = Mutex()
+	private val isNetworkConnected = MutableStateFlow(true)
 
 	init {
 		applicationScope.launch(ioDispatcher) {
-			launch { startNetworkJob() }
+			launch { monitorNetworkStatus() }
 			launch { monitorTunnelConfigChanges() }
-			tunnels.collect { tuns ->
-				val previousTunIds = tunnelJobs.keys.toSet()
-				val currentTunIds = tuns.map { it.id }.toSet()
-				val newTuns = tuns.filter { it.id !in previousTunIds }
-				val removedTunIds = previousTunIds - currentTunIds
-
-				newTuns.forEach { tun ->
-					Timber.d("Starting tunnel jobs for tun ${tun.name} (ID: ${tun.id})")
-					tunnelJobs[tun.id] = startTunnelJobs(tun)
-				}
-
-				removedTunIds.forEach { tunId ->
-					tunnelJobs[tunId]?.cancelWithMessage("Canceling tunnel jobs for tunnel ID: $tunId")
-					tunnelJobs.remove(tunId)
-					_tunnelStates.update { it - tunId }
-					serviceManager.updateTunnelTile()
-				}
-			}
 		}
 	}
 
-	private fun startTunnelJobs(tunnel: TunnelConf) = applicationScope.launch(ioDispatcher) {
-		launch { startTunnelStatisticsJob(tunnel) }
-		if (tunnel.isPingEnabled) launch { startPingJob(tunnel) }
-	}
-
-	private fun updateTunnelState(tunnelId: Int, newState: TunnelStatus) {
-		Timber.d("Updating tunnel state for ID $tunnelId to $newState")
-		_tunnelStates.update { current ->
-			val currentState = current[tunnelId]
-			val updatedState = currentState?.copy(state = newState) ?: TunnelState(state = newState)
-			val newMap = current + (tunnelId to updatedState)
-			Timber.d("New tunnel states: $newMap")
-			newMap
+	private fun startTunnelJobs(tunnel: TunnelConf): Job {
+		return applicationScope.launch(ioDispatcher) {
+			val jobs = mutableListOf<Job>()
+			jobs += launch { updateTunnelStatistics(tunnel) }
+			if (tunnel.isPingEnabled) jobs += launch { monitorTunnelPing(tunnel) }
+			jobs.forEach { it.join() }
 		}
 	}
 
-	internal fun beforeStartTunnel(tunnelConf: TunnelConf) {
-		tunnelConf.setStateChangeCallback { state ->
-			Timber.d("New tunnel state $state")
-			when (state) {
-				is Tunnel.State -> updateTunnelState(tunnelConf.id, state.asTunnelState())
-				is org.amnezia.awg.backend.Tunnel.State -> updateTunnelState(tunnelConf.id, state.asTunnelState())
-			}
-			applicationScope.launch(ioDispatcher) {
-				serviceManager.updateTunnelTile()
-			}
-		}
-	}
-
-	override fun startTunnel(tunnelConf: TunnelConf) {
-		applicationScope.launch(ioDispatcher) {
-			serviceManager.startBackgroundService(tunnelConf)
-			appDataRepository.tunnels.save(tunnelConf.copy(isActive = true))
-			addToActiveTunnels(tunnelConf)
-		}
-	}
-
-	override fun stopTunnel(tunnelConf: TunnelConf?) {
-		// Default empty implementation; subclasses override
-	}
-
-	override suspend fun bounceTunnel(tunnelConf: TunnelConf) {
-		stopTunnel(tunnelConf)
-		delay(1000)
-		startTunnel(tunnelConf)
-	}
-
-	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-		// Default empty implementation
-	}
-
-	override suspend fun runningTunnelNames(): Set<String> {
-		return emptySet()
-	}
-
-	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
-		throw NotImplementedError("Get statistics not implemented in base class")
-	}
-
-	override val activeTunnels: StateFlow<Map<Int, TunnelState>>
-		get() = _tunnelStates.asStateFlow()
-
-	internal suspend fun onTunnelStop(tunnelConf: TunnelConf) {
-		appDataRepository.tunnels.save(tunnelConf.copy(isActive = false))
-		removeFromActiveTunnels(tunnelConf)
-		if (tunnels.value.isEmpty()) serviceManager.stopBackgroundService()
-	}
-
-	internal fun stopAllTunnels() {
-		tunnels.value.forEach {
-			stopTunnel(it)
-		}
-	}
-
-	private fun addToActiveTunnels(conf: TunnelConf) {
-		tunnels.update {
-			it.toMutableList().apply {
-				add(conf)
-			}
-		}
-	}
-
-	private fun removeFromActiveTunnels(conf: TunnelConf) {
-		tunnels.update {
-			it.toMutableList().apply {
-				remove(conf)
-			}
-		}
-	}
-
-	private suspend fun startNetworkJob() = coroutineScope {
-		networkMonitor.getNetworkStatusFlow(includeWifiSsid = false, useRootShell = false)
-			.flowOn(ioDispatcher).collect {
-				isNetworkAvailable.set(it !is NetworkStatus.Disconnected)
-			}
-	}
-
-	private suspend fun startPingJob(tunnel: TunnelConf) = coroutineScope {
-		while (isActive) {
+	private suspend fun updateTunnelStatistics(tunnel: TunnelConf) {
+		while (true) {
 			runCatching {
-				if (isNetworkAvailable.get() && tunnel.isActive) {
+				val stats = getStatistics(tunnel)
+				updateTunnelState(tunnel, stats = stats)
+			}.onFailure { e ->
+				Timber.e(e, "Failed to update stats for ${tunnel.tunName}")
+			}
+			delay(CHECK_INTERVAL)
+		}
+	}
+
+	private suspend fun monitorTunnelPing(tunnel: TunnelConf) {
+		while (true) {
+			runCatching {
+				if (isNetworkConnected.value && tunnel.isActive) {
 					val pingSuccess = tunnel.isTunnelPingable(ioDispatcher)
-					handlePingResult(tunnel, pingSuccess)
+					if (!pingSuccess) bounceTunnel(tunnel)
 				}
-				delay(tunnel.pingInterval ?: Constants.PING_INTERVAL)
+			}.onFailure { e ->
+				Timber.e(e, "Ping failed for ${tunnel.tunName}")
 			}
+			delay(tunnel.pingInterval ?: Constants.PING_INTERVAL)
 		}
 	}
 
-	private suspend fun handlePingResult(tunnel: TunnelConf, pingSuccess: Boolean) {
-		if (!pingSuccess) {
-			if (isNetworkAvailable.get()) {
-				Timber.i("Ping result: target was not reachable, bouncing the tunnel")
-				bounceTunnel(tunnel)
-				delay(tunnel.pingCooldown ?: Constants.PING_COOLDOWN)
-			} else {
-				Timber.i("Ping result: target was not reachable, but no network available")
-			}
-		} else {
-			Timber.i("Ping result: all ping targets were reached successfully")
+	protected fun handleBackendThrowable(throwable: Throwable) {
+		val backendError = when (throwable) {
+			is BackendException -> throwable.toBackendError()
+			is org.amnezia.awg.backend.BackendException -> throwable.toBackendError()
+			else -> BackendError.Unknown
 		}
-	}
-
-	internal fun handleBackendThrowable(backendError: BackendError) {
 		val message = when (backendError) {
 			BackendError.Config -> StringValue.StringResource(R.string.start_failed_config)
 			BackendError.DNS -> StringValue.StringResource(R.string.dns_error)
 			BackendError.Unauthorized -> StringValue.StringResource(R.string.unauthorized)
+			BackendError.Unknown -> StringValue.StringResource(R.string.unknown_error)
 		}
 		if (WireGuardAutoTunnel.isForeground()) {
 			SnackbarController.showMessage(message)
@@ -224,33 +127,133 @@ open class BaseTunnel(
 		}
 	}
 
-	private suspend fun monitorTunnelConfigChanges() = coroutineScope {
-		appDataRepository.tunnels.flow.collect { storageTuns ->
-			storageTuns.forEach { storageTun ->
-				val currentTun = tunnels.value.firstOrNull { it.id == storageTun.id }
-				if (currentTun != null) {
-					if (!currentTun.isQuickConfigMatching(storageTun)) {
-						Timber.d("Tunnel config changed for ID $storageTun, bouncing tunnel")
-						bounceTunnel(storageTun)
+	protected fun updateTunnelState(tunnelConf: TunnelConf, state: TunnelStatus? = null, stats: TunnelStatistics? = null) {
+		applicationScope.launch(ioDispatcher) {
+			mutex.withLock {
+				activeTuns.update { current ->
+					val originalConf = current.getKeyById(tunnelConf.id) ?: tunnelConf
+					val existingState = current.getValueById(tunnelConf.id) ?: TunnelState()
+					val newState = state ?: existingState.state
+					if (newState == TunnelStatus.DOWN) {
+						// Remove tunnel from activeTunnels when it goes DOWN
+						Timber.d("Removing tunnel ${tunnelConf.id} from activeTunnels as state is DOWN")
+						current - originalConf
+					} else if (existingState.state == newState && stats == null) {
+						Timber.d("Skipping redundant state update for ${tunnelConf.id}: $newState")
+						current
+					} else {
+						val updated = existingState.copy(
+							state = newState,
+							statistics = stats ?: existingState.statistics,
+						)
+						current + (originalConf to updated)
 					}
 				}
 			}
 		}
 	}
 
-	private suspend fun startTunnelStatisticsJob(tunnel: TunnelConf) = coroutineScope {
-		while (this.isActive) {
-			runCatching {
-				val stats = getStatistics(tunnel)
-				_tunnelStates.update { currentStates ->
-					val updatedState = currentStates[tunnel.id]?.copy(statistics = stats)
-						?: TunnelState(statistics = stats)
-					currentStates + (tunnel.id to updatedState)
+	protected suspend fun configureTunnel(tunnelConf: TunnelConf) {
+		// setup state change callback
+		tunnelConf.setStateChangeCallback { state ->
+			Timber.d("State change callback triggered for tunnel ${tunnelConf.id}: ${tunnelConf.tunName} with state $state at ${System.currentTimeMillis()}")
+			when (state) {
+				is Tunnel.State -> updateTunnelState(tunnelConf, state.asTunnelState())
+				is org.amnezia.awg.backend.Tunnel.State -> updateTunnelState(tunnelConf, state.asTunnelState())
+			}
+			applicationScope.launch(ioDispatcher) { serviceManager.updateTunnelTile() }
+		}
+
+		activeTuns.update { current ->
+			current.filter { it.key != tunnelConf } + (tunnelConf to TunnelState())
+		}
+	}
+
+	protected suspend fun onStartSuccess(tunnelConf: TunnelConf) {
+		val tunnelCopy = tunnelConf.copyWithCallback(isActive = true)
+
+		// start service
+		if (activeTuns.value.isEmpty()) {
+			serviceManager.startTunnelForegroundService(tunnelCopy)
+		} else {
+			serviceManager.updateTunnelForegroundServiceNotification(tunnelCopy)
+		}
+		// save active
+		appDataRepository.tunnels.save(tunnelCopy)
+		// start tunnel jobs
+		tunnelJobs[tunnelCopy.id] = mutableListOf(startTunnelJobs(tunnelConf))
+	}
+
+	override fun startTunnel(tunnelConf: TunnelConf) {
+		throw NotImplementedError("Must be implemented by subclass")
+	}
+
+	override fun stopTunnel(tunnelConf: TunnelConf?) {
+		tunnelConf?.let {
+			applicationScope.launch(ioDispatcher) {
+				mutex.withLock {
+					removeActiveTunnel(tunnelConf)
+					tunnelJobs[tunnelConf.id]?.forEach { it.cancelWithMessage("Cancel tunnel job") }
+					tunnelJobs.remove(tunnelConf.id)
+					val lockedConf = it.copyWithCallback(isActive = false)
+					appDataRepository.tunnels.save(lockedConf)
+
+					// TODO improve to handle multiple tunnels
+					if (activeTuns.value.isEmpty()) {
+						Timber.d("No tunnels active, stopping background service")
+						serviceManager.stopTunnelForegroundService()
+					} else {
+						Timber.d("Other tunnels still active, updating service notification")
+						val nextActive = activeTuns.value.keys.firstOrNull()
+						if (nextActive != null) {
+							Timber.d("Next active tunnel: ${nextActive.id}")
+							serviceManager.updateTunnelForegroundServiceNotification(nextActive)
+						}
+					}
 				}
-				delay(CHECK_INTERVAL)
-			}.onFailure { exception ->
-				Timber.e(exception, "Failed to update tunnel statistics for ${tunnel.tunName}")
 			}
 		}
 	}
+
+	private fun removeActiveTunnel(tunnelConf: TunnelConf) {
+		activeTuns.update { current ->
+			current.toMutableMap().apply { remove(tunnelConf) }
+		}
+	}
+
+	override suspend fun bounceTunnel(tunnelConf: TunnelConf) {
+		stopTunnel(tunnelConf)
+		delay(1000)
+		startTunnel(tunnelConf)
+	}
+
+	private suspend fun monitorNetworkStatus() {
+		networkMonitor.getNetworkStatusFlow(includeWifiSsid = false, useRootShell = false)
+			.flowOn(ioDispatcher)
+			.collectLatest { status ->
+				val isAvailable = status !is NetworkStatus.Disconnected
+				isNetworkConnected.value = isAvailable
+				Timber.d("Network status: $isAvailable")
+			}
+	}
+
+	private suspend fun monitorTunnelConfigChanges() {
+		appDataRepository.tunnels.flow.collectLatest { storedTunnels ->
+			mutex.withLock {
+				storedTunnels.forEach { stored ->
+					val current = activeTuns.value.keys.find { it.id == stored.id }
+					if (current != null && !current.isQuickConfigMatching(stored)) {
+						Timber.d("Config changed for ${stored.id}, bouncing")
+						bounceTunnel(stored)
+					}
+				}
+			}
+		}
+	}
+
+	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
+		throw NotImplementedError("Must be implemented by subclass")
+	}
+
+	override suspend fun runningTunnelNames(): Set<String> = activeTuns.value.keys.map { it.tunName }.toSet()
 }

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

@@ -0,0 +1,25 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel
+
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
+
+fun Map<TunnelConf, TunnelState>.allDown(): Boolean {
+	return this.all { it.value.state.isDown() }
+}
+
+fun Map<TunnelConf, TunnelState>.hasActive(): Boolean {
+	return this.any { it.value.state.isUp() }
+}
+
+fun Map<TunnelConf, TunnelState>.getValueById(id: Int): TunnelState? {
+	val key = this.keys.find { it.id == id }
+	return key?.let { this@getValueById[it] }
+}
+
+fun Map<TunnelConf, TunnelState>.getKeyById(id: Int): TunnelConf? {
+	return this.keys.find { it.id == id }
+}
+
+fun Map<TunnelConf, TunnelState>.isUp(tunnelConf: TunnelConf): Boolean {
+	return this.getValueById(tunnelConf.id)?.state?.isUp() ?: false
+}

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

@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
 import com.wireguard.android.backend.Backend
-import com.wireguard.android.backend.BackendException
 import com.wireguard.android.backend.Tunnel
 import com.zaneschepke.networkmonitor.NetworkMonitor
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
@@ -10,13 +9,15 @@ import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.domain.state.WireGuardStatistics
-import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
+import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -31,40 +32,60 @@ class KernelTunnel @Inject constructor(
 ) : BaseTunnel(ioDispatcher, applicationScope, networkMonitor, appDataRepository, serviceManager, notificationManager) {
 
 	override fun startTunnel(tunnelConf: TunnelConf) {
-		Timber.d("Starting tunnel ${tunnelConf.id} kernel")
+		Timber.i("Starting tunnel ${tunnelConf.id} kernel")
 		applicationScope.launch(ioDispatcher) {
-			if (tunnels.value.any { it.id == tunnelConf.id }) return@launch Timber.w("Tunnel already running")
 			runCatching {
-				Timber.d("Setting backend state UP")
-				super.beforeStartTunnel(tunnelConf)
-				backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toWgConfig())
-				Timber.d("Calling super.startTunnel")
-				super.startTunnel(tunnelConf)
-			}.onFailure {
-				Timber.e(it, "Failed to start tunnel ${tunnelConf.id} kernel")
-				onTunnelStop(tunnelConf)
-				if (it is BackendException) {
-					handleBackendThrowable(it.toBackendError())
-				} else {
-					Timber.e(it)
+				// tunnel already active
+				if (activeTuns.value.any { it.key.id == tunnelConf.id }) return@launch
+
+				mutex.withLock {
+					updateTunnelState(tunnelConf, TunnelStatus.STARTING)
+
+					// configure state callback and add to tunnels
+					configureTunnel(tunnelConf)
+
+					updateTunnelState(tunnelConf, backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toWgConfig()).asTunnelState())
+
+					// run some actions after start success
+					onStartSuccess(tunnelConf)
 				}
+			}.onFailure { exception ->
+				Timber.e(exception, "Failed to start tunnel ${tunnelConf.id} kernel")
+				stopTunnel(tunnelConf)
+				handleBackendThrowable(exception)
+			}.onSuccess {
+				Timber.i("Tunnel ${tunnelConf.id} started successfully")
 			}
 		}
 	}
 
-	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
-		return WireGuardStatistics(backend.getStatistics(tunnelConf))
+	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
+		return try {
+			WireGuardStatistics(backend.getStatistics(tunnelConf))
+		} catch (e: Exception) {
+			Timber.e(e)
+			null
+		}
 	}
 
 	override fun stopTunnel(tunnelConf: TunnelConf?) {
 		applicationScope.launch(ioDispatcher) {
 			runCatching {
-				tunnels.value.firstOrNull { it.id == tunnelConf?.id }?.let {
-					backend.setState(it, Tunnel.State.DOWN, it.toWgConfig())
-					onTunnelStop(it)
-				} ?: stopAllTunnels()
-			}.onFailure {
-				Timber.e(it)
+				val originalTunnel = activeTuns.value.keys.find { it.id == tunnelConf?.id }
+				if (originalTunnel != null) {
+					Timber.i("Stopping tunnel ${originalTunnel.id} kernel")
+					mutex.withLock {
+						updateTunnelState(originalTunnel, backend.setState(originalTunnel, Tunnel.State.DOWN, originalTunnel.toWgConfig()).asTunnelState())
+						super.stopTunnel(originalTunnel)
+					}
+				} else {
+					Timber.w("Tunnel not found in startedTunnels, stopping all tunnels")
+					activeTuns.value.keys.forEach { config ->
+						stopTunnel(config)
+					}
+				}
+			}.onFailure { e ->
+				Timber.e(e, "Failed to stop tunnel ${tunnelConf?.id}")
 			}
 		}
 	}

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

@@ -76,7 +76,7 @@ class TunnelManager @Inject constructor(
 		return tunnelProviderFlow.value.runningTunnelNames()
 	}
 
-	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
+	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
 		return tunnelProviderFlow.value.getStatistics(tunnelConf)
 	}
 
@@ -84,7 +84,7 @@ class TunnelManager @Inject constructor(
 		val settings = appDataRepository.settings.get()
 		if (settings.isRestoreOnBootEnabled) {
 			val previouslyActiveTuns = appDataRepository.tunnels.getActive()
-			val tunsToStart = previouslyActiveTuns.filterNot { tun -> activeTunnels.value.any { tun.id == it.key } }
+			val tunsToStart = previouslyActiveTuns.filterNot { tun -> activeTunnels.value.any { tun.id == it.key.id } }
 			if (settings.isKernelEnabled) {
 				return@launch tunsToStart.forEach {
 					startTunnel(it)

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

@@ -7,15 +7,11 @@ import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import kotlinx.coroutines.flow.StateFlow
 
 interface TunnelProvider {
-	companion object {
-		const val CHECK_INTERVAL = 1000L
-	}
-
 	fun startTunnel(tunnelConf: TunnelConf)
 	fun stopTunnel(tunnelConf: TunnelConf? = null)
 	suspend fun bounceTunnel(tunnelConf: TunnelConf)
 	suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>)
 	suspend fun runningTunnelNames(): Set<String>
-	fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics
-	val activeTunnels: StateFlow<Map<Int, TunnelState>>
+	fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics?
+	val activeTunnels: StateFlow<Map<TunnelConf, TunnelState>>
 }

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

@@ -1,6 +1,5 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.wireguard.android.backend.BackendException
 import com.zaneschepke.networkmonitor.NetworkMonitor
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
@@ -8,14 +7,17 @@ import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.AmneziaStatistics
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendState
-import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
+import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.withLock
 import org.amnezia.awg.backend.Backend
 import org.amnezia.awg.backend.Tunnel
 import timber.log.Timber
@@ -32,27 +34,41 @@ class UserspaceTunnel @Inject constructor(
 ) : BaseTunnel(ioDispatcher, applicationScope, networkMonitor, appDataRepository, serviceManager, notificationManager) {
 
 	override fun startTunnel(tunnelConf: TunnelConf) {
+		Timber.i("Starting tunnel ${tunnelConf.id} userspace")
 		applicationScope.launch(ioDispatcher) {
-			Timber.d("Starting tunnel ${tunnelConf.id} userspace")
-			if (tunnels.value.any { it.id == tunnelConf.id }) return@launch Timber.w("Tunnel already running")
-			if (tunnels.value.isNotEmpty()) {
-				Timber.d("Stopping all tunnels")
-				stopAllTunnels()
-			}
 			runCatching {
-				Timber.d("Setting backend state UP")
-				super.beforeStartTunnel(tunnelConf)
-				backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toAmConfig())
-				Timber.d("Calling super.startTunnel")
-				super.startTunnel(tunnelConf)
-			}.onFailure {
-				Timber.e(it, "Failed to start tunnel ${tunnelConf.id} userspace")
-				onTunnelStop(tunnelConf)
-				if (it is BackendException) {
-					handleBackendThrowable(it.toBackendError())
-				} else {
-					Timber.e(it)
+				// tunnel already active
+				if (activeTuns.value.any { it.key.id == tunnelConf.id }) return@launch
+
+				// stop any active tunnels that aren't this one, userspace only
+				stopActiveTunnels()
+
+				mutex.withLock {
+					updateTunnelState(tunnelConf, TunnelStatus.STARTING)
+
+					// configure state callback and add to tunnels
+					configureTunnel(tunnelConf)
+
+					updateTunnelState(tunnelConf, backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toAmConfig()).asTunnelState())
+
+					// run some actions after start success
+					onStartSuccess(tunnelConf)
 				}
+			}.onFailure { exception ->
+				Timber.e(exception, "Failed to start tunnel ${tunnelConf.id} userspace")
+				stopTunnel(tunnelConf)
+				handleBackendThrowable(exception)
+			}.onSuccess {
+				Timber.i("Tunnel ${tunnelConf.id} started successfully")
+			}
+		}
+	}
+
+	private suspend fun stopActiveTunnels() {
+		activeTunnels.value.forEach { (config, state) ->
+			if (state.state.isUp()) {
+				stopTunnel(config)
+				delay(300)
 			}
 		}
 	}
@@ -60,17 +76,27 @@ class UserspaceTunnel @Inject constructor(
 	override fun stopTunnel(tunnelConf: TunnelConf?) {
 		applicationScope.launch(ioDispatcher) {
 			runCatching {
-				tunnels.value.firstOrNull { it.id == tunnelConf?.id }?.let {
-					backend.setState(it, Tunnel.State.DOWN, it.toAmConfig())
-					onTunnelStop(it)
-				} ?: stopAllTunnels()
-			}.onFailure {
-				Timber.e(it)
+				val originalTunnel = activeTuns.value.keys.find { it.id == tunnelConf?.id }
+				if (originalTunnel != null) {
+					Timber.i("Stopping tunnel ${originalTunnel.id} userspace")
+					mutex.withLock {
+						updateTunnelState(originalTunnel, backend.setState(originalTunnel, Tunnel.State.DOWN, originalTunnel.toAmConfig()).asTunnelState())
+						super.stopTunnel(originalTunnel)
+					}
+				} else {
+					Timber.w("Tunnel not found in startedTunnels, stopping all tunnels")
+					activeTuns.value.keys.forEach { config ->
+						stopTunnel(config)
+					}
+				}
+			}.onFailure { e ->
+				Timber.e(e, "Failed to stop tunnel ${tunnelConf?.id}")
 			}
 		}
 	}
 
 	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+		Timber.d("Setting backend state: $backendState with allowedIps: $allowedIps")
 		backend.setBackendState(backendState.asAmBackendState(), allowedIps)
 	}
 
@@ -78,7 +104,12 @@ class UserspaceTunnel @Inject constructor(
 		return backend.runningTunnelNames
 	}
 
-	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
-		return AmneziaStatistics(backend.getStatistics(tunnelConf))
+	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
+		return try {
+			AmneziaStatistics(backend.getStatistics(tunnelConf))
+		} catch (e: Exception) {
+			Timber.e(e, "Failed to get stats for ${tunnelConf.tunName}")
+			null
+		}
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/entity/TunnelConf.kt

@@ -1,16 +1,19 @@
 package com.zaneschepke.wireguardautotunnel.domain.entity
 
+import com.wireguard.android.backend.Tunnel
 import com.wireguard.config.Config
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.isReachable
 import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
-import kotlinx.coroutines.withContext
-import kotlinx.serialization.Transient
-import org.amnezia.awg.backend.Tunnel
-import timber.log.Timber
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import java.io.InputStream
 import java.net.InetAddress
 import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.nio.charset.StandardCharsets
 
 data class TunnelConf(
 	val id: Int = 0,
@@ -29,10 +32,39 @@ data class TunnelConf(
 	val isIpv4Preferred: Boolean = true,
 	@Transient
 	private var stateChangeCallback: ((Any) -> Unit)? = null,
-) : Tunnel, com.wireguard.android.backend.Tunnel {
+) : Tunnel, org.amnezia.awg.backend.Tunnel {
 
-	fun setStateChangeCallback(callback: (Any) -> Unit) {
-		stateChangeCallback = callback
+	private val callbackMutex = Mutex()
+
+	suspend fun setStateChangeCallback(callback: (Any) -> Unit) {
+		callbackMutex.withLock {
+			stateChangeCallback = callback
+		}
+	}
+
+	fun copyWithCallback(
+		id: Int = this.id,
+		tunName: String = this.tunName,
+		wgQuick: String = this.wgQuick,
+		tunnelNetworks: List<String> = this.tunnelNetworks,
+		isMobileDataTunnel: Boolean = this.isMobileDataTunnel,
+		isPrimaryTunnel: Boolean = this.isPrimaryTunnel,
+		amQuick: String = this.amQuick,
+		isActive: Boolean = this.isActive,
+		isPingEnabled: Boolean = this.isPingEnabled,
+		pingInterval: Long? = this.pingInterval,
+		pingCooldown: Long? = this.pingCooldown,
+		pingIp: String? = this.pingIp,
+		isEthernetTunnel: Boolean = this.isEthernetTunnel,
+		isIpv4Preferred: Boolean = this.isIpv4Preferred,
+	): TunnelConf {
+		return TunnelConf(
+			id, tunName, wgQuick, tunnelNetworks, isMobileDataTunnel, isPrimaryTunnel,
+			amQuick, isActive, isPingEnabled, pingInterval, pingCooldown, pingIp,
+			isEthernetTunnel, isIpv4Preferred,
+		).apply {
+			stateChangeCallback = this@TunnelConf.stateChangeCallback
+		}
 	}
 
 	fun toAmConfig(): org.amnezia.awg.config.Config {
@@ -43,25 +75,40 @@ data class TunnelConf(
 		return configFromWgQuick(wgQuick)
 	}
 
-	override fun getName(): String {
-		return tunName
-	}
+	override fun getName(): String = tunName
 
-	override fun isIpv4ResolutionPreferred(): Boolean {
-		return isIpv4Preferred
-	}
+	override fun isIpv4ResolutionPreferred(): Boolean = isIpv4Preferred
 
-	override fun onStateChange(newState: com.wireguard.android.backend.Tunnel.State) {
-		stateChangeCallback?.invoke(newState)
+	override fun onStateChange(newState: org.amnezia.awg.backend.Tunnel.State) {
+		Timber.d("onStateChange called for tunnel $id: $tunName with state $newState")
+		runBlocking {
+			callbackMutex.withLock {
+				if (stateChangeCallback != null) {
+					Timber.d("Invoking stateChangeCallback for tunnel $id: $tunName with state $newState")
+					stateChangeCallback?.invoke(newState)
+				} else {
+					Timber.w("No stateChangeCallback set for tunnel $id: $tunName")
+				}
+			}
+		}
 	}
 
 	override fun onStateChange(newState: Tunnel.State) {
-		stateChangeCallback?.invoke(newState)
+		Timber.d("onStateChange called for tunnel $id: $tunName with state $newState")
+		runBlocking {
+			callbackMutex.withLock {
+				if (stateChangeCallback != null) {
+					Timber.d("Invoking stateChangeCallback for tunnel $id: $tunName with state $newState")
+					stateChangeCallback?.invoke(newState)
+				} else {
+					Timber.w("No stateChangeCallback set for tunnel $id: $tunName")
+				}
+			}
+		}
 	}
 
 	fun isQuickConfigMatching(updatedConf: TunnelConf): Boolean {
-		return updatedConf.wgQuick == wgQuick ||
-			updatedConf.amQuick == amQuick
+		return updatedConf.wgQuick == wgQuick || updatedConf.amQuick == amQuick
 	}
 
 	fun isPingConfigMatching(updatedConf: TunnelConf): Boolean {
@@ -78,7 +125,6 @@ data class TunnelConf(
 				return@withContext InetAddress.getByName(pingIp)
 					.isReachable(Constants.PING_TIMEOUT.toInt())
 			}
-			Timber.i("Pinging all peers")
 			config.peers.map { peer ->
 				peer.isReachable(isIpv4Preferred)
 			}.all { true }
@@ -88,14 +134,14 @@ data class TunnelConf(
 	companion object {
 		fun configFromWgQuick(wgQuick: String): Config {
 			val inputStream: InputStream = wgQuick.byteInputStream()
-			return inputStream.bufferedReader(Charsets.UTF_8).use {
+			return inputStream.bufferedReader(StandardCharsets.UTF_8).use {
 				Config.parse(it)
 			}
 		}
 
 		fun configFromAmQuick(amQuick: String): org.amnezia.awg.config.Config {
 			val inputStream: InputStream = amQuick.byteInputStream()
-			return inputStream.bufferedReader(Charsets.UTF_8).use {
+			return inputStream.bufferedReader(StandardCharsets.UTF_8).use {
 				org.amnezia.awg.config.Config.parse(it)
 			}
 		}

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/enums/BackendError.kt

@@ -4,4 +4,5 @@ sealed class BackendError() {
 	data object DNS : BackendError()
 	data object Unauthorized : BackendError()
 	data object Config : BackendError()
+	data object Unknown : BackendError()
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/enums/TunnelStatus.kt

@@ -3,6 +3,8 @@ package com.zaneschepke.wireguardautotunnel.domain.enums
 enum class TunnelStatus {
 	UP,
 	DOWN,
+	STARTING,
+	STOPPING,
 	;
 
 	fun isDown(): Boolean {

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/state/AutoTunnelState.kt

@@ -1,5 +1,8 @@
 package com.zaneschepke.wireguardautotunnel.domain.state
 
+import com.zaneschepke.wireguardautotunnel.core.tunnel.allDown
+import com.zaneschepke.wireguardautotunnel.core.tunnel.hasActive
+import com.zaneschepke.wireguardautotunnel.core.tunnel.isUp
 import com.zaneschepke.wireguardautotunnel.domain.events.KillSwitchEvent
 import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
@@ -7,7 +10,7 @@ import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
 import com.zaneschepke.wireguardautotunnel.util.extensions.isMatchingToWildcardList
 
 data class AutoTunnelState(
-	val activeTunnels: Map<Int, TunnelState> = emptyMap(),
+	val activeTunnels: Map<TunnelConf, TunnelState> = emptyMap(),
 	val networkState: NetworkState = NetworkState(),
 	val settings: AppSettings = AppSettings(),
 	val tunnels: List<TunnelConf> = emptyList(),
@@ -20,12 +23,12 @@ data class AutoTunnelState(
 	private fun isMobileTunnelDataChangeNeeded(): Boolean {
 		val preferredTunnel = preferredMobileDataTunnel()
 		return preferredTunnel != null &&
-			activeTunnels.isNotEmpty() && !activeTunnels.any { it.key == preferredTunnel.id }
+			activeTunnels.isNotEmpty() && !activeTunnels.isUp(preferredTunnel)
 	}
 
 	private fun isEthernetTunnelChangeNeeded(): Boolean {
 		val preferredTunnel = preferredEthernetTunnel()
-		return preferredTunnel != null && activeTunnels.isNotEmpty() && !activeTunnels.any { it.key == preferredTunnel.id }
+		return preferredTunnel != null && activeTunnels.isNotEmpty() && !activeTunnels.isUp(preferredTunnel)
 	}
 
 	private fun preferredMobileDataTunnel(): TunnelConf? {
@@ -45,11 +48,11 @@ data class AutoTunnelState(
 	}
 
 	private fun startOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && activeTunnels.isEmpty()
+		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && activeTunnels.allDown()
 	}
 
 	private fun stopOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && !settings.isTunnelOnEthernetEnabled && activeTunnels.isNotEmpty()
+		return networkState.isEthernetConnected && !settings.isTunnelOnEthernetEnabled && activeTunnels.hasActive()
 	}
 
 	// TODO test removed kill switch state check
@@ -67,11 +70,11 @@ data class AutoTunnelState(
 	}
 
 	private fun stopOnMobileData(): Boolean {
-		return isMobileDataActive() && !settings.isTunnelOnMobileDataEnabled && activeTunnels.isNotEmpty()
+		return isMobileDataActive() && !settings.isTunnelOnMobileDataEnabled && activeTunnels.hasActive()
 	}
 
 	private fun startOnMobileData(): Boolean {
-		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && activeTunnels.isEmpty()
+		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && activeTunnels.allDown()
 	}
 
 	private fun changeOnMobileData(): Boolean {
@@ -83,24 +86,24 @@ data class AutoTunnelState(
 	}
 
 	private fun stopOnWifi(): Boolean {
-		return isWifiActive() && !settings.isTunnelOnWifiEnabled && activeTunnels.isNotEmpty()
+		return isWifiActive() && !settings.isTunnelOnWifiEnabled && activeTunnels.hasActive()
 	}
 
 	private fun stopOnTrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.isNotEmpty() && isCurrentSSIDTrusted()
+		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.hasActive() && isCurrentSSIDTrusted()
 	}
 
 	private fun startOnUntrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.isEmpty() && !isCurrentSSIDTrusted()
+		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.allDown() && !isCurrentSSIDTrusted()
 	}
 
 	private fun changeOnUntrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.isNotEmpty() && !isCurrentSSIDTrusted() && !isWifiTunnelPreferred()
+		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.hasActive() && !isCurrentSSIDTrusted() && !isWifiTunnelPreferred()
 	}
 
 	private fun isWifiTunnelPreferred(): Boolean {
 		val preferred = preferredWifiTunnel()
-		return activeTunnels.any { it.key == preferred?.id }
+		return preferred?.let { activeTunnels.isUp(it) } ?: true
 	}
 
 	fun asAutoTunnelEvent(): AutoTunnelEvent {

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

@@ -38,6 +38,7 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.core.tunnel.getValueById
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
@@ -227,7 +228,7 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState)
 				key = { tunnel -> tunnel.id },
 			) { tunnel ->
 				val expanded = uiState.generalState.isTunnelStatsExpanded
-				val tunnelState = activeTunnels.getOrDefault(tunnel.id, TunnelState())
+				val tunnelState = activeTunnels.getValueById(tunnel.id) ?: TunnelState()
 				TunnelRowItem(
 					tunnelState.state.isUp(),
 					expanded,

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

@@ -32,6 +32,7 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.core.tunnel.isUp
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
@@ -195,7 +196,7 @@ fun OptionsScreen(tunnelConf: TunnelConf, appUiState: AppUiState, viewModel: Tun
 							trailing = {
 								ScaledSwitch(
 									checked = tunnelConf.isPingEnabled,
-									enabled = !appUiState.activeTunnels.containsKey(tunnelConf.id),
+									enabled = !appUiState.activeTunnels.isUp(tunnelConf),
 									onClick = { onPingToggle() },
 								)
 							},

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/state/AppUiState.kt

@@ -8,7 +8,7 @@ import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 data class AppUiState(
 	val appSettings: AppSettings = AppSettings(),
 	val tunnels: List<TunnelConf> = emptyList(),
-	val activeTunnels: Map<Int, TunnelState> = emptyMap(),
+	val activeTunnels: Map<TunnelConf, TunnelState> = emptyMap(),
 	val generalState: GeneralState = GeneralState(),
 	val autoTunnelActive: Boolean = false,
 )

app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/AppViewModel.kt

@@ -147,6 +147,8 @@ constructor(
 			appDataRepository.appState.setLocalLogsEnabled(toggledOn)
 			if (!toggledOn) {
 				logReader.stop()
+			} else {
+				logReader.start()
 			}
 		}
 	}
@@ -275,13 +277,13 @@ constructor(
 		}
 	}
 
-	suspend fun requestRoot(): Result<Unit> {
+	private suspend fun requestRoot(): Result<Unit> {
 		return withContext(ioDispatcher) {
 			runCatching {
 				rootShell.get().start()
-				SnackbarController.Companion.showMessage(StringValue.StringResource(R.string.root_accepted))
+				SnackbarController.showMessage(StringValue.StringResource(R.string.root_accepted))
 			}.onFailure {
-				SnackbarController.Companion.showMessage(StringValue.StringResource(R.string.error_root_denied))
+				SnackbarController.showMessage(StringValue.StringResource(R.string.error_root_denied))
 			}
 		}
 	}
@@ -351,7 +353,7 @@ constructor(
 		runCatching {
 			val amConfig = tunnelConfig.toAmConfig()
 			val wgConfig = tunnelConfig.toWgConfig()
-			val proxy = InterfaceProxy.Companion.from(amConfig.`interface`)
+			val proxy = InterfaceProxy.from(amConfig.`interface`)
 			if (proxy.includedApplications.isEmpty() && proxy.excludedApplications.isEmpty()) return@launch
 			if (proxy.includedApplications.retainAll(packages.toSet()) || proxy.excludedApplications.retainAll(packages.toSet())) {
 				updateTunnelConfig(tunnelConfig, amConfig = amConfig, wgConfig = wgConfig, `interface` = proxy)

gradle/libs.versions.toml

@@ -15,15 +15,15 @@ junit = "4.13.2"
 kotlinx-serialization-json = "1.8.0"
 lifecycle-runtime-compose = "2.8.7"
 material3 = "1.3.1"
-navigationCompose = "2.8.8"
+navigationCompose = "2.8.9"
 pinLockCompose = "1.0.4"
 roomVersion = "2.6.1"
 timber = "5.0.1"
 tunnel = "1.2.7"
-androidGradlePlugin = "8.8.0-alpha05"
+androidGradlePlugin = "8.10.0-beta01"
 kotlin = "2.1.10"
 ksp = "2.1.10-1.0.31"
-composeBom = "2025.02.00"
+composeBom = "2025.03.00"
 compose = "1.7.8"
 workRuntimeKtxVersion = "2.10.0"
 zxingAndroidEmbedded = "4.3.0"

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

@@ -30,7 +30,8 @@ class AndroidNetworkMonitor(
 	data class TransportState(val connected: Boolean = false)
 
 	private val wifiFlow: Flow<WifiState> = callbackFlow {
-		var currentSsid: String? = null
+
+		var currentSsid: String?
 
 		@Suppress("DEPRECATION")
 		fun getWifiSsid(): String? {
@@ -47,13 +48,8 @@ class AndroidNetworkMonitor(
 		val callback = object : ConnectivityManager.NetworkCallback() {
 			override fun onAvailable(network: Network) {
 				Timber.d("Wi-Fi onAvailable: network=$network")
-				val capabilities = connectivityManager.getNetworkCapabilities(network)
-				val connected = capabilities?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true
-				if (connected) {
-					val ssid = getWifiSsid()
-					currentSsid = ssid
-					trySend(WifiState(connected = true, ssid = ssid))
-				}
+				currentSsid = getWifiSsid()
+				trySend(WifiState(connected = true, ssid = currentSsid))
 			}
 
 			override fun onLost(network: Network) {
@@ -63,12 +59,7 @@ class AndroidNetworkMonitor(
 			}
 
 			override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
-				val connected = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
-				val ssid = if (connected) getWifiSsid() else null
-				if (ssid != currentSsid) {
-					currentSsid = ssid
-					trySend(WifiState(connected = connected, ssid = ssid))
-				}
+				Timber.d("Wi-Fi onCapabilitiesChanged: network=$network, networkCapabilities=$networkCapabilities")
 			}
 		}