mirror/NetGuard
1
0
Fork 0
mirror of https://github.com/M66B/NetGuard.git synced 2025-01-04 06:23:04 +00:00
Code Issues Releases Wiki Activity

Save last number of rules

Browse source
This commit is contained in:
M66B 2017-08-16 10:11:34 +02:00
parent 2840824c70
commit e5e5202862
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
View file

@ -129,6 +129,10 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
private boolean last_interactive = false; private boolean last_interactive = false;
private boolean powersaving = false; private boolean powersaving = false;
private int last_allowed = 0;
private int last_blocked = 0;
private int last_hosts = 0;
private ServiceSinkhole.Builder last_builder = null; private ServiceSinkhole.Builder last_builder = null;
private ParcelFileDescriptor vpn = null; private ParcelFileDescriptor vpn = null;
private boolean temporarilyStopped = false; private boolean temporarilyStopped = false;
@ -495,10 +499,11 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
} }
private void reload(boolean interactive) { private void reload(boolean interactive) {
List<Rule> listRule = Rule.getRules(true, ServiceSinkhole.this);
// Check if rules needs to be reloaded // Check if rules needs to be reloaded
if (interactive) { if (interactive) {
boolean process = false; boolean process = false;
List<Rule> listRule = Rule.getRules(true, ServiceSinkhole.this);
for (Rule rule : listRule) { for (Rule rule : listRule) {
boolean blocked = (last_metered ? rule.other_blocked : rule.wifi_blocked); boolean blocked = (last_metered ? rule.other_blocked : rule.wifi_blocked);
boolean screen = (last_metered ? rule.screen_other : rule.screen_wifi); boolean screen = (last_metered ? rule.screen_other : rule.screen_wifi);
@ -526,7 +531,6 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
Log.d(TAG, "Start foreground state=" + state.toString()); Log.d(TAG, "Start foreground state=" + state.toString());
} }
List<Rule> listRule = Rule.getRules(true, ServiceSinkhole.this);
List<Rule> listAllowed = getAllowedRules(listRule); List<Rule> listAllowed = getAllowedRules(listRule);
ServiceSinkhole.Builder builder = getBuilder(listAllowed, listRule); ServiceSinkhole.Builder builder = getBuilder(listAllowed, listRule);
@ -597,7 +601,12 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
} }
if (state == State.enforcing && !temporary) { if (state == State.enforcing && !temporary) {
Log.d(TAG, "Stop foreground state=" + state.toString()); Log.d(TAG, "Stop foreground state=" + state.toString());
last_allowed = 0;
last_blocked = 0;
last_hosts = 0;
stopForeground(true); stopForeground(true);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ServiceSinkhole.this); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ServiceSinkhole.this);
if (prefs.getBoolean("show_stats", false)) { if (prefs.getBoolean("show_stats", false)) {
startForeground(NOTIFY_WAITING, getWaitingNotification()); startForeground(NOTIFY_WAITING, getWaitingNotification());
@ -2510,6 +2519,19 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
.setVisibility(NotificationCompat.VISIBILITY_SECRET) .setVisibility(NotificationCompat.VISIBILITY_SECRET)
.setPriority(NotificationCompat.PRIORITY_MIN); .setPriority(NotificationCompat.PRIORITY_MIN);
if (allowed > 0)
last_allowed = allowed;
else
allowed = last_allowed;
if (blocked > 0)
last_blocked = blocked;
else
blocked = last_blocked;
if (hosts > 0)
last_hosts = hosts;
else
hosts = last_hosts;
if (allowed > 0 || blocked > 0 || hosts > 0) { if (allowed > 0 || blocked > 0 || hosts > 0) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (Util.isPlayStoreInstall(this)) if (Util.isPlayStoreInstall(this))