zaneschepke
/
wgtunnel
mirror of https://github.com/zaneschepke/wgtunnel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: airplane mode bug

This commit is contained in:
Zane Schepke 2023-12-09 09:45:54 -05:00
parent 16e65aec9f
commit 515e91d191
1 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/src/main/java/com/zaneschepke/wireguardautotunnel/service/foreground/WireGuardConnectivityWatcherService.kt
View File

@ -245,36 +245,48 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
private suspend fun manageVpn() { private suspend fun manageVpn() {
while (true) { while (true) {
if (isEthernetConnected && setting.isTunnelOnEthernetEnabled && vpnService.getState() == Tunnel.State.DOWN) { when {
((isEthernetConnected &&
setting.isTunnelOnEthernetEnabled &&
vpnService.getState() == Tunnel.State.DOWN)) ->
ServiceManager.startVpnService(this, tunnelConfig) ServiceManager.startVpnService(this, tunnelConfig)
}
if (!isEthernetConnected && setting.isTunnelOnMobileDataEnabled && (!isEthernetConnected &&
setting.isTunnelOnMobileDataEnabled &&
!isWifiConnected && !isWifiConnected &&
isMobileDataConnected isMobileDataConnected &&
&& vpnService.getState() == Tunnel.State.DOWN vpnService.getState() == Tunnel.State.DOWN) ->
) {
ServiceManager.startVpnService(this, tunnelConfig) ServiceManager.startVpnService(this, tunnelConfig)
} else if (!isEthernetConnected && !setting.isTunnelOnMobileDataEnabled &&
(!isEthernetConnected &&
!setting.isTunnelOnMobileDataEnabled &&
!isWifiConnected && !isWifiConnected &&
vpnService.getState() == Tunnel.State.UP vpnService.getState() == Tunnel.State.UP) ->
) {
ServiceManager.stopVpnService(this) ServiceManager.stopVpnService(this)
} else if (!isEthernetConnected && isWifiConnected &&
(!isEthernetConnected && isWifiConnected &&
!setting.trustedNetworkSSIDs.contains(currentNetworkSSID) && !setting.trustedNetworkSSIDs.contains(currentNetworkSSID) &&
setting.isTunnelOnWifiEnabled && setting.isTunnelOnWifiEnabled &&
(vpnService.getState() != Tunnel.State.UP) (vpnService.getState() != Tunnel.State.UP)) ->
) {
ServiceManager.startVpnService(this, tunnelConfig) ServiceManager.startVpnService(this, tunnelConfig)
} else if (!isEthernetConnected && (isWifiConnected &&
(!isEthernetConnected && (isWifiConnected &&
setting.trustedNetworkSSIDs.contains(currentNetworkSSID)) && setting.trustedNetworkSSIDs.contains(currentNetworkSSID)) &&
(vpnService.getState() == Tunnel.State.UP) (vpnService.getState() == Tunnel.State.UP)) ->
) {
ServiceManager.stopVpnService(this) ServiceManager.stopVpnService(this)
} else if (!isEthernetConnected && (isWifiConnected &&
(!isEthernetConnected && (isWifiConnected &&
!setting.isTunnelOnWifiEnabled && !setting.isTunnelOnWifiEnabled &&
(vpnService.getState() == Tunnel.State.UP) (vpnService.getState() == Tunnel.State.UP))) ->
)) {
ServiceManager.stopVpnService(this) ServiceManager.stopVpnService(this)
(!isEthernetConnected && !isWifiConnected &&
!isMobileDataConnected &&
(vpnService.getState() == Tunnel.State.UP)) ->
ServiceManager.stopVpnService(this)
else -> {
Timber.d("Unknown case")
}
} }
delay(Constants.VPN_CONNECTIVITY_CHECK_INTERVAL) delay(Constants.VPN_CONNECTIVITY_CHECK_INTERVAL)
} }