Even more fixes

Author: Pururun

android/lib/talpid/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt

@@ -4,10 +4,11 @@ import android.net.ConnectivityManager
 import android.net.LinkProperties
 import android.net.Network
 import android.net.NetworkCapabilities
-import android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN
 import android.net.NetworkRequest
 import co.touchlab.kermit.Logger
 import java.net.DatagramSocket
+import java.net.Inet4Address
+import java.net.Inet6Address
 import java.net.InetAddress
 import kotlin.collections.ArrayList
 import kotlinx.coroutines.CoroutineScope
@@ -17,7 +18,6 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.scan
@@ -27,7 +27,6 @@ import net.mullvad.talpid.model.Connectivity
 import net.mullvad.talpid.model.NetworkState
 import net.mullvad.talpid.util.IPAvailabilityUtils
 import net.mullvad.talpid.util.NetworkEvent
-import net.mullvad.talpid.util.NetworkEvent.CapabilitiesChanged
 import net.mullvad.talpid.util.RawNetworkState
 import net.mullvad.talpid.util.defaultRawNetworkStateFlow
 import net.mullvad.talpid.util.networkEvents
@@ -63,32 +62,25 @@ class ConnectivityListener(
                 .stateIn(scope, SharingStarted.Eagerly, null)
 
         _isConnected =
-            combine(
-                    _currentNetworkState,
-                    connectivityManager
-                        .defaultRawNetworkStateFlow()
-                        .filterIsInstance<CapabilitiesChanged>(),
-                    hasInternetCapability(),
-                ) {
-                    currentNetworkState: NetworkState?,
-                    capabilitiesChanged: CapabilitiesChanged,
+            combine(connectivityManager.defaultRawNetworkStateFlow(), hasInternetCapability()) {
+                    rawNetworkState: RawNetworkState?,
                     hasInternetCapability: Boolean ->
                     if (hasInternetCapability) {
-                        if (
-                                capabilitiesChanged.networkCapabilities.hasCapability(
-                                    NET_CAPABILITY_NOT_VPN
-                                )
-                            ) {
+                        val isUnderlyingNetwork =
+                            rawNetworkState
+                                ?.networkCapabilities
+                                ?.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN) == true
+                        if (isUnderlyingNetwork) {
                                 // If the default network is not a VPN we can check the addresses
                                 // directly
                                 Connectivity.Status(
                                     ipv4 =
-                                        currentNetworkState?.routes?.any {
-                                            !it.destination.isIpv6
+                                        rawNetworkState.linkProperties?.routes?.any {
+                                            it.destination.address is Inet4Address
                                         } == true,
                                     ipv6 =
-                                        currentNetworkState?.routes?.any {
-                                            it.destination.isIpv6
+                                        rawNetworkState.linkProperties?.routes?.any {
+                                            it.destination.address is Inet6Address
                                         } == true,
                                 )
                             } else {
@@ -106,6 +98,7 @@ class ConnectivityListener(
                         Connectivity.Status(false, false)
                     }
                 }
+                .distinctUntilChanged()
                 .onEach {
                     when (it) {
                         Connectivity.PresumeOnline -> notifyConnectivityChange(true, true)

android/lib/talpid/src/main/kotlin/net/mullvad/talpid/util/IPAvailabilityUtils.kt

@@ -26,7 +26,7 @@ object IPAvailabilityUtils {
         protect: (socket: DatagramSocket) -> Boolean,
     ): Boolean {
         val socket = DatagramSocket()
-        if(!protect(socket)) {
+        if (!protect(socket)) {
             Logger.e("Unable to protect the socket VPN is not set up correctly")
             return false
         }