From d0ed8ee89e150cd063185d724a7a7e88e4d9dc25 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 13 Jun 2017 16:21:50 +0200 Subject: android: Add disconnect button to notification --- .../org/strongswan/android/logic/CharonVpnService.java | 5 +++++ .../main/res/drawable-hdpi/ic_notification_disconnect.png | Bin 0 -> 584 bytes .../main/res/drawable-mdpi/ic_notification_disconnect.png | Bin 0 -> 390 bytes .../res/drawable-xhdpi/ic_notification_disconnect.png | Bin 0 -> 794 bytes 4 files changed, 5 insertions(+) create mode 100644 src/frontends/android/app/src/main/res/drawable-hdpi/ic_notification_disconnect.png create mode 100644 src/frontends/android/app/src/main/res/drawable-mdpi/ic_notification_disconnect.png create mode 100644 src/frontends/android/app/src/main/res/drawable-xhdpi/ic_notification_disconnect.png (limited to 'src') diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java index 235681772..ecc69aed8 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java @@ -365,6 +365,11 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe builder.setContentTitle(getString(s)); if (!publicVersion) { + Intent intent = new Intent(getApplicationContext(), CharonVpnService.class); + intent.setAction(CharonVpnService.DISCONNECT_ACTION); + PendingIntent pending = PendingIntent.getService(getApplicationContext(), 0, intent, + PendingIntent.FLAG_ONE_SHOT); + builder.addAction(R.drawable.ic_notification_disconnect, getString(R.string.disconnect), pending); builder.setContentText(name); builder.setPublicVersion(buildNotification(true)); } diff --git a/src/frontends/android/app/src/main/res/drawable-hdpi/ic_notification_disconnect.png b/src/frontends/android/app/src/main/res/drawable-hdpi/ic_notification_disconnect.png new file mode 100644 index 000000000..1c94d195f Binary files /dev/null and b/src/frontends/android/app/src/main/res/drawable-hdpi/ic_notification_disconnect.png differ diff --git a/src/frontends/android/app/src/main/res/drawable-mdpi/ic_notification_disconnect.png b/src/frontends/android/app/src/main/res/drawable-mdpi/ic_notification_disconnect.png new file mode 100644 index 000000000..82c7277c0 Binary files /dev/null and b/src/frontends/android/app/src/main/res/drawable-mdpi/ic_notification_disconnect.png differ diff --git a/src/frontends/android/app/src/main/res/drawable-xhdpi/ic_notification_disconnect.png b/src/frontends/android/app/src/main/res/drawable-xhdpi/ic_notification_disconnect.png new file mode 100644 index 000000000..6dc5e5112 Binary files /dev/null and b/src/frontends/android/app/src/main/res/drawable-xhdpi/ic_notification_disconnect.png differ -- cgit v1.2.3