Fix scope usage in tile service

Reverts part of the changes in the following commit due to how scopes
are used: 9258a8825a9ffc5b30faad6700d71dde87680554

1 files changed, 7 insertions, 7 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadTileService.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadTileService.kt
index 8b64face8f..ecbc117f63 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadTileService.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadTileService.kt
@@ -6,9 +6,10 @@ import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
 import android.util.Log
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.debounce
@@ -23,8 +24,7 @@ import net.mullvad.mullvadvpn.model.TunnelState
 import net.mullvad.talpid.tunnel.ActionAfterDisconnect
 
 class MullvadTileService : TileService() {
-    private val scope = MainScope()
-    private var listenerJob: Job? = null
+    private var scope: CoroutineScope? = null
 
     private lateinit var securedIcon: Icon
     private lateinit var unsecuredIcon: Icon
@@ -65,11 +65,11 @@ class MullvadTileService : TileService() {
     }
 
     override fun onStartListening() {
-        listenerJob = scope.launch { listenToTunnelState() }
+        scope = MainScope().apply { launchListenToTunnelState() }
     }
 
     override fun onStopListening() {
-        listenerJob?.cancel()
+        scope?.cancel()
     }
 
     private fun toggleTunnel() {
@@ -86,8 +86,8 @@ class MullvadTileService : TileService() {
     }
 
     @OptIn(FlowPreview::class)
-    private suspend fun listenToTunnelState() {
-        ServiceConnection(this@MullvadTileService, scope)
+    private fun CoroutineScope.launchListenToTunnelState() = launch {
+        ServiceConnection(this@MullvadTileService, this)
             .tunnelState
             .debounce(300L)
             .map { (tunnelState, connectionState) -> mapToTileState(tunnelState, connectionState) }