mirror of https://github.com/M66B/NetGuard.git
Revert "Added debug option to disable using default DNS servers"
This reverts commit c2299ac590
.
Refs #356
This commit is contained in:
parent
c2299ac590
commit
54cb29cd15
|
@ -279,18 +279,15 @@ public class Util {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<String> getDefaultDNS(Context context) {
|
public static List<String> getDefaultDNS(Context context) {
|
||||||
|
String dns1 = jni_getprop("net.dns1");
|
||||||
|
String dns2 = jni_getprop("net.dns2");
|
||||||
List<String> listDns = new ArrayList<>();
|
List<String> listDns = new ArrayList<>();
|
||||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
if (!TextUtils.isEmpty(dns1))
|
||||||
if (prefs.getBoolean("usedefdns", true)) {
|
listDns.add(dns1);
|
||||||
String dns1 = jni_getprop("net.dns1");
|
if (!TextUtils.isEmpty(dns2))
|
||||||
String dns2 = jni_getprop("net.dns2");
|
listDns.add(dns2);
|
||||||
if (!TextUtils.isEmpty(dns1))
|
if (TextUtils.isEmpty(dns1) && TextUtils.isEmpty(dns2))
|
||||||
listDns.add(dns1);
|
listDns.add("8.8.8.8");
|
||||||
if (!TextUtils.isEmpty(dns2))
|
|
||||||
listDns.add(dns2);
|
|
||||||
if (TextUtils.isEmpty(dns1) && TextUtils.isEmpty(dns2))
|
|
||||||
listDns.add("8.8.8.8");
|
|
||||||
}
|
|
||||||
return listDns;
|
return listDns;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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_track_usage">Track network usage</string>
|
||||||
<string name="setting_reset_usage">Reset 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_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_block_domains">Block domain names</string>
|
||||||
<string name="setting_forwarding">Port forwarding</string>
|
<string name="setting_forwarding">Port forwarding</string>
|
||||||
<string name="setting_vpn4">VPN IPv4: %s</string>
|
<string name="setting_vpn4">VPN IPv4: %s</string>
|
||||||
|
|
|
@ -221,10 +221,6 @@
|
||||||
<Preference
|
<Preference
|
||||||
android:key="show_resolved"
|
android:key="show_resolved"
|
||||||
android:title="@string/setting_show_resolved" />
|
android:title="@string/setting_show_resolved" />
|
||||||
<CheckBoxPreference
|
|
||||||
android:defaultValue="true"
|
|
||||||
android:key="usedefdns"
|
|
||||||
android:title="@string/setting_use_defdns" />
|
|
||||||
</PreferenceCategory>
|
</PreferenceCategory>
|
||||||
|
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
|
|
|
@ -221,10 +221,6 @@
|
||||||
<Preference
|
<Preference
|
||||||
android:key="show_resolved"
|
android:key="show_resolved"
|
||||||
android:title="@string/setting_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>
|
||||||
|
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
|
|
Loading…
Reference in New Issue