Fix broken Android test on API 34

square · Jan 13, 2024 · 0727fae · 0727fae
1 parent 3cc0f49
commit 0727fae
Showing 1 changed file with 33 additions and 24 deletions.
diff --git a/okhttp-android/src/main/kotlin/okhttp3/android/AndroidAsyncDns.kt b/okhttp-android/src/main/kotlin/okhttp3/android/AndroidAsyncDns.kt
@@ -47,31 +47,40 @@ class AndroidAsyncDns(
     hostname: String,
     callback: AsyncDns.Callback,
   ) {
-    resolver.query(
-      network,
-      hostname,
-      dnsClass.type,
-      DnsResolver.FLAG_EMPTY,
-      executor,
-      null,
-      object : DnsResolver.Callback<List<InetAddress>> {
-        override fun onAnswer(
-          addresses: List<InetAddress>,
-          rCode: Int,
-        ) {
-          callback.onResponse(hostname, addresses)
-        }
+    try {
+      resolver.query(
+        network,
+        hostname,
+        dnsClass.type,
+        DnsResolver.FLAG_EMPTY,
+        executor,
+        null,
+        object : DnsResolver.Callback<List<InetAddress>> {
+          override fun onAnswer(
+            addresses: List<InetAddress>,
+            rCode: Int,
+          ) {
+            callback.onResponse(hostname, addresses)
+          }
 
-        override fun onError(e: DnsResolver.DnsException) {
-          callback.onFailure(
-            hostname,
-            UnknownHostException(e.message).apply {
-              initCause(e)
-            },
-          )
-        }
-      },
-    )
+          override fun onError(e: DnsResolver.DnsException) {
+            callback.onFailure(
+              hostname,
+              UnknownHostException(e.message).apply {
+                initCause(e)
+              },
+            )
+          }
+        },
+      )
+    } catch (e: Exception) {
+      callback.onFailure(
+        hostname,
+        UnknownHostException(e.message).apply {
+          initCause(e)
+        },
+      )
+    }
   }
 
   companion object {