aboutsummaryrefslogtreecommitdiffstats
path: root/src/frontends
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2017-06-13 16:21:50 +0200
committerTobias Brunner <tobias@strongswan.org>2017-07-03 10:39:23 +0200
commitd0ed8ee89e150cd063185d724a7a7e88e4d9dc25 (patch)
tree5c94ba2cad11384386e6cd71e491693d44608140 /src/frontends
parentaea901bbbe097b1ad0612e2e0b90c422ff96e5fe (diff)
downloadstrongswan-d0ed8ee89e150cd063185d724a7a7e88e4d9dc25.tar.bz2
strongswan-d0ed8ee89e150cd063185d724a7a7e88e4d9dc25.tar.xz
android: Add disconnect button to notification
Diffstat (limited to 'src/frontends')
-rw-r--r--src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java5
-rw-r--r--src/frontends/android/app/src/main/res/drawable-hdpi/ic_notification_disconnect.pngbin0 -> 584 bytes
-rw-r--r--src/frontends/android/app/src/main/res/drawable-mdpi/ic_notification_disconnect.pngbin0 -> 390 bytes
-rw-r--r--src/frontends/android/app/src/main/res/drawable-xhdpi/ic_notification_disconnect.pngbin0 -> 794 bytes
4 files changed, 5 insertions, 0 deletions
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
--- /dev/null
+++ b/src/frontends/android/app/src/main/res/drawable-hdpi/ic_notification_disconnect.png
Binary files 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
--- /dev/null
+++ b/src/frontends/android/app/src/main/res/drawable-mdpi/ic_notification_disconnect.png
Binary files 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
--- /dev/null
+++ b/src/frontends/android/app/src/main/res/drawable-xhdpi/ic_notification_disconnect.png
Binary files differ