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

Make rule toggle a real toggle

This commit is contained in:
M66B 2015-10-25 13:19:39 +01:00
parent bffca4d650
commit 9a4e9e52fb
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/eu/faircode/netguard/ActivityMain.java
View File

@ -120,13 +120,6 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.main, menu);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
MenuItem wifiItem = menu.findItem(R.id.menu_wifi);
MenuItem otherItem = menu.findItem(R.id.menu_other);
wifiItem.setIcon(prefs.getBoolean("wifi", true) ? R.drawable.ic_network_wifi_white_24dp : R.drawable.ic_signal_wifi_off_white_24dp);
otherItem.setIcon(prefs.getBoolean("other", true) ? R.drawable.ic_network_cell_white_24dp : R.drawable.ic_signal_cellular_off_white_24dp);
MenuItem searchItem = menu.findItem(R.id.menu_search);
SearchView searchView = (SearchView) MenuItemCompat.getActionView(searchItem);
searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
@ -159,21 +152,16 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle item selection
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
switch (item.getItemId()) {
case R.id.menu_wifi:
boolean wifi = !prefs.getBoolean("wifi", true);
prefs.edit().putBoolean("wifi", wifi).apply();
if (adapter != null)
adapter.set("wifi", wifi, this);
adapter.toggle("wifi", this);
invalidateOptionsMenu();
return true;
case R.id.menu_other:
boolean other = !prefs.getBoolean("other", true);
prefs.edit().putBoolean("other", other).apply();
if (adapter != null)
adapter.set("other", other, this);
adapter.toggle("other", this);
invalidateOptionsMenu();
return true;

14
app/src/main/java/eu/faircode/netguard/RuleAdapter.java
View File

@ -124,14 +124,16 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
};
}
public void set(String name, boolean blocked, Context context) {
public void toggle(String name, Context context) {
SharedPreferences.Editor editor = context.getSharedPreferences(name, Context.MODE_PRIVATE).edit();
for (Rule rule : listSelected) {
if ("wifi".equals(name))
rule.wifi_blocked = blocked;
else
rule.other_blocked = blocked;
editor.putBoolean(rule.info.packageName, blocked);
if ("wifi".equals(name)) {
rule.wifi_blocked = !rule.wifi_blocked;
editor.putBoolean(rule.info.packageName, rule.wifi_blocked);
} else {
rule.other_blocked = !rule.other_blocked;
editor.putBoolean(rule.info.packageName, rule.other_blocked);
}
}
editor.apply();