Merge pull request Jigsaw-Code#231 from Jigsaw-Code/bemasc-npe

Catch NPE when the DOH client closed the socket
DBOI7453 · Nov 12, 2019 · 4b9eefa · 4b9eefa
2 parents a518b2c + f22579a
commit 4b9eefa
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Android/app/src/main/java/app/intra/net/go/LocalhostResolver.java b/Android/app/src/main/java/app/intra/net/go/LocalhostResolver.java
@@ -116,6 +116,10 @@ private boolean receive(DatagramPacket packet) {
     } catch (IOException e) {
       Log.i(LOG_TAG, "Read failed", e);
       return false;
+    } catch (NullPointerException e) {
+      // Workaround for an Android platform bug.  See https://github.com/Jigsaw-Code/Intra/issues/160
+      LogWrapper.logException(e);
+      return false;
     }
   }