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

Added error notification

This commit is contained in:
M66B 2016-01-23 19:00:35 +01:00
parent 9a192067f7
commit 6403fb7796
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,8 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
private static final int NOTIFY_ENFORCING = 1;
private static final int NOTIFY_WAITING = 2;
private static final int NOTIFY_DISABLED = 3;
private static final int NOTIFY_TRAFFIC = 4;
private static final int NOTIFY_ERROR = 4;
private static final int NOTIFY_TRAFFIC = 5;
public static final String EXTRA_COMMAND = "Command";
private static final String EXTRA_REASON = "Reason";
@ -334,7 +335,7 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
jni_start(vpn.getFd(), getAllowedUids(listAllowed), hname, log, filter, prio);
}
removeDisabledNotification();
removeWarningNotifications();
updateEnforcingNotification(listAllowed.size(), listRule.size());
}
}
@ -803,6 +804,7 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
if (!planned) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
prefs.edit().putBoolean("enabled", false).apply();
showErrorNotification();
}
}
@ -1173,7 +1175,7 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
TypedValue tv = new TypedValue();
getTheme().resolveAttribute(R.attr.colorAccent, tv, true);
NotificationCompat.Builder notification = new NotificationCompat.Builder(this)
NotificationCompat.Builder builder = new NotificationCompat.Builder(this)
.setSmallIcon(R.drawable.ic_error_white_24dp)
.setContentTitle(getString(R.string.app_name))
.setContentText(getString(R.string.msg_revoked))
@ -1184,11 +1186,38 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
.setOngoing(false)
.setAutoCancel(true);
NotificationCompat.BigTextStyle notification = new NotificationCompat.BigTextStyle(builder);
notification.bigText(getString(R.string.msg_revoked));
NotificationManagerCompat.from(this).notify(NOTIFY_DISABLED, notification.build());
}
private void removeDisabledNotification() {
private void showErrorNotification() {
Intent main = new Intent(this, ActivityMain.class);
PendingIntent pi = PendingIntent.getActivity(this, 0, main, PendingIntent.FLAG_UPDATE_CURRENT);
TypedValue tv = new TypedValue();
getTheme().resolveAttribute(R.attr.colorAccent, tv, true);
NotificationCompat.Builder builder = new NotificationCompat.Builder(this)
.setSmallIcon(R.drawable.ic_error_white_24dp)
.setContentTitle(getString(R.string.app_name))
.setContentText(getString(R.string.msg_error))
.setContentIntent(pi)
.setCategory(Notification.CATEGORY_STATUS)
.setVisibility(Notification.VISIBILITY_SECRET)
.setColor(tv.data)
.setOngoing(false)
.setAutoCancel(true);
NotificationCompat.BigTextStyle notification = new NotificationCompat.BigTextStyle(builder);
notification.bigText(getString(R.string.msg_error));
NotificationManagerCompat.from(this).notify(NOTIFY_ERROR, notification.build());
}
private void removeWarningNotifications() {
NotificationManagerCompat.from(this).cancel(NOTIFY_DISABLED);
NotificationManagerCompat.from(this).cancel(NOTIFY_ERROR);
}
public static void run(String reason, Context context) {

1
app/src/main/res/values/strings.xml
View File

@ -89,6 +89,7 @@ These issues are caused by bugs in Android, or in the software provided by the m
<string name="msg_waiting">Waiting for event</string>
<string name="msg_disabled">NetGuard is disabled, use the switch above to enable NetGuard</string>
<string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>
<string name="msg_error">NetGuard has been disabled, because of an internal error</string>
<string name="msg_installed">\'%1$s\' installed</string>
<string name="msg_completed">Action completed</string>
<string name="msg_vpn">NetGuard uses a local VPN as a sinkhole to block internet traffic.