fix: tile bug

zaneschepke · Aug 3, 2024 · 5b0bb2a · 5b0bb2a
1 parent b99c2ff
commit 5b0bb2a
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 34 deletions.
diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/WireGuardAutoTunnel.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/WireGuardAutoTunnel.kt
@@ -1,8 +1,12 @@
 package com.zaneschepke.wireguardautotunnel
 
 import android.app.Application
+import android.content.ComponentName
 import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
+import android.service.quicksettings.TileService
+import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelControlTile
+import com.zaneschepke.wireguardautotunnel.service.tile.TunnelControlTile
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
 import dagger.hilt.android.HiltAndroidApp
 import timber.log.Timber
@@ -25,10 +29,26 @@ class WireGuardAutoTunnel : Application() {
 		} else {
 			Timber.plant(ReleaseTree())
 		}
+		requestTunnelTileServiceStateUpdate()
+		requestAutoTunnelTileServiceUpdate()
 	}
 
 	companion object {
 		lateinit var instance: WireGuardAutoTunnel
 			private set
 	}
+
+	private fun requestTunnelTileServiceStateUpdate() {
+		TileService.requestListeningState(
+			instance,
+			ComponentName(instance, TunnelControlTile::class.java),
+		)
+	}
+
+	private fun requestAutoTunnelTileServiceUpdate() {
+		TileService.requestListeningState(
+			instance,
+			ComponentName(instance, AutoTunnelControlTile::class.java),
+		)
+	}
 }
diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/data/repository/AppDataRepository.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/data/repository/AppDataRepository.kt
@@ -7,8 +7,6 @@ interface AppDataRepository {
 
 	suspend fun getStartTunnelConfig(): TunnelConfig?
 
-	suspend fun toggleWatcherServicePause()
-
 	val settings: SettingsRepository
 	val tunnels: TunnelConfigRepository
 	val appState: AppStateRepository

diff --git a/...rc/main/java/com/zaneschepke/wireguardautotunnel/data/repository/AppDataRoomRepository.kt b/...rc/main/java/com/zaneschepke/wireguardautotunnel/data/repository/AppDataRoomRepository.kt
@@ -23,16 +23,4 @@ constructor(
 			getPrimaryOrFirstTunnel()
 		}
 	}
-
-	override suspend fun toggleWatcherServicePause() {
-		val settings = settings.getSettings()
-		if (settings.isAutoTunnelEnabled) {
-			val pauseAutoTunnel = !settings.isAutoTunnelPaused
-			this.settings.save(
-				settings.copy(
-					isAutoTunnelPaused = pauseAutoTunnel,
-				),
-			)
-		}
-	}
 }
diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/service/tile/AutoTunnelControlTile.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/service/tile/AutoTunnelControlTile.kt
@@ -13,7 +13,6 @@ import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
@@ -38,21 +37,25 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
 
 		applicationScope.launch {
 			appDataRepository.settings.getSettingsFlow().collect {
-				when (it.isAutoTunnelEnabled) {
-					true -> {
-						if (it.isAutoTunnelPaused) {
-							setInactive()
-							setTileDescription(this@AutoTunnelControlTile.getString(R.string.paused))
-						} else {
-							setActive()
-							setTileDescription(this@AutoTunnelControlTile.getString(R.string.active))
+				kotlin.runCatching {
+					when (it.isAutoTunnelEnabled) {
+						true -> {
+							if (it.isAutoTunnelPaused) {
+								setInactive()
+								setTileDescription(this@AutoTunnelControlTile.getString(R.string.paused))
+							} else {
+								setActive()
+								setTileDescription(this@AutoTunnelControlTile.getString(R.string.active))
+							}
 						}
-					}
 
-					false -> {
-						setTileDescription(this@AutoTunnelControlTile.getString(R.string.disabled))
-						setUnavailable()
+						false -> {
+							setTileDescription(this@AutoTunnelControlTile.getString(R.string.disabled))
+							setUnavailable()
+						}
 					}
+				}.onFailure {
+					Timber.e(it)
 				}
 			}
 		}
@@ -76,12 +79,20 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
 		super.onClick()
 		unlockAndRun {
 			lifecycleScope.launch {
-				try {
-					appDataRepository.toggleWatcherServicePause()
-				} catch (e: Exception) {
-					Timber.e(e.message)
-				} finally {
-					cancel()
+				kotlin.runCatching {
+					val settings = appDataRepository.settings.getSettings()
+					if (settings.isAutoTunnelPaused) {
+						return@launch appDataRepository.settings.save(
+							settings.copy(
+								isAutoTunnelPaused = false,
+							),
+						)
+					}
+					appDataRepository.settings.save(
+						settings.copy(
+							isAutoTunnelPaused = true,
+						),
+					)
 				}
 			}
 		}

diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/service/tile/TunnelControlTile.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/service/tile/TunnelControlTile.kt
@@ -40,6 +40,7 @@ class TunnelControlTile : TileService(), LifecycleOwner {
 
 	override fun onCreate() {
 		super.onCreate()
+		Timber.d("onCreate for tile service")
 		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
 
 		applicationScope.launch {

diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainViewModel.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainViewModel.kt
@@ -77,7 +77,7 @@ constructor(
 		)
 	}
 
-	suspend fun onTunnelStart(tunnelConfig: TunnelConfig) = viewModelScope.launch {
+	fun onTunnelStart(tunnelConfig: TunnelConfig) = viewModelScope.launch {
 		Timber.i("Starting tunnel ${tunnelConfig.name}")
 		tunnelService.startTunnel(tunnelConfig).onSuccess {
 			appDataRepository.appState.setTunnelRunningFromManualStart(tunnelConfig.id)