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

feat: global config overrides (#983)

Browse Source
This commit is contained in:
Zane Schepke
2025-09-30 12:14:09 -04:00
committed by GitHub
parent b7e4f3c3e5
commit 00c2c2ac20
34 changed files with 1119 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/SharedAppViewModel.kt
+44
View File
@@ -20,11 +20,13 @@ import com.zaneschepke.wireguardautotunnel.domain.repository.GlobalEffectReposit
import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
import com.zaneschepke.wireguardautotunnel.domain.sideeffect.GlobalSideEffect
import com.zaneschepke.wireguardautotunnel.ui.sideeffect.LocalSideEffect
import com.zaneschepke.wireguardautotunnel.ui.state.ConfigProxy
import com.zaneschepke.wireguardautotunnel.ui.state.SharedAppUiState
import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
import com.zaneschepke.wireguardautotunnel.util.FileUtils
import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
import com.zaneschepke.wireguardautotunnel.util.StringValue
import com.zaneschepke.wireguardautotunnel.util.extensions.asStringValue
import com.zaneschepke.wireguardautotunnel.util.extensions.saveTunnelsUniquely
import dagger.hilt.android.lifecycle.HiltViewModel
import java.io.File
@@ -36,9 +38,11 @@ import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.firstOrNull
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.withContext
import org.amnezia.awg.config.BadConfigException
import org.orbitmvi.orbit.ContainerHost
import org.orbitmvi.orbit.viewmodel.container
import rikka.shizuku.Shizuku
import timber.log.Timber
import xyz.teamgravity.pin_lock_compose.PinManager
@HiltViewModel
@@ -123,6 +127,46 @@ constructor(
appStateRepository.setPinLockEnabled(enabled)
}
fun saveConfigProxy(tunnelId: Int?, configProxy: ConfigProxy, tunnelName: String) = intent {
if (state.tunnels.any { it.tunName == tunnelName && it.id != tunnelId })
return@intent postSideEffect(
GlobalSideEffect.Toast(StringValue.StringResource(R.string.tunnel_name_taken))
)
runCatching {
val (wg, am) = configProxy.buildConfigs()
val tunnelConf =
if (tunnelId == null) {
TunnelConf.tunnelConfFromQuick(am.toAwgQuickString(true, false), tunnelName)
} else {
val latestTunnel = state.tunnels.find { it.id == tunnelId }
latestTunnel?.copy(
tunName = tunnelName,
amQuick = am.toAwgQuickString(true, false),
wgQuick = wg.toWgQuickString(true),
)
}
if (tunnelConf != null) {
tunnelRepository.save(tunnelConf)
postSideEffect(
GlobalSideEffect.Toast(
StringValue.StringResource(R.string.config_changes_saved)
)
)
postSideEffect(GlobalSideEffect.PopBackStack)
}
}
.onFailure {
Timber.e(it)
val message =
when (it) {
is BadConfigException -> it.asStringValue()
is com.wireguard.config.BadConfigException -> it.asStringValue()
else -> StringValue.StringResource(R.string.unknown_error)
}
postSideEffect(GlobalSideEffect.Snackbar(message))
}
}
fun stopTunnel(tunnelConf: TunnelConf) = intent { tunnelManager.stopTunnel(tunnelConf.id) }
fun setAppMode(appMode: AppMode) = intent {