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

Revert "Fixed swiping away graph while service not running" 

This reverts commit 888c2635c8.
This commit is contained in:
M66B 2016-06-24 22:00:08 +02:00
parent 5c92573d49
commit dd9f5b101e
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,6 +94,8 @@ public class Receiver extends BroadcastReceiver {
} else if (Intent.ACTION_MY_PACKAGE_REPLACED.equals(intent.getAction())) {
if (prefs.getBoolean("enabled", false))
ServiceSinkhole.start("receiver", context);
else if (prefs.getBoolean("show_stats", false))
ServiceSinkhole.run("receiver", context);
}
} catch (Throwable ex) {
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));

28
app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
View File

@ -170,7 +170,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
private static final int MSG_PACKET = 4;
private static final int MSG_USAGE = 5;
private enum State {none, waiting, enforcing}
private enum State {none, waiting, enforcing, stats}
public enum Command {run, start, reload, stop, stats, set, householding}
@ -507,7 +507,13 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
if (state == State.enforcing) {
Log.d(TAG, "Stop foreground state=" + state.toString());
stopForeground(true);
state = State.none;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ServiceSinkhole.this);
if (prefs.getBoolean("show_stats", false)) {
startForeground(NOTIFY_WAITING, getWaitingNotification());
state = State.waiting;
Log.d(TAG, "Start foreground state=" + state.toString());
} else
state = State.none;
}
}
@ -706,7 +712,12 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
Log.i(TAG, "Stats stop");
stats = false;
this.removeMessages(MSG_STATS_UPDATE);
NotificationManagerCompat.from(ServiceSinkhole.this).cancel(NOTIFY_TRAFFIC);
if (state == State.stats) {
Log.d(TAG, "Stop foreground state=" + state.toString());
stopForeground(true);
state = State.none;
} else
NotificationManagerCompat.from(ServiceSinkhole.this).cancel(NOTIFY_TRAFFIC);
}
private void updateStats() {
@ -915,7 +926,16 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
.setVisibility(Notification.VISIBILITY_PUBLIC);
}
NotificationManagerCompat.from(ServiceSinkhole.this).notify(NOTIFY_TRAFFIC, builder.build());
if (state == State.none || state == State.waiting) {
if (state != State.none) {
Log.d(TAG, "Stop foreground state=" + state.toString());
stopForeground(true);
}
startForeground(NOTIFY_TRAFFIC, builder.build());
state = State.stats;
Log.d(TAG, "Start foreground state=" + state.toString());
} else
NotificationManagerCompat.from(ServiceSinkhole.this).notify(NOTIFY_TRAFFIC, builder.build());
}
}