diff --git a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java index 4c8939d6..b353559a 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java +++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java @@ -649,11 +649,10 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere if (prefs.getBoolean("pcap", false)) ServiceSinkhole.setPcap(true, this); - } else if ("show_stats".equals(name)) { - ((TwoStatePreference) getPreferenceScreen().findPreference(name)).setChecked(prefs.getBoolean(name, false)); + } else if ("show_stats".equals(name)) ServiceSinkhole.reloadStats("changed " + name, this); - } else if ("stats_frequency".equals(name)) + else if ("stats_frequency".equals(name)) getPreferenceScreen().findPreference(name).setTitle(getString(R.string.setting_stats_frequency, prefs.getString(name, "1000"))); else if ("stats_samples".equals(name)) diff --git a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java index bc134949..0617cb86 100644 --- a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java +++ b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java @@ -143,7 +143,6 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS private static final int SERVICE_HOUSEHOLDING = 1; private static final int SERVICE_GRAPH_ON = 2; private static final int SERVICE_GRAPH_OFF = 3; - private static final int SERVICE_OFF = 4; private static final int NOTIFY_ENFORCING = 1; private static final int NOTIFY_WAITING = 2; @@ -339,8 +338,6 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS break; case stop: - if ("off".equals(option)) - prefs.edit().putBoolean("enabled", false).apply(); stop(); break; @@ -1965,6 +1962,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS .setPriority(Notification.PRIORITY_MIN); } + if (IAB.isPurchased(ActivityPro.SKU_SPEED, this)) { Intent riGraph = new Intent(this, ServiceSinkhole.class); riGraph.putExtra(ServiceSinkhole.EXTRA_COMMAND, ServiceSinkhole.Command.stats); @@ -1973,12 +1971,6 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS builder.addAction(R.drawable.ic_equalizer_white_24dp, getString(R.string.title_graph), piGraph); } - Intent riOff = new Intent(this, ServiceSinkhole.class); - riOff.putExtra(ServiceSinkhole.EXTRA_COMMAND, ServiceSinkhole.Command.stop); - riOff.putExtra(ServiceSinkhole.EXTRA_OPTION, "off"); - PendingIntent piOff = PendingIntent.getService(this, SERVICE_OFF, riOff, PendingIntent.FLAG_UPDATE_CURRENT); - builder.addAction(R.drawable.ic_power_settings_new_white_24dp, getString(R.string.title_off), piOff); - if (allowed > 0 || blocked > 0 || hosts > 0) { NotificationCompat.BigTextStyle notification = new NotificationCompat.BigTextStyle(builder); notification.bigText(getString(R.string.msg_started)); diff --git a/app/src/main/res/drawable-hdpi/ic_power_settings_new_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_power_settings_new_white_24dp.png deleted file mode 100644 index 24c35093..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_power_settings_new_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_power_settings_new_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_power_settings_new_white_24dp.png deleted file mode 100644 index b9b855f7..00000000 Binary files a/app/src/main/res/drawable-mdpi/ic_power_settings_new_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_power_settings_new_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_power_settings_new_white_24dp.png deleted file mode 100644 index 6ea9162a..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_power_settings_new_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_power_settings_new_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_power_settings_new_white_24dp.png deleted file mode 100644 index 95a2b7e7..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_power_settings_new_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_power_settings_new_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_power_settings_new_white_24dp.png deleted file mode 100644 index 191836bc..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_power_settings_new_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b6d3c5da..1c9c59f1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -209,7 +209,6 @@ Your internet traffic is not being sent to a remote VPN server. Allow Block Graph - Off root mediaserver nobody