Skip to content

Commit 9f94d80

Browse files
Add option in filter settings to show froxzen (disabled) apps (#556)
1 parent 68fcd53 commit 9f94d80

4 files changed

Lines changed: 13 additions & 2 deletions

File tree

app/src/main/java/eu/faircode/netguard/ActivityMain.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -759,6 +759,7 @@ public void onSharedPreferenceChanged(SharedPreferences prefs, String name) {
759759
"show_system".equals(name) ||
760760
"show_nointernet".equals(name) ||
761761
"show_unprotected".equals(name) ||
762+
"show_frozen".equals(name) ||
762763
"sort".equals(name) ||
763764
"imported".equals(name)) {
764765
if ("sort".equals(name))
@@ -947,6 +948,7 @@ public boolean onPrepareOptionsMenu(Menu menu) {
947948

948949
menu.findItem(R.id.menu_app_nointernet).setChecked(prefs.getBoolean("show_nointernet", true));
949950
menu.findItem(R.id.menu_app_unprotected).setChecked(prefs.getBoolean("show_unprotected", false));
951+
menu.findItem(R.id.menu_app_frozen).setChecked(prefs.getBoolean("show_frozen", false));
950952

951953
String sort = prefs.getString("sort", "trackers_week");
952954
if ("uid".equals(sort))
@@ -986,6 +988,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
986988
item.setChecked(!item.isChecked());
987989
prefs.edit().putBoolean("show_unprotected", item.isChecked()).apply();
988990
return true;
991+
} else if (itemId == R.id.menu_app_frozen) {
992+
item.setChecked(!item.isChecked());
993+
prefs.edit().putBoolean("show_frozen", item.isChecked()).apply();
994+
return true;
989995
} else if (itemId == R.id.menu_sort_name) {
990996
item.setChecked(true);
991997
prefs.edit().putString("sort", "name").apply();

app/src/main/java/eu/faircode/netguard/Rule.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ public static List<Rule> getRules(final boolean all, boolean self, Context conte
261261
boolean show_system = prefs.getBoolean("show_system", false);
262262
boolean show_nointernet = prefs.getBoolean("show_nointernet", true);
263263
boolean show_unprotected = prefs.getBoolean("show_unprotected", false);
264+
boolean show_frozen = prefs.getBoolean("show_frozen", false);
264265
boolean strict_blocking = BlockingMode.isStrictMode(context);
265266

266267
default_screen_wifi = default_screen_wifi && screen_on;
@@ -393,8 +394,7 @@ public static List<Rule> getRules(final boolean all, boolean self, Context conte
393394
if (all ||
394395
((rule.system ? show_system : show_user) &&
395396
(show_nointernet || rule.internet) &&
396-
rule.enabled)) {
397-
397+
(show_frozen || rule.enabled))) {
398398
rule.wifi_default = (pre_wifi_blocked.containsKey(info.packageName)
399399
? pre_wifi_blocked.get(info.packageName)
400400
: default_wifi);

app/src/main/res/menu/main.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
android:id="@+id/menu_app_unprotected"
2828
android:checkable="true"
2929
android:title="@string/menu_app_unprotected"/>
30+
<item
31+
android:id="@+id/menu_app_frozen"
32+
android:checkable="true"
33+
android:title="@string/menu_app_frozen"/>
3034
</menu>
3135
</item>
3236
<item

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<string name="menu_app_system">Show system apps</string>
1717
<string name="menu_app_nointernet">Show apps without internet</string>
1818
<string name="menu_app_unprotected">Show unprotected apps only</string>
19+
<string name="menu_app_frozen">Show frozen apps</string>
1920
<string name="menu_sort">Sort apps</string>
2021
<string name="menu_sort_name">Sort by name</string>
2122
<string name="menu_sort_uid">Sort by uid</string>

0 commit comments

Comments
 (0)