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

Sort non default entries at the top

This commit is contained in:
M66B 2015-10-26 09:47:49 +01:00
parent e80e479d5b
commit 16c5e9e22d
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/eu/faircode/netguard/Rule.java
View File

@ -19,8 +19,9 @@ public class Rule implements Comparable<Rule> {
public boolean disabled; public boolean disabled;
public boolean wifi_blocked; public boolean wifi_blocked;
public boolean other_blocked; public boolean other_blocked;
public boolean changed;
private Rule(PackageInfo info, boolean wifi_blocked, boolean other_blocked, Context context) { private Rule(PackageInfo info, boolean wifi_blocked, boolean other_blocked, boolean changed, Context context) {
PackageManager pm = context.getPackageManager(); PackageManager pm = context.getPackageManager();
this.info = info; this.info = info;
this.name = info.applicationInfo.loadLabel(pm).toString(); this.name = info.applicationInfo.loadLabel(pm).toString();
@ -34,6 +35,7 @@ public class Rule implements Comparable<Rule> {
this.wifi_blocked = wifi_blocked; this.wifi_blocked = wifi_blocked;
this.other_blocked = other_blocked; this.other_blocked = other_blocked;
this.changed = changed;
} }
public static List<Rule> getRules(Context context) { public static List<Rule> getRules(Context context) {
@ -41,14 +43,16 @@ public class Rule implements Comparable<Rule> {
SharedPreferences wifi = context.getSharedPreferences("wifi", Context.MODE_PRIVATE); SharedPreferences wifi = context.getSharedPreferences("wifi", Context.MODE_PRIVATE);
SharedPreferences other = context.getSharedPreferences("other", Context.MODE_PRIVATE); SharedPreferences other = context.getSharedPreferences("other", Context.MODE_PRIVATE);
boolean wlWifi = prefs.getBoolean("whitelist_wifi", true);
boolean wlOther = prefs.getBoolean("whitelist_other", true);
List<Rule> listRules = new ArrayList<>(); List<Rule> listRules = new ArrayList<>();
for (PackageInfo info : context.getPackageManager().getInstalledPackages(0)) for (PackageInfo info : context.getPackageManager().getInstalledPackages(0)) {
listRules.add(new Rule( boolean blWifi = wifi.getBoolean(info.packageName, wlWifi);
info, boolean blOther = other.getBoolean(info.packageName, wlOther);
wifi.getBoolean(info.packageName, prefs.getBoolean("whitelist_wifi", true)), boolean changed = (blWifi != wlWifi || blOther != wlOther);
other.getBoolean(info.packageName, prefs.getBoolean("whitelist_other", true)), listRules.add(new Rule(info, blWifi, blOther, changed, context));
context }
));
Collections.sort(listRules); Collections.sort(listRules);
@ -61,7 +65,10 @@ public class Rule implements Comparable<Rule> {
@Override @Override
public int compareTo(Rule other) { public int compareTo(Rule other) {
if (changed == other.changed) {
int i = name.compareToIgnoreCase(other.name); int i = name.compareToIgnoreCase(other.name);
return (i == 0 ? info.packageName.compareTo(other.info.packageName) : i); return (i == 0 ? info.packageName.compareTo(other.info.packageName) : i);
} }
return (changed ? -1 : 1);
}
} }