From e750b81a31f7ddf3dff6d4611607549fc024d4e1 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 19 May 2026 23:51:39 +0000
Subject: [PATCH] Disable dnsjava hosts file parsing to fix NPE race condition.

---
 .../main/java/org/thoughtcrime/securesms/net/CustomDns.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/CustomDns.java b/app/src/main/java/org/thoughtcrime/securesms/net/CustomDns.java
index df164512ce..77634c43f1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/net/CustomDns.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/net/CustomDns.java
@@ -56,7 +56,11 @@ public class CustomDns implements Dns {
 
   private static @NonNull Lookup doLookup(@NonNull String hostname) throws UnknownHostException {
     try {
-      return new Lookup(hostname);
+      Lookup lookup = new Lookup(hostname);
+      // Disable hosts file lookups to work around a race condition in dnsjava 3.6.4's that leads to an NPE.
+      // Android doesn't have a meaningful /etc/hosts anyway.
+      lookup.setHostsFileParser(null);
+      return lookup;
     } catch (Throwable e) {
       Log.w(TAG, e);
       throw new UnknownHostException();