Skip to content

Add option in filter settings to show froxzen (disabled) apps #556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nmarteybotchway wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add option in filter settings to show froxzen (disabled) apps #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/src/main/java/eu/faircode/netguard/ActivityMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@ public void onSharedPreferenceChanged(SharedPreferences prefs, String name) {
"show_system".equals(name) ||
"show_nointernet".equals(name) ||
"show_unprotected".equals(name) ||
"show_frozen".equals(name) ||
"sort".equals(name) ||
"imported".equals(name)) {
if ("sort".equals(name))
Expand Down Expand Up @@ -925,6 +926,7 @@ public boolean onPrepareOptionsMenu(Menu menu) {

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

String sort = prefs.getString("sort", "trackers_week");
if ("uid".equals(sort))
Expand Down Expand Up @@ -964,6 +966,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
item.setChecked(!item.isChecked());
prefs.edit().putBoolean("show_unprotected", item.isChecked()).apply();
return true;
} else if (itemId == R.id.menu_app_frozen) {
item.setChecked(!item.isChecked());
prefs.edit().putBoolean("show_frozen", item.isChecked()).apply();
return true;
} else if (itemId == R.id.menu_sort_name) {
item.setChecked(true);
prefs.edit().putString("sort", "name").apply();
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/Rule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ public static List<Rule> getRules(final boolean all, boolean self, Context conte
boolean show_system = prefs.getBoolean("show_system", false);
boolean show_nointernet = prefs.getBoolean("show_nointernet", true);
boolean show_unprotected = prefs.getBoolean("show_unprotected", false);
boolean show_frozen = prefs.getBoolean("show_frozen", false);
boolean strict_blocking = BlockingMode.isStrictMode(context);

default_screen_wifi = default_screen_wifi && screen_on;
Expand Down Expand Up @@ -393,8 +394,7 @@ public static List<Rule> getRules(final boolean all, boolean self, Context conte
if (all ||
((rule.system ? show_system : show_user) &&
(show_nointernet || rule.internet) &&
rule.enabled)) {

(show_frozen || rule.enabled))) {
rule.wifi_default = (pre_wifi_blocked.containsKey(info.packageName)
? pre_wifi_blocked.get(info.packageName)
: default_wifi);
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/menu/main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
android:id="@+id/menu_app_unprotected"
android:checkable="true"
android:title="@string/menu_app_unprotected"/>
<item
android:id="@+id/menu_app_frozen"
android:checkable="true"
android:title="@string/menu_app_frozen"/>
</menu>
</item>
<item
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<string name="menu_app_system">Show system apps</string>
<string name="menu_app_nointernet">Show apps without internet</string>
<string name="menu_app_unprotected">Show unprotected apps only</string>
<string name="menu_app_frozen">Show frozen apps</string>
<string name="menu_sort">Sort apps</string>
<string name="menu_sort_name">Sort by name</string>
<string name="menu_sort_uid">Sort by uid</string>
Expand Down
Loading