fix: tunnel change restart logic

zaneschepke · zaneschepke · commit 3f912ed53252 · 2025-02-22T13:07:15.000-05:00
diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/BaseTunnel.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/BaseTunnel.kt
@@ -200,7 +200,7 @@ open class BaseTunnel(
 	private suspend fun startTunnelConfigChangeJob(tunnel: TunnelConf) = coroutineScope {
 		appDataRepository.tunnels.flow.collect { storageTuns ->
 			storageTuns.firstOrNull { it.id == tunnel.id }?.let { storageTun ->
-				if (tunnel.isQuickConfigChanged(storageTun) || tunnel.isPingConfigMatching(storageTun)) {
+				if (!tunnel.isQuickConfigMatching(storageTun) || !tunnel.isPingConfigMatching(storageTun)) {
 					bounceTunnel(tunnel)
 				}
 			}
diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/entity/TunnelConf.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/entity/TunnelConf.kt
@@ -62,9 +62,9 @@ data class TunnelConf(
 		}
 	}
 
-	fun isQuickConfigChanged(updatedConf: TunnelConf): Boolean {
-		return updatedConf.wgQuick != wgQuick ||
-			updatedConf.amQuick != amQuick
+	fun isQuickConfigMatching(updatedConf: TunnelConf): Boolean {
+		return updatedConf.wgQuick == wgQuick ||
+			updatedConf.amQuick == amQuick
 	}
 
 	fun isPingConfigMatching(updatedConf: TunnelConf): Boolean {

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ open class BaseTunnel(`
`200`	`200`	`private suspend fun startTunnelConfigChangeJob(tunnel: TunnelConf) = coroutineScope {`
`201`	`201`	`appDataRepository.tunnels.flow.collect { storageTuns ->`
`202`	`202`	`storageTuns.firstOrNull { it.id == tunnel.id }?.let { storageTun ->`
`203`		`- if (tunnel.isQuickConfigChanged(storageTun) \|\| tunnel.isPingConfigMatching(storageTun)) {`
	`203`	`+ if (!tunnel.isQuickConfigMatching(storageTun) \|\| !tunnel.isPingConfigMatching(storageTun)) {`
`204`	`204`	`bounceTunnel(tunnel)`
`205`	`205`	`}`
`206`	`206`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,9 @@ data class TunnelConf(`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`- fun isQuickConfigChanged(updatedConf: TunnelConf): Boolean {`
`66`		`- return updatedConf.wgQuick != wgQuick \|\|`
`67`		`- updatedConf.amQuick != amQuick`
	`65`	`+ fun isQuickConfigMatching(updatedConf: TunnelConf): Boolean {`
	`66`	`+ return updatedConf.wgQuick == wgQuick \|\|`
	`67`	`+ updatedConf.amQuick == amQuick`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`fun isPingConfigMatching(updatedConf: TunnelConf): Boolean {`