From 5ed0bf75385a6647c9ca89bee6d57cebfaba5922 Mon Sep 17 00:00:00 2001
From: M66B <marcel@faircode.eu>
Date: Sun, 14 Feb 2016 18:12:45 +0100
Subject: [PATCH] Let domain blocking depend on filtering allowed traffic

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

diff --git a/app/src/main/java/eu/faircode/netguard/SinkholeService.java b/app/src/main/java/eu/faircode/netguard/SinkholeService.java
index b0abf666..1d8319a8 100644
--- a/app/src/main/java/eu/faircode/netguard/SinkholeService.java
+++ b/app/src/main/java/eu/faircode/netguard/SinkholeService.java
@@ -941,8 +941,9 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
 
     private void prepareHostsBlocked() {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SinkholeService.this);
-        boolean use_hosts = prefs.getBoolean("use_hosts", false);
+        boolean use_hosts = prefs.getBoolean("filter_allowed", false) && prefs.getBoolean("use_hosts", false);
         File hosts = new File(getFilesDir(), "hosts.txt");
+        Log.i(TAG, hosts + "=" + use_hosts);
 
         mapHostsBlocked.clear();
 
diff --git a/app/src/main/res/xml-v14/preferences.xml b/app/src/main/res/xml-v14/preferences.xml
index 2b11190e..483f2fcd 100644
--- a/app/src/main/res/xml-v14/preferences.xml
+++ b/app/src/main/res/xml-v14/preferences.xml
@@ -118,21 +118,18 @@
             android:key="filter_allowed"
             android:summary="@string/summary_filter_allowed"
             android:title="@string/setting_filter_allowed" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:dependency="filter_allowed"
+            android:key="use_hosts"
+            android:summary="@string/summary_block_domains"
+            android:title="@string/setting_block_domains" />
         <CheckBoxPreference
             android:defaultValue="true"
             android:dependency="filter"
             android:key="resolved"
             android:summary="@string/summary_resolved"
             android:title="@string/setting_resolved" />
-        <Preference
-            android:key="show_resolved"
-            android:title="@string/setting_show_resolved" />
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:dependency="filter"
-            android:key="use_hosts"
-            android:summary="@string/summary_block_domains"
-            android:title="@string/setting_block_domains" />
         <Preference
             android:dependency="filter"
             android:key="forwarding"
@@ -200,7 +197,6 @@
             android:key="import"
             android:title="@string/setting_import" />
         <Preference
-            android:dependency="filter"
             android:key="hosts_import"
             android:title="@string/setting_hosts" />
         <EditTextPreference
@@ -224,6 +220,9 @@
             android:key="loglevel"
             android:summary="Log level verbose, debug and info will impact performance and battery usage"
             android:title="Native log level" />
+        <Preference
+            android:key="show_resolved"
+            android:title="@string/setting_show_resolved" />
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/app/src/main/res/xml-v21/preferences.xml b/app/src/main/res/xml-v21/preferences.xml
index 4f829a7f..a1b9f475 100644
--- a/app/src/main/res/xml-v21/preferences.xml
+++ b/app/src/main/res/xml-v21/preferences.xml
@@ -118,21 +118,18 @@
             android:key="filter_allowed"
             android:summary="@string/summary_filter_allowed"
             android:title="@string/setting_filter_allowed" />
+        <eu.faircode.netguard.SwitchPreference
+            android:defaultValue="true"
+            android:dependency="filter_allowed"
+            android:key="use_hosts"
+            android:summary="@string/summary_block_domains"
+            android:title="@string/setting_block_domains" />
         <eu.faircode.netguard.SwitchPreference
             android:defaultValue="true"
             android:dependency="filter"
             android:key="resolved"
             android:summary="@string/summary_resolved"
             android:title="@string/setting_resolved" />
-        <Preference
-            android:key="show_resolved"
-            android:title="@string/setting_show_resolved" />
-        <eu.faircode.netguard.SwitchPreference
-            android:defaultValue="true"
-            android:dependency="filter"
-            android:key="use_hosts"
-            android:summary="@string/summary_block_domains"
-            android:title="@string/setting_block_domains" />
         <Preference
             android:dependency="filter"
             android:key="forwarding"
@@ -200,7 +197,6 @@
             android:key="import"
             android:title="@string/setting_import" />
         <Preference
-            android:dependency="filter"
             android:key="hosts_import"
             android:title="@string/setting_hosts" />
         <EditTextPreference
@@ -224,6 +220,9 @@
             android:key="loglevel"
             android:summary="Log level verbose, debug and info will impact performance and battery usage"
             android:title="Native log level" />
+        <Preference
+            android:key="show_resolved"
+            android:title="@string/setting_show_resolved" />
     </PreferenceCategory>
 
     <PreferenceCategory