mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Added debug option to disable using default DNS servers" 

This reverts commit c2299ac590.

Refs #356
This commit is contained in:
M66B 2016-03-01 10:56:26 +01:00
parent c2299ac590
commit 54cb29cd15
4 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/eu/faircode/netguard/Util.java
View File

@ -279,18 +279,15 @@ public class Util {
}
public static List<String> getDefaultDNS(Context context) {
String dns1 = jni_getprop("net.dns1");
String dns2 = jni_getprop("net.dns2");
List<String> listDns = new ArrayList<>();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
if (prefs.getBoolean("usedefdns", true)) {
String dns1 = jni_getprop("net.dns1");
String dns2 = jni_getprop("net.dns2");
if (!TextUtils.isEmpty(dns1))
listDns.add(dns1);
if (!TextUtils.isEmpty(dns2))
listDns.add(dns2);
if (TextUtils.isEmpty(dns1) && TextUtils.isEmpty(dns2))
listDns.add("8.8.8.8");
}
if (!TextUtils.isEmpty(dns1))
listDns.add(dns1);
if (!TextUtils.isEmpty(dns2))
listDns.add(dns2);
if (TextUtils.isEmpty(dns1) && TextUtils.isEmpty(dns2))
listDns.add("8.8.8.8");
return listDns;
}

1
app/src/main/res/values/strings.xml
View File

@ -78,7 +78,6 @@ however it is impossible to guarantee NetGuard will work correctly on every devi
<string name="setting_track_usage">Track network usage</string>
<string name="setting_reset_usage">Reset network usage</string>
<string name="setting_show_resolved" translatable="false">Show resolved domain names</string>
<string name="setting_use_defdns" translatable="false">Use default DNS servers</string>
<string name="setting_block_domains">Block domain names</string>
<string name="setting_forwarding">Port forwarding</string>
<string name="setting_vpn4">VPN IPv4: %s</string>

4
app/src/main/res/xml-v14/preferences.xml
View File

@ -221,10 +221,6 @@
<Preference
android:key="show_resolved"
android:title="@string/setting_show_resolved" />
<CheckBoxPreference
android:defaultValue="true"
android:key="usedefdns"
android:title="@string/setting_use_defdns" />
</PreferenceCategory>
<PreferenceCategory

4
app/src/main/res/xml-v21/preferences.xml
View File

@ -221,10 +221,6 @@
<Preference
android:key="show_resolved"
android:title="@string/setting_show_resolved" />
<eu.faircode.netguard.SwitchPreference
android:defaultValue="true"
android:key="usedefdns"
android:title="@string/setting_use_defdns" />
</PreferenceCategory>
<PreferenceCategory