From a07677b0a2f9efc6b00d15d3c4ae0ee1dd6a9c36 Mon Sep 17 00:00:00 2001
From: M66B <marcel@faircode.eu>
Date: Sat, 20 Feb 2016 13:00:50 +0100
Subject: [PATCH] Storing resolved DNS names depends on filtering allowed
 traffic

---
 app/src/main/java/eu/faircode/netguard/SinkholeService.java | 2 +-
 app/src/main/res/xml-v14/preferences.xml                    | 2 +-
 app/src/main/res/xml-v21/preferences.xml                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/netguard/SinkholeService.java b/app/src/main/java/eu/faircode/netguard/SinkholeService.java
index 4888a777..5d15566d 100644
--- a/app/src/main/java/eu/faircode/netguard/SinkholeService.java
+++ b/app/src/main/java/eu/faircode/netguard/SinkholeService.java
@@ -554,7 +554,7 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
 
         private void resolved(ResourceRecord rr) {
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SinkholeService.this);
-            if (prefs.getBoolean("resolved", true))
+            if (prefs.getBoolean("filter_allowed", false) && prefs.getBoolean("resolved", true))
                 DatabaseHelper.getInstance(SinkholeService.this).insertDns(rr);
         }
 
diff --git a/app/src/main/res/xml-v14/preferences.xml b/app/src/main/res/xml-v14/preferences.xml
index 42613cec..6cb12965 100644
--- a/app/src/main/res/xml-v14/preferences.xml
+++ b/app/src/main/res/xml-v14/preferences.xml
@@ -135,7 +135,7 @@
             android:title="@string/setting_block_domains" />
         <CheckBoxPreference
             android:defaultValue="true"
-            android:dependency="filter"
+            android:dependency="filter_allowed"
             android:key="resolved"
             android:summary="@string/summary_resolved"
             android:title="@string/setting_resolved" />
diff --git a/app/src/main/res/xml-v21/preferences.xml b/app/src/main/res/xml-v21/preferences.xml
index 97697eef..403482a6 100644
--- a/app/src/main/res/xml-v21/preferences.xml
+++ b/app/src/main/res/xml-v21/preferences.xml
@@ -135,7 +135,7 @@
             android:title="@string/setting_block_domains" />
         <eu.faircode.netguard.SwitchPreference
             android:defaultValue="true"
-            android:dependency="filter"
+            android:dependency="filter_allowed"
             android:key="resolved"
             android:summary="@string/summary_resolved"
             android:title="@string/setting_resolved" />