From 54cb29cd159e69e4d369c1747c88cefbac6e4b3a Mon Sep 17 00:00:00 2001
From: M66B <marcel@faircode.eu>
Date: Tue, 1 Mar 2016 10:56:26 +0100
Subject: [PATCH] Revert "Added debug option to disable using default DNS
 servers"

This reverts commit c2299ac590b4ab869e31fa9860f4c83fb306f7ba.

Refs #356
---
 .../main/java/eu/faircode/netguard/Util.java  | 19 ++++++++-----------
 app/src/main/res/values/strings.xml           |  1 -
 app/src/main/res/xml-v14/preferences.xml      |  4 ----
 app/src/main/res/xml-v21/preferences.xml      |  4 ----
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/eu/faircode/netguard/Util.java b/app/src/main/java/eu/faircode/netguard/Util.java
index ba69214e..6145a5b0 100644
--- a/app/src/main/java/eu/faircode/netguard/Util.java
+++ b/app/src/main/java/eu/faircode/netguard/Util.java
@@ -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;
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 82106f44..77901bb1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -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>
diff --git a/app/src/main/res/xml-v14/preferences.xml b/app/src/main/res/xml-v14/preferences.xml
index c11303f3..e75daddf 100644
--- a/app/src/main/res/xml-v14/preferences.xml
+++ b/app/src/main/res/xml-v14/preferences.xml
@@ -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
diff --git a/app/src/main/res/xml-v21/preferences.xml b/app/src/main/res/xml-v21/preferences.xml
index e18fe463..8f537494 100644
--- a/app/src/main/res/xml-v21/preferences.xml
+++ b/app/src/main/res/xml-v21/preferences.xml
@@ -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