Avoid using an unavailable ip version to connect to a relay

Co-authored-by: Sebastian Holmin <sebastian.holmin@mullvad.net>

5 files changed, 37 insertions, 13 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 ede883a837..460dac8f68 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
@@ -66,7 +66,7 @@ class ConnectivityListener(
         _isConnected =
             connectivityManager
                 .hasInternetConnectivity(resolver)
-                .onEach { notifyConnectivityChange(it.ipv4, it.ipv6) }
+                .onEach { notifyConnectivityChange(it) }
                 .stateIn(
                     scope + Dispatchers.IO,
                     SharingStarted.Eagerly,
@@ -99,7 +99,7 @@ class ConnectivityListener(
             linkProperties?.dnsServersWithoutFallback(),
         )
 
-    private external fun notifyConnectivityChange(isIPv4: Boolean, isIPv6: Boolean)
+    private external fun notifyConnectivityChange(connectivity: Connectivity)
 
     private external fun notifyDefaultNetworkChange(networkState: NetworkState?)
 }
diff --git a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/model/Connectivity.kt b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/model/Connectivity.kt
index b87eaaacc8..46195636bc 100644
--- a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/model/Connectivity.kt
+++ b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/model/Connectivity.kt
@@ -1,8 +1,30 @@
 package net.mullvad.talpid.model
 
+import android.net.LinkAddress
+import java.net.Inet4Address
+import java.net.Inet6Address
+
 sealed class Connectivity {
-    data class Status(val ipv4: Boolean, val ipv6: Boolean) : Connectivity()
+    data class Online(val ipAvailability: IpAvailability) : Connectivity()
+
+    data object Offline : Connectivity()
 
     // Required by jni
     data object PresumeOnline : Connectivity()
+
+    companion object {
+        fun fromIpAvailability(ipv4: Boolean, ipv6: Boolean) =
+            when {
+                ipv4 && ipv6 -> Online(IpAvailability.Ipv4AndIpv6)
+                ipv4 -> Online(IpAvailability.Ipv4)
+                ipv6 -> Online(IpAvailability.Ipv6)
+                else -> Offline
+            }
+
+        fun fromLinkAddresses(linkAddresses: List<LinkAddress>): Connectivity {
+            val ipv4 = linkAddresses.any { it.address is Inet4Address }
+            val ipv6 = linkAddresses.any { it.address is Inet6Address }
+            return fromIpAvailability(ipv4, ipv6)
+        }
+    }
 }
diff --git a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/model/IpAvailability.kt b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/model/IpAvailability.kt
new file mode 100644
index 0000000000..916f9d0a88
--- /dev/null
+++ b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/model/IpAvailability.kt
@@ -0,0 +1,7 @@
+package net.mullvad.talpid.model
+
+enum class IpAvailability {
+    Ipv4,
+    Ipv6,
+    Ipv4AndIpv6,
+}
diff --git a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/util/ConnectivityManagerUtil.kt b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/util/ConnectivityManagerUtil.kt
index 7a0208eaa1..5409bc2f99 100644
--- a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/util/ConnectivityManagerUtil.kt
+++ b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/util/ConnectivityManagerUtil.kt
@@ -6,8 +6,6 @@ import android.net.LinkProperties
 import android.net.Network
 import android.net.NetworkCapabilities
 import co.touchlab.kermit.Logger
-import java.net.Inet4Address
-import java.net.Inet6Address
 import kotlin.time.Duration.Companion.milliseconds
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.channels.awaitClose
@@ -137,7 +135,7 @@ internal fun ConnectivityManager.activeRawNetworkState(): RawNetworkState? =
 @OptIn(FlowPreview::class)
 fun ConnectivityManager.hasInternetConnectivity(
     resolver: UnderlyingConnectivityStatusResolver
-): Flow<Connectivity.Status> =
+): Flow<Connectivity> =
     this.defaultRawNetworkStateFlow()
         .debounce(CONNECTIVITY_DEBOUNCE)
         .map { resolveConnectivityStatus(it, resolver) }
@@ -146,7 +144,7 @@ fun ConnectivityManager.hasInternetConnectivity(
 internal fun resolveConnectivityStatus(
     currentRawNetworkState: RawNetworkState?,
     resolver: UnderlyingConnectivityStatusResolver,
-): Connectivity.Status =
+): Connectivity =
     if (currentRawNetworkState.isVpn()) {
         // If the default network is a VPN we need to use a socket to check
         // the underlying network
@@ -158,10 +156,7 @@ internal fun resolveConnectivityStatus(
     }
 
 private fun RawNetworkState?.toConnectivityStatus() =
-    Connectivity.Status(
-        ipv4 = this?.linkProperties?.linkAddresses?.any { it.address is Inet4Address } == true,
-        ipv6 = this?.linkProperties?.linkAddresses?.any { it.address is Inet6Address } == true,
-    )
+    Connectivity.fromLinkAddresses(this?.linkProperties?.linkAddresses ?: emptyList())
 
 private fun RawNetworkState?.isVpn(): Boolean =
     this?.networkCapabilities?.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN) == false
diff --git a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/util/UnderlyingConnectivityStatusResolver.kt b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/util/UnderlyingConnectivityStatusResolver.kt
index 0024f63357..1a5cb33be4 100644
--- a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/util/UnderlyingConnectivityStatusResolver.kt
+++ b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/util/UnderlyingConnectivityStatusResolver.kt
@@ -14,8 +14,8 @@ import net.mullvad.talpid.model.Connectivity
 class UnderlyingConnectivityStatusResolver(
     private val protect: (socket: DatagramSocket) -> Boolean
 ) {
-    fun currentStatus(): Connectivity.Status =
-        Connectivity.Status(ipv4 = hasIpv4(), ipv6 = hasIpv6())
+    fun currentStatus(): Connectivity =
+        Connectivity.fromIpAvailability(ipv4 = hasIpv4(), ipv6 = hasIpv6())
 
     private fun hasIpv4(): Boolean =
         hasIpVersion(Inet4Address.getByName(PUBLIC_IPV4_ADDRESS), protect)