Resolver: active network gets high priority

Daniel Gultsch created 8 years ago

Change summary

src/main/java/eu/siacs/conversations/utils/AndroidUsingLinkProperties.java | 21 
1 file changed, 11 insertions(+), 10 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/utils/AndroidUsingLinkProperties.java

@@ -44,18 +44,19 @@ public class AndroidUsingLinkProperties extends AbstractDNSServerLookupMechanism
         int vpnOffset = 0;
         for(Network network : networks) {
             LinkProperties linkProperties = connectivityManager.getLinkProperties(network);
+            if (linkProperties == null) {
+                continue;
+            }
             NetworkInfo networkInfo = connectivityManager.getNetworkInfo(network);
             final boolean isActiveNetwork = network.equals(activeNetwork);
-            if (linkProperties != null) {
-                if (networkInfo != null && isActiveNetwork && networkInfo.getType() == ConnectivityManager.TYPE_VPN) {
-                    final List<String> tmp = getIPv4First(linkProperties.getDnsServers());
-                    servers.addAll(0, tmp);
-                    vpnOffset += tmp.size();
-                } else if (hasDefaultRoute(linkProperties)) {
-                    servers.addAll(vpnOffset, getIPv4First(linkProperties.getDnsServers()));
-                } else {
-                    servers.addAll(getIPv4First(linkProperties.getDnsServers()));
-                }
+            if (networkInfo != null && isActiveNetwork && networkInfo.getType() == ConnectivityManager.TYPE_VPN) {
+                final List<String> tmp = getIPv4First(linkProperties.getDnsServers());
+                servers.addAll(0, tmp);
+                vpnOffset += tmp.size();
+            } else if (hasDefaultRoute(linkProperties) || isActiveNetwork) {
+                servers.addAll(vpnOffset, getIPv4First(linkProperties.getDnsServers()));
+            } else {
+                servers.addAll(getIPv4First(linkProperties.getDnsServers()));
             }
         }
         return servers.toArray(new String[servers.size()]);