Make connectivity sender static

2 files changed, 2 insertions, 27 deletions

diff --git a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt
index a37cf18578..4cb67f9945 100644
--- a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt
+++ b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt
@@ -21,15 +21,6 @@ import net.mullvad.talpid.util.defaultNetworkFlow
 import net.mullvad.talpid.util.networkFlow
 
 class ConnectivityListener(val connectivityManager: ConnectivityManager) {
-    // Used by JNI
-    var senderAddress = 0L
-        set(value) {
-            if (value == 0L) {
-                destroySender(field)
-            }
-            field = value
-        }
-
     private lateinit var _isConnected: StateFlow<Boolean>
     // Used by JNI
     val isConnected
@@ -46,18 +37,10 @@ class ConnectivityListener(val connectivityManager: ConnectivityManager) {
 
         _isConnected =
             hasInternetCapability()
-                .onEach {
-                    if (senderAddress != 0L) {
-                        notifyConnectivityChange(it, senderAddress)
-                    }
-                }
+                .onEach { notifyConnectivityChange(it) }
                 .stateIn(scope, SharingStarted.Eagerly, false)
     }
 
-    fun unregister() {
-        senderAddress = 0L
-    }
-
     private fun dnsServerChanges(): Flow<List<InetAddress>> =
         connectivityManager
             .defaultNetworkFlow()
@@ -92,7 +75,5 @@ class ConnectivityListener(val connectivityManager: ConnectivityManager) {
             .distinctUntilChanged()
     }
 
-    private external fun notifyConnectivityChange(isConnected: Boolean, senderAddress: Long)
-
-    private external fun destroySender(senderAddress: Long)
+    private external fun notifyConnectivityChange(isConnected: Boolean)
 }
diff --git a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
index dfd6699b1e..dc1f8d23ca 100644
--- a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
+++ b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
@@ -41,12 +41,6 @@ open class TalpidVpnService : LifecycleVpnService() {
         connectivityListener.register(lifecycleScope)
     }
 
-    @CallSuper
-    override fun onDestroy() {
-        super.onDestroy()
-        connectivityListener.unregister()
-    }
-
     fun openTun(config: TunConfig): CreateTunResult {
         synchronized(this) {
             val tunStatus = activeTunStatus