From e125944cbce225bc42a7a7054832f8f787025e6c Mon Sep 17 00:00:00 2001
From: genofire <geno+dev@fireorbit.de>
Date: Sat, 8 Feb 2020 16:21:53 +0100
Subject: [BUGFIX] happy eye: null pointer if no connection was etablished

---
 src/main/java/de/pixart/messenger/utils/Resolver.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/de/pixart/messenger/utils/Resolver.java b/src/main/java/de/pixart/messenger/utils/Resolver.java
index 0037e9563..86bdc40aa 100644
--- a/src/main/java/de/pixart/messenger/utils/Resolver.java
+++ b/src/main/java/de/pixart/messenger/utils/Resolver.java
@@ -275,6 +275,10 @@ public class Resolver {
         try {
             result = executor.invokeAny(r);
             executor.shutdown();
+            if (result == null) {
+                Log.i(Config.LOGTAG, Resolver.class.getSimpleName() + ": happy eyeball unable to connect to one address");
+                return null;
+            }
             Thread disconnector = new Thread(() -> {
                 while (true) {
                     try {
-- 
cgit v1.2.3