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

Fixed disabled notification, removing on enable

This commit is contained in:
M66B 2015-10-30 12:49:24 +01:00
parent 9e8f8958aa
commit e1114967d9
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/eu/faircode/netguard/SinkholeService.java
View File

@ -29,6 +29,7 @@ public class SinkholeService extends VpnService {
private boolean debug = false; private boolean debug = false;
private Thread thread = null; private Thread thread = null;
private static final int NOTIFY_DISABLED = 1;
private static final String EXTRA_COMMAND = "Command"; private static final String EXTRA_COMMAND = "Command";
private enum Command {start, reload, stop} private enum Command {start, reload, stop}
@ -49,6 +50,8 @@ public class SinkholeService extends VpnService {
if (enabled && vpn == null) { if (enabled && vpn == null) {
vpn = startVPN(); vpn = startVPN();
startDebug(vpn); startDebug(vpn);
NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
nm.cancel(NOTIFY_DISABLED);
} }
break; break;
@ -271,20 +274,6 @@ public class SinkholeService extends VpnService {
unregisterReceiver(connectivityChangedReceiver); unregisterReceiver(connectivityChangedReceiver);
unregisterReceiver(interactiveStateReceiver); unregisterReceiver(interactiveStateReceiver);
// Display notification
Intent riMain = new Intent(this, ActivityMain.class);
PendingIntent piMain = PendingIntent.getActivity(this, 0, riMain, PendingIntent.FLAG_CANCEL_CURRENT);
NotificationCompat.Builder notification = new NotificationCompat.Builder(this)
.setSmallIcon(R.mipmap.ic_launcher)
.setContentTitle(getString(R.string.app_name))
.setContentText(getString(R.string.msg_revoked))
.setContentIntent(piMain)
.setAutoCancel(true);
NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
notificationManager.notify(0, notification.build());
super.onDestroy(); super.onDestroy();
} }
@ -302,6 +291,20 @@ public class SinkholeService extends VpnService {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
prefs.edit().putBoolean("enabled", false).apply(); prefs.edit().putBoolean("enabled", false).apply();
// Display notification
Intent riMain = new Intent(this, ActivityMain.class);
PendingIntent piMain = PendingIntent.getActivity(this, 0, riMain, PendingIntent.FLAG_CANCEL_CURRENT);
NotificationCompat.Builder notification = new NotificationCompat.Builder(this)
.setSmallIcon(R.mipmap.ic_launcher)
.setContentTitle(getString(R.string.app_name))
.setContentText(getString(R.string.msg_revoked))
.setContentIntent(piMain)
.setAutoCancel(true);
NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
nm.notify(NOTIFY_DISABLED, notification.build());
super.onRevoke(); super.onRevoke();
} }