ppn/wgtunnel-android
3
0
Fork 0
mirror of https://github.com/wgtunnel/android.git synced 2026-07-03 14:07:49 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix: proxy mode vpn permission

Browse Source
This commit is contained in:
Zane Schepke
2025-10-20 23:31:06 -04:00
parent b2bd8574ec
commit c28e157616
2 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/TunnelManager.kt
+32 -21
View File
@@ -325,6 +325,18 @@ constructor(
proxyUserspaceTunnel.setBackendMode(BackendMode.Inactive)
}
private fun isVpnAuthorized(
mode: AppMode,
hasVpnPermission: () -> Boolean = { serviceManager.hasVpnPermission() },
): Boolean {
return when (mode) {
AppMode.VPN,
AppMode.LOCK_DOWN -> hasVpnPermission()
AppMode.KERNEL,
AppMode.PROXY -> true
}
}
suspend fun handleRestore() =
withContext(ioDispatcher) {
val settings = settingsRepository.getGeneralSettings()
@@ -332,18 +344,20 @@ constructor(
val tunnels = tunnelsRepository.getAll()
if (autoTunnelSettings.isAutoTunnelEnabled)
return@withContext restoreAutoTunnel(autoTunnelSettings)
when (val mode = settings.appMode) {
AppMode.VPN,
AppMode.PROXY,
AppMode.LOCK_DOWN -> {
if (serviceManager.hasVpnPermission()) {
if (isVpnAuthorized(settings.appMode)) {
when (val mode = settings.appMode) {
AppMode.VPN,
AppMode.PROXY,
AppMode.LOCK_DOWN -> {
if (mode == AppMode.LOCK_DOWN)
handleLockDownModeInit(settings.isLanOnKillSwitchEnabled)
tunnels.firstOrNull { it.isActive }?.let { startTunnel(it) }
} else localErrorEvents.emit(null to BackendCoreException.NotAuthorized)
}
AppMode.KERNEL ->
tunnels.filter { it.isActive }.forEach { conf -> startTunnel(conf) }
}
AppMode.KERNEL ->
tunnels.filter { it.isActive }.forEach { conf -> startTunnel(conf) }
} else {
localErrorEvents.emit(null to BackendCoreException.NotAuthorized)
}
}
@@ -361,21 +375,18 @@ constructor(
return@withContext restoreAutoTunnel(autoTunnelSettings)
if (settings.isRestoreOnBootEnabled) {
tunnelsRepository.resetActiveTunnels()
when (val mode = settings.appMode) {
AppMode.VPN,
AppMode.PROXY,
AppMode.LOCK_DOWN -> {
if (serviceManager.hasVpnPermission()) {
if (mode == AppMode.LOCK_DOWN)
handleLockDownModeInit(settings.isLanOnKillSwitchEnabled)
} else
return@withContext localErrorEvents.emit(
null to BackendCoreException.NotAuthorized
)
if (isVpnAuthorized(settings.appMode)) {
when (val mode = settings.appMode) {
AppMode.LOCK_DOWN ->
handleLockDownModeInit(settings.isLanOnKillSwitchEnabled)
AppMode.KERNEL,
AppMode.VPN,
AppMode.PROXY -> Unit
}
AppMode.KERNEL -> Unit
defaultTunnel?.let { startTunnel(it) }
} else {
localErrorEvents.emit(null to BackendCoreException.NotAuthorized)
}
defaultTunnel?.let { startTunnel(it) }
}
}
app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunnels/components/TunnelStatisticsRow.kt
+8 -7
View File
@@ -35,14 +35,15 @@ fun TunnelStatisticsRow(
val textColor = MaterialTheme.colorScheme.outline
// needs to be set as peer stats for duplicates return as a single set of stats
val peers by remember(tunnel) {
derivedStateOf {
TunnelConfig.configFromWgQuick(tunnel.wgQuick)
.peers
.map { it.publicKey.toBase64() }
.toSet()
val peers by
remember(tunnel) {
derivedStateOf {
TunnelConfig.configFromWgQuick(tunnel.wgQuick)
.peers
.map { it.publicKey.toBase64() }
.toSet()
}
}
}
var currentTimeMillis by remember { mutableLongStateOf(System.currentTimeMillis()) }
LaunchedEffect(Unit) {