Merge pull request #57 from jpolnetpl/prefer-wifi

Prefer IPv4 addresses on wlan* interfaces

Author: marcosdiez

ShareViaHttp/app/src/main/java/com/MarcosDiez/shareviahttp/MyHttpServer.java

@@ -168,7 +168,10 @@ public synchronized void stopServer() {
     }
 
     public CharSequence[] listOfIpAddresses() {
-        ArrayList<String> arrayOfIps = new ArrayList<String>();
+        ArrayList<String> arrayOfIps = new ArrayList<String>(); // preferred IPs
+        ArrayList<String> arrayOfIps4 = new ArrayList<String>(); // IPv4 addresses
+        ArrayList<String> arrayOfIps6 = new ArrayList<String>(); // IPv6 addresses
+        ArrayList<String> arrayOfIpsL = new ArrayList<String>(); // loopback
 
 
         try {
@@ -184,17 +187,27 @@ public CharSequence[] listOfIpAddresses() {
                     String theIpTemp = inetAddress.getHostAddress();
                     String theIp = getServerUrl(theIpTemp);
 
-                    if (inetAddress instanceof Inet6Address
-                            || inetAddress.isLoopbackAddress()) {
-
-                        arrayOfIps.add(theIp);
+                    if (inetAddress instanceof Inet6Address) {
+                        arrayOfIps6.add(theIp);
+                        continue;
+                    } else if (inetAddress.isLoopbackAddress()) {
+                        arrayOfIpsL.add(theIp);
+                        continue;
+                    } else if (intf.getDisplayName().matches("wlan.*")) {
+                        arrayOfIps.add(0,theIp); // prefer IPv4 on wlan interface
+                        continue;
+                    } else {
+                        arrayOfIps4.add(theIp);
                         continue;
                     }
-
-                    arrayOfIps.add(0, theIp); // we prefer non local IPv4
                 }
             }
 
+            // append IP lists in order of preference
+            arrayOfIps.addAll(arrayOfIps4);
+            arrayOfIps.addAll(arrayOfIps6);
+            arrayOfIps.addAll(arrayOfIpsL);
+
             if (arrayOfIps.size() == 0) {
                 String firstIp = getServerUrl("0.0.0.0");
                 arrayOfIps.add(firstIp);