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

Revert "Make sure filtering is enabled when Android < 5" 

This reverts commit c1695367c3.
This commit is contained in:
M66B 2016-09-11 14:04:10 +02:00
parent 2f2985e9fa
commit 186e854601
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,6 @@ import android.net.wifi.WifiManager;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.EditTextPreference;
import android.preference.ListPreference;
import android.preference.MultiSelectListPreference;
@ -177,11 +176,8 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
pref_wifi_homes.setEntryValues(listSSID.toArray(new CharSequence[0]));
// Filtering always enabled
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
prefs.edit().putBoolean("filter", true).apply();
((CheckBoxPreference) screen.findPreference("filter")).setChecked(true);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
screen.findPreference("filter").setEnabled(false);
}
Preference pref_reset_usage = screen.findPreference("reset_usage");
pref_reset_usage.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@ -1186,6 +1182,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
}
private void forwardExport(XmlSerializer serializer) throws IOException {
PackageManager pm = getPackageManager();
Cursor cursor = DatabaseHelper.getInstance(this).getForwarding();
int colProtocol = cursor.getColumnIndex("protocol");
int colDPort = cursor.getColumnIndex("dport");
@ -1348,11 +1345,6 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
enabled = Boolean.parseBoolean(value);
else {
if (current == application) {
if ("filter".equals(key) && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
current.put(key, true);
return;
}
// Pro features
if ("log".equals(key)) {
if (!IAB.isPurchased(ActivityPro.SKU_LOG, context))