From f50d2f73bfa089eec487a5778e5846490bead6d5 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 14 Nov 2019 21:10:46 +0100
Subject: [PATCH] Fixed mini port scanner

---
 .../java/eu/faircode/email/EmailProvider.java | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EmailProvider.java b/app/src/main/java/eu/faircode/email/EmailProvider.java
index 487f7d04d3..d06c2dda93 100644
--- a/app/src/main/java/eu/faircode/email/EmailProvider.java
+++ b/app/src/main/java/eu/faircode/email/EmailProvider.java
@@ -73,7 +73,7 @@ public class EmailProvider {
 
     enum UserType {LOCAL, EMAIL}
 
-    private static final int DNS_TIMEOUT = 5 * 1000; // milliseconds
+    private static final int SCAN_TIMEOUT = 5 * 1000; // milliseconds
     private static final int ISPDB_TIMEOUT = 15 * 1000; // milliseconds
 
     private static final ExecutorService executor =
@@ -623,21 +623,21 @@ public class EmailProvider {
             this.reachable = executor.submit(new Callable<Boolean>() {
                 @Override
                 public Boolean call() {
-                    try (Socket socket = new Socket()) {
-                        InetAddress[] iaddr = InetAddress.getAllByName(host);
-                        for (int i = 0; i < iaddr.length; i++)
-                            try {
-                                Log.i("Connecting to " + iaddr[i]);
-                                InetSocketAddress inetSocketAddress = new InetSocketAddress(iaddr[i], Server.this.port);
-                                socket.connect(inetSocketAddress, DNS_TIMEOUT);
+                    try {
+                        for (InetAddress iaddr : InetAddress.getAllByName(host)) {
+                            InetSocketAddress address = new InetSocketAddress(iaddr, Server.this.port);
+                            try (Socket socket = new Socket()) {
+                                Log.i("Connecting to " + address);
+                                socket.connect(address, SCAN_TIMEOUT);
+                                Log.i("Reachable " + address);
+                                return true;
                             } catch (Throwable ex) {
-                                if (i + 1 == iaddr.length)
-                                    throw ex;
+                                Log.i("Unreachable " + address + ": " + Helper.formatThrowable(ex));
                             }
-                        Log.i("Reachable " + Server.this);
-                        return true;
-                    } catch (IOException ex) {
-                        Log.i("Unreachable " + Server.this + ": " + Helper.formatThrowable(ex));
+                        }
+                        return false;
+                    } catch (Throwable ex) {
+                        Log.w(ex);
                         return false;
                     }
                 }