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: service manager bug

Browse Source
This commit is contained in:
Zane Schepke
2025-03-02 17:51:48 -05:00
parent e220b26d88
commit 8860b45230
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/zaneschepke/wireguardautotunnel/core/service/ServiceManager.kt
+5 -5
View File
@@ -54,12 +54,12 @@ class ServiceManager @Inject constructor(
applicationScope.launch(ioDispatcher) {
val settings = appDataRepository.settings.get()
appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
if (autoTunnelService.isCompleted && autoTunnelService.isActive) {
if (autoTunnelService.isCompleted) {
_autoTunnelActive.update { true }
return@launch
}
runCatching {
autoTunnelService = CompletableDeferred() // Reset
autoTunnelService = CompletableDeferred()
startService(AutoTunnelService::class.java, background)
val service = withTimeoutOrNull(SERVICE_START_TIMEOUT) { autoTunnelService.await() }
?: throw IllegalStateException("AutoTunnelService start timed out")
@@ -75,7 +75,7 @@ class ServiceManager @Inject constructor(
fun startBackgroundService(tunnelConf: TunnelConf) {
applicationScope.launch(ioDispatcher) {
if (backgroundService.isCompleted && backgroundService.isActive) return@launch
if (backgroundService.isCompleted) return@launch
runCatching {
backgroundService = CompletableDeferred()
startService(TunnelForegroundService::class.java, true)
@@ -90,7 +90,7 @@ class ServiceManager @Inject constructor(
fun stopBackgroundService() {
applicationScope.launch(ioDispatcher) {
if (!backgroundService.isCompleted || !backgroundService.isActive) return@launch
if (!backgroundService.isCompleted) return@launch
runCatching {
val service = backgroundService.await()
service.stop()
@@ -141,7 +141,7 @@ class ServiceManager @Inject constructor(
applicationScope.launch(ioDispatcher) {
val settings = appDataRepository.settings.get()
appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
if (!autoTunnelService.isCompleted || !autoTunnelService.isActive) return@launch
if (!autoTunnelService.isCompleted) return@launch
runCatching {
val service = autoTunnelService.await()
service.stop()