mirror/NetGuard
1
0
Fork 0
mirror of https://github.com/M66B/NetGuard.git synced 2025-02-23 14:51:06 +00:00
Code Issues Releases Wiki Activity

Prefer IPv4 DNS servers

Browse source
This commit is contained in:
M66B 2017-02-26 16:53:01 +01:00
parent c1c8b1201e
commit d672b7a044
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
View file

@ -970,9 +970,9 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
public static List<InetAddress> getDns(Context context) {
List<InetAddress> listDns = new ArrayList<>();
List<String> sysDns = Util.getDefaultDNS(context);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
List<String> sysDns = Util.getDefaultDNS(context);
String vpnDns1 = prefs.getString("dns", null);
String vpnDns2 = prefs.getString("dns2", null);
Log.i(TAG, "DNS system=" + TextUtils.join(",", sysDns) + " VPN1=" + vpnDns1 + " VPN2=" + vpnDns2);
@ -1003,6 +1003,21 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
} catch (Throwable ignored) {
}
// Prefer IPv4 addresses
Collections.sort(listDns, new Comparator<InetAddress>() {
@Override
public int compare(InetAddress a, InetAddress b) {
boolean a4 = (a instanceof Inet4Address);
boolean b4 = (b instanceof Inet4Address);
if (a4 && !b4)
return -1;
else if (!a4 && b4)
return 1;
else
return 0;
}
});
return listDns;
}