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

Let domain blocking depend on filtering allowed traffic

This commit is contained in:
M66B 2016-02-14 18:12:45 +01:00
parent 29123467c1
commit 5ed0bf7538
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/netguard/SinkholeService.java
View File

@ -941,8 +941,9 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
private void prepareHostsBlocked() { private void prepareHostsBlocked() {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SinkholeService.this); 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"); File hosts = new File(getFilesDir(), "hosts.txt");
Log.i(TAG, hosts + "=" + use_hosts);
mapHostsBlocked.clear(); mapHostsBlocked.clear();

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

@ -118,21 +118,18 @@
android:key="filter_allowed" android:key="filter_allowed"
android:summary="@string/summary_filter_allowed" android:summary="@string/summary_filter_allowed"
android:title="@string/setting_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 <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
android:dependency="filter" android:dependency="filter"
android:key="resolved" android:key="resolved"
android:summary="@string/summary_resolved" android:summary="@string/summary_resolved"
android:title="@string/setting_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 <Preference
android:dependency="filter" android:dependency="filter"
android:key="forwarding" android:key="forwarding"
@ -200,7 +197,6 @@
android:key="import" android:key="import"
android:title="@string/setting_import" /> android:title="@string/setting_import" />
<Preference <Preference
android:dependency="filter"
android:key="hosts_import" android:key="hosts_import"
android:title="@string/setting_hosts" /> android:title="@string/setting_hosts" />
<EditTextPreference <EditTextPreference
@ -224,6 +220,9 @@
android:key="loglevel" android:key="loglevel"
android:summary="Log level verbose, debug and info will impact performance and battery usage" android:summary="Log level verbose, debug and info will impact performance and battery usage"
android:title="Native log level" /> android:title="Native log level" />
<Preference
android:key="show_resolved"
android:title="@string/setting_show_resolved" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory

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

@ -118,21 +118,18 @@
android:key="filter_allowed" android:key="filter_allowed"
android:summary="@string/summary_filter_allowed" android:summary="@string/summary_filter_allowed"
android:title="@string/setting_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 <eu.faircode.netguard.SwitchPreference
android:defaultValue="true" android:defaultValue="true"
android:dependency="filter" android:dependency="filter"
android:key="resolved" android:key="resolved"
android:summary="@string/summary_resolved" android:summary="@string/summary_resolved"
android:title="@string/setting_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 <Preference
android:dependency="filter" android:dependency="filter"
android:key="forwarding" android:key="forwarding"
@ -200,7 +197,6 @@
android:key="import" android:key="import"
android:title="@string/setting_import" /> android:title="@string/setting_import" />
<Preference <Preference
android:dependency="filter"
android:key="hosts_import" android:key="hosts_import"
android:title="@string/setting_hosts" /> android:title="@string/setting_hosts" />
<EditTextPreference <EditTextPreference
@ -224,6 +220,9 @@
android:key="loglevel" android:key="loglevel"
android:summary="Log level verbose, debug and info will impact performance and battery usage" android:summary="Log level verbose, debug and info will impact performance and battery usage"
android:title="Native log level" /> android:title="Native log level" />
<Preference
android:key="show_resolved"
android:title="@string/setting_show_resolved" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory