Merge branch 'check-if-we-can-remove-dummynameresolver-droid-1496'

3 files changed, 0 insertions, 61 deletions

diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
index 42bdc56a6c..ad4fb20a22 100644
--- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
+++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
@@ -41,7 +41,6 @@ import mullvad_daemon.management_interface.ManagementInterface
 import mullvad_daemon.management_interface.ManagementServiceGrpcKt
 import net.mullvad.mullvadvpn.lib.daemon.grpc.mapper.fromDomain
 import net.mullvad.mullvadvpn.lib.daemon.grpc.mapper.toDomain
-import net.mullvad.mullvadvpn.lib.daemon.grpc.resolver.DummyNameResolverFactory
 import net.mullvad.mullvadvpn.lib.daemon.grpc.util.LogInterceptor
 import net.mullvad.mullvadvpn.lib.daemon.grpc.util.connectivityFlow
 import net.mullvad.mullvadvpn.lib.model.AccountData
@@ -150,10 +149,6 @@ class ManagementService(
                 rpcSocketFile.absolutePath,
                 LocalSocketAddress.Namespace.FILESYSTEM,
             )
-            // We need to provide a DummyNameResolver to avoid default NameResolver making incorrect
-            // InetSocketAddress look ups. For more info see:
-            // https://github.com/grpc/grpc-java/issues/11442
-            .nameResolverFactory(DummyNameResolverFactory())
             .build()
 
     val connectionState: StateFlow<GrpcConnectivityState> =
diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/resolver/DummyNameResolver.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/resolver/DummyNameResolver.kt
deleted file mode 100644
index d77a9ba6c7..0000000000
--- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/resolver/DummyNameResolver.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package net.mullvad.mullvadvpn.lib.daemon.grpc.resolver
-
-import io.grpc.EquivalentAddressGroup
-import io.grpc.NameResolver
-import io.grpc.StatusOr
-import java.net.InetSocketAddress
-
-class DummyNameResolver : NameResolver() {
-
-    override fun getServiceAuthority(): String = SERVICE_AUTHORITY
-
-    override fun start(listener: Listener2) {
-        val resolutionResult =
-            ResolutionResult.newBuilder()
-                .setAddressesOrError(
-                    StatusOr.fromValue(
-                        listOf(
-                            EquivalentAddressGroup(
-                                InetSocketAddress.createUnresolved(DUMMY_HOST, DUMMY_PORT)
-                            )
-                        )
-                    )
-                )
-                .build()
-
-        listener.onResult(resolutionResult)
-    }
-
-    override fun shutdown() {
-        // Do nothing
-    }
-
-    companion object {
-        const val SERVICE_AUTHORITY = "localhost"
-        private const val DUMMY_HOST = ""
-        private const val DUMMY_PORT = 80
-    }
-}
diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/resolver/DummyNameResolverFactory.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/resolver/DummyNameResolverFactory.kt
deleted file mode 100644
index 1a8141985d..0000000000
--- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/resolver/DummyNameResolverFactory.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package net.mullvad.mullvadvpn.lib.daemon.grpc.resolver
-
-import io.grpc.NameResolver
-import java.net.URI
-
-class DummyNameResolverFactory : NameResolver.Factory() {
-    override fun newNameResolver(targetUri: URI, args: NameResolver.Args): NameResolver {
-        return DummyNameResolver()
-    }
-
-    override fun getDefaultScheme(): String {
-        return DNS_SCHEME
-    }
-
-    companion object {
-        private const val DNS_SCHEME = "dns"
-    }
-}