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

Disable/hide log if filtering not available

This commit is contained in:
M66B 2017-04-08 10:58:31 +02:00
parent c344693928
commit 4fc1ac6e2c
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -758,6 +758,8 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
menu.findItem(R.id.menu_sort_name).setChecked(true);
menu.findItem(R.id.menu_lockdown).setChecked(prefs.getBoolean("lockdown", false));
if (!Util.canFilter(this))
menu.removeItem(R.id.menu_log);
return super.onPrepareOptionsMenu(menu);
}

2
app/src/main/java/eu/faircode/netguard/ActivitySettings.java
View File

@ -218,7 +218,9 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
});
boolean can = Util.canFilter(this);
TwoStatePreference pref_log_app = (TwoStatePreference) screen.findPreference("log_app");
TwoStatePreference pref_filter = (TwoStatePreference) screen.findPreference("filter");
pref_log_app.setEnabled(can);
pref_filter.setEnabled(can);
// VPN parameters

2
app/src/main/java/eu/faircode/netguard/AdapterRule.java
View File

@ -592,6 +592,7 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> im
final boolean log_app = prefs.getBoolean("log_app", false);
final boolean filter = prefs.getBoolean("filter", false);
holder.tvLogging.setText(log_app && filter ? R.string.title_logging_enabled : R.string.title_logging_disabled);
holder.btnLogging.setVisibility(Util.canFilter(context) ? View.VISIBLE : View.GONE);
holder.btnLogging.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -615,7 +616,6 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> im
}
});
cbFiltering.setEnabled(Util.canFilter(context));
cbFiltering.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {

5
app/src/main/java/eu/faircode/netguard/Receiver.java
View File

@ -100,8 +100,11 @@ public class Receiver extends BroadcastReceiver {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
editor.putBoolean("filter", true); // Mandatory
if (!Util.canFilter(context))
if (!Util.canFilter(context)) {
editor.putBoolean("log_app", false);
editor.putBoolean("filter", false);
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
editor.remove("show_top");