From d0ed8ee89e150cd063185d724a7a7e88e4d9dc25 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 13 Jun 2017 16:21:50 +0200
Subject: [PATCH] android: Add disconnect button to notification

---
 .../android/logic/CharonVpnService.java           |   5 +++++
 .../drawable-hdpi/ic_notification_disconnect.png  | Bin 0 -> 584 bytes
 .../drawable-mdpi/ic_notification_disconnect.png  | Bin 0 -> 390 bytes
 .../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

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 235681772e..ecc69aed84 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 0000000000000000000000000000000000000000..1c94d195fe1b7532ca3688a915684c94f42e3707
GIT binary patch
literal 584
zc-jF-0=NB%P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0006HNkl<Zc-rk(
zyJ`YK6g6r}(MIB?@f$4C*hoZBbQKi*5dDG_c1htkC>Vuc3K0vxAp`;ml2*xvlp*zQ
z&cFya!*1MpsErp6i#qr0*|Yb~TqBWFoZ^V#d0rGq134hiuk3U5kRoD06&L~=!1ewH
z`@9AQKxMDuK;8u2Jh^xU8m5ILfw9lczJM9f2YUQE<KK&}jevv+F&6MFkS~A|5D&;X
z2g<-wc%@Ikg|0JH%qLKn<Y)muf~bV5pa~&b0a*o(u212QRK&CdXLQB5#3@&*(0OaG
zNOH}9m@a=vmvmn=ESXK*nJb9th+@cZOTt|VOE@A)MO|lv-^+x15cW85c!Cqu+9Abs
z0=9(hKDFNY+OQx)p5W1xGs4;#S(n~Ld_@G^>DElZ`aZcwZWnohEWR=649V${d*o#t
zy49^26AoEq@zkU<sx=fNUH0MEWwJFR<i<&tZ9;91SaeTZx;Etu&o2?~Vc4XG-%hPs
zGXnR5a93q)eJ3}zb)Dh7b;7|W&zMYdn>@+40Wn!VHEg3POK=7}_>7{eVpfD_tU92j
zfEU3jTau$DIKw8;q|O+7DTrb&%~|*TGgGq~Eb?`(AjUE==%;*M-*%sxvK^frGwkeR
z2Qt~mXiT)638<+y>AtYRYNxgDf36L_c{%|i96sdPQmt)BoW&310>5Ss`rrN($Bthl
W=Aly8Iu*tM0000<MNUMnLSTYbMh6D~

literal 0
Hc-jL100001

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 0000000000000000000000000000000000000000..82c7277c0f0d9363a101e1f211d40e7aa25c0fdd
GIT binary patch
literal 390
zc-jGm0eSw3P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0003^Nkl<Zc-rNb
zVQK;~5QY7{U20EIrP6D71`*F8$ckRW3ZA1y58wq{E0%f&?GG<dZ8`(r(oo!N68vZ2
zflJ<dlbK`&YqgtM#+XFV0?D;Z>w=*m7o5!B`WCDNnczOwyersacoysg3&EV<XZDoS
z2{j)GemLn=(7eET63oa<gY`pBuI5KUyMlWsSX)_kd}@B+<UZz0%-3YHcixF?ju5;A
zm@oOB@twJZ@1)uYF}LnSwW~5=N}3;`=GOj>@+OzW&j{aQ%;C)0Z@B`z#+bufxB{fq
za2sO|_meUwWrPhu9wW?~Xmi&q8e=vIF-JRvJ9LpA1Yf*_Jixq-MjNeO)y+Ldg&~NK
z`4LUmcOGTdu$vTj@{iNdj)$Y%LFh#7QLbW;ZS@IjpJ+2$<NDxz@{&6lTd%8FC&tRC
kvgQH7Qkqeb-p-$eUp}7B=Ok;(x&QzG07*qoM6N<$f=d##MgRZ+

literal 0
Hc-jL100001

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 0000000000000000000000000000000000000000..6dc5e5112842ee5cefd33bf7daa76e3f68f64d16
GIT binary patch
literal 794
zc-jFP1LgdQP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0008vNkl<Zc-rk*
zJxg3s5Zxw<U=_qg5ph?<N^3#<KvoOULQ_Zzx3O@epjKiL@&`hS_!k68k!le{K@kN7
z?IQu(5D6H_f`%CN<qXWiWw=-K?#FYBH*jFtw{zy)-8*yd%w{sFrIuQ1szp&$59EO%
zV1h9S<mg$gitYf`fPJ76ne7*_2do0^wIIA7*aGgO_;v@BfxhPu-U4g_50Sgk;x~Y7
zQsPH}?*=iyfn#7DSOSW`EWf7rPJllK-*3Q3Xz_EvttR+aU=e8k4~{Ib3|we<XmQ1m
z;^kid2`m70mep!Slk|7q7XiXC%{PBW<<bN9E5k1_;!Auha47=p0*xNHdo|o@PGo&7
z;FBOeO+b9rHe7=Yh*Eh)C#nbWJsR<syqzkd#P+!a+7>}d0mb+7^A+)|Y#XRkRGo9+
zMM&{Vb-EB$sof^nTc6+lBjS5BpIsK8TeS&zs1V!$O`a20D_%M5)DwFzZomfMS|K<}
zO1$ECB5twuae{V>fFD9{8;$R}@XN&sToBH0LL}@H{!7AlFi!9(;ru#D@yszR{3qfF
zm=?}6q4&Ior|7bPf=vnaCEl=whFp^PeaM70@O>0qd6zPJ5PHvRIFA*sO6-XS)qZi1
zy-ZMiGq<Nz+qWTkCq&JM-Zl#FqTpP!A?XrV=`ZSK&S%1kxOLoPt5@m{Te2NpH3}u3
zxfcZQmJ8Xi_!X#$pA0BI&oQb-vHM*~KR?m-IVG$Tr;!H*s%`q{iQ9l535een+%!CE
z@imzk2mWdnFzJCi$AbdZXoNHBdp1-u47N%(ttR=f@0Dg&Iu~j>S2Fw(RAT2%hn?VP
zVxDsi&uuXAVmp~~f==uMx;wGR8M=y7KS50qpYAu0<kMJE6Y4guPCmx#4?H|;eUASL
zhWW6wS;#%lod#;*pPDYdI~|Ezth8&McF@SCGgFJkSMhFcil(_eE%18{nbcBCEj88t
Y0a#*bj<{$c1^@s607*qoM6N<$f)c!Gi2wiq

literal 0
Hc-jL100001

-- 
2.47.3