upgrade minidns. refactored dns utils

1 files changed, 76 insertions, 0 deletions

diff --git a/src/main/java/de/pixart/messenger/utils/AndroidUsingLinkProperties.java b/src/main/java/de/pixart/messenger/utils/AndroidUsingLinkProperties.java
new file mode 100644
index 000000000..b201b354b
--- /dev/null
+++ b/src/main/java/de/pixart/messenger/utils/AndroidUsingLinkProperties.java
@@ -0,0 +1,76 @@
+package de.pixart.messenger.utils;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.LinkProperties;
+import android.net.Network;
+import android.net.RouteInfo;
+import android.os.Build;
+
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.List;
+
+import de.measite.minidns.dnsserverlookup.AbstractDNSServerLookupMechanism;
+import de.measite.minidns.dnsserverlookup.AndroidUsingExec;
+
+public class AndroidUsingLinkProperties extends AbstractDNSServerLookupMechanism {
+
+    private final Context context;
+
+    protected AndroidUsingLinkProperties(Context context) {
+        super(AndroidUsingLinkProperties.class.getSimpleName(), AndroidUsingExec.PRIORITY - 1);
+        this.context = context;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
+    }
+
+    @Override
+    @TargetApi(21)
+    public String[] getDnsServerAddresses() {
+        ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        Network[] networks = connectivityManager == null ? null : connectivityManager.getAllNetworks();
+        if (networks == null) {
+            return new String[0];
+        }
+        List<String> servers = new ArrayList<>();
+        for (Network network : networks) {
+            LinkProperties linkProperties = connectivityManager.getLinkProperties(network);
+            if (linkProperties != null) {
+                if (hasDefaultRoute(linkProperties)) {
+                    servers.addAll(0, getIPv4First(linkProperties.getDnsServers()));
+                } else {
+                    servers.addAll(getIPv4First(linkProperties.getDnsServers()));
+                }
+            }
+        }
+        return servers.toArray(new String[servers.size()]);
+    }
+
+    private static List<String> getIPv4First(List<InetAddress> in) {
+        List<String> out = new ArrayList<>();
+        for (InetAddress addr : in) {
+            if (addr instanceof Inet4Address) {
+                out.add(0, addr.toString());
+            } else {
+                out.add(addr.toString());
+            }
+        }
+        return out;
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    private static boolean hasDefaultRoute(LinkProperties linkProperties) {
+        for (RouteInfo route : linkProperties.getRoutes()) {
+            if (route.isDefaultRoute()) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
\ No newline at end of file