From db6a63bcf6c100f24b90778c3d69e8b6cec31b16 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Tue, 10 Mar 2015 21:46:13 +0100
Subject: [PATCH] open location directly from notification

---
 .../services/NotificationService.java         |  25 ++++++++++++++++++
 .../res/drawable-hdpi/ic_room_white_24dp.png  | Bin 0 -> 494 bytes
 .../res/drawable-mdpi/ic_room_white_24dp.png  | Bin 0 -> 362 bytes
 .../res/drawable-xhdpi/ic_room_white_24dp.png | Bin 0 -> 587 bytes
 .../drawable-xxhdpi/ic_room_white_24dp.png    | Bin 0 -> 861 bytes
 .../drawable-xxxhdpi/ic_room_white_24dp.png   | Bin 0 -> 1093 bytes
 6 files changed, 25 insertions(+)
 create mode 100644 src/main/res/drawable-hdpi/ic_room_white_24dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_room_white_24dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_room_white_24dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_room_white_24dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_room_white_24dp.png

diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index a260d6e2..f5d733b3 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -40,6 +40,7 @@ import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.ui.ConversationActivity;
 import eu.siacs.conversations.ui.ManageAccountActivity;
 import eu.siacs.conversations.ui.TimePreference;
+import eu.siacs.conversations.utils.GeoHelper;
 import eu.siacs.conversations.utils.UIHelper;
 import eu.siacs.conversations.xmpp.XmppConnection;
 
@@ -279,6 +280,11 @@ public class NotificationService {
 						createDownloadIntent(message)
 						);
 			}
+			if ((message = getFirstLocationMessage(messages)) != null) {
+				mBuilder.addAction(R.drawable.ic_room_white_24dp,
+						mXmppConnectionService.getString(R.string.show_location),
+						createShowLocationIntent(message));
+			}
 			mBuilder.setContentIntent(createContentIntent(conversation));
 		}
 		return mBuilder;
@@ -342,6 +348,15 @@ public class NotificationService {
 		return null;
 	}
 
+	private Message getFirstLocationMessage(final Iterable<Message> messages) {
+		for(final Message message : messages) {
+			if (GeoHelper.isGeoUri(message.getBody())) {
+				return message;
+			}
+		}
+		return null;
+	}
+
 	private CharSequence getMergedBodies(final ArrayList<Message> messages) {
 		final StringBuilder text = new StringBuilder();
 		for (int i = 0; i < messages.size(); ++i) {
@@ -353,6 +368,16 @@ public class NotificationService {
 		return text.toString();
 	}
 
+	private PendingIntent createShowLocationIntent(final Message message) {
+		Iterable<Intent> intents = GeoHelper.createGeoIntentsFromMessage(message);
+		for(Intent intent : intents) {
+			if (intent.resolveActivity(mXmppConnectionService.getPackageManager()) != null) {
+				return PendingIntent.getActivity(mXmppConnectionService,18,intent,PendingIntent.FLAG_UPDATE_CURRENT);
+			}
+		}
+		return createOpenConversationsIntent();
+	}
+
 	private PendingIntent createContentIntent(final String conversationUuid, final String downloadMessageUuid) {
 		final TaskStackBuilder stackBuilder = TaskStackBuilder
 			.create(mXmppConnectionService);
diff --git a/src/main/res/drawable-hdpi/ic_room_white_24dp.png b/src/main/res/drawable-hdpi/ic_room_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2ccd51064b3d487236a833c280f9000c4c35d2c
GIT binary patch
literal 494
zcmV<K0TKR*P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00Cx6L_t(Y$K94aO9Md=hL;o(gBSd$LR$R~f^86kSQ~p|
zMA4X9Td~sGCjN&=4gyvpVxcLF_y+>onFv9POX6cA;#}@__hK5I?dF|*irv|HSD{9;
z)Sm)5<T<B_hewkN>r6xk#VFCjA1@S%MFAzbAS`M)wx9$z=;E4jJ5U)@oZ5gEFvkb;
zW>D3)sY{((JYTkA0?p798(dN-6e(OEeo_xw5#<fy-%6YZp)Kn{B~e@u+J?~f^q>P#
zoDo_^X#0B5jwsFxtst~*J!mQPjK+8r+M*sbO+WC~($qx0&y=Z;u6!NiaYvo5FMDZj
z$SrJQ(+o<|F=9G{6Cmi(o)|&LcCSChyB72IbpaNG?MMqcw4aa;&!Lzn`w6K~tc8Md
zQC-9h#8ji(QJVGurbT)fU&{@ER)=-kGl3}&Z`p|-Q}I5?gzUY4j#mKM%>MQhk)=<M
k>?nRCMRxz&|0vS>1a3cw$(*+uPXGV_07*qoM6N<$f)$O!rT_o{

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-mdpi/ic_room_white_24dp.png b/src/main/res/drawable-mdpi/ic_room_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4fcd7708002165c9c36dd4b69440a763a0080d9
GIT binary patch
literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O=~G=W<fgc%uT%>kMH
z$kW9!#NzbUDc*dHjsk7gF;087$uvk$C}8e1-tdg!(5d9U!+osYhctVpKG!*tzA)JE
z${B%=*H^9nr~lF~bnC$y@n_`<uKm1na@o677B^VA&nsOZ#&%`r$5pfCKgK`nSZ2#9
z`=T@T^aR0mbF8g42v&17E9#!`Vz-Hw^E$S1W;frQ+{!O(b4n6YPwQp!wCPySj(l~%
zLGI<F2OYA%tO8U#S{EGC4f$=e<8r9zik7pNo}9Jgli#<e<gsFZ%$17mwGP@<@{i6O
zu~Yqa@>psPdyLWibs00Y!@cgmDVcoizFlL-4rY_k=P5idcUA*^%i!ti=d#Wzp$P#0
C%ZaT3

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xhdpi/ic_room_white_24dp.png b/src/main/res/drawable-xhdpi/ic_room_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1e60a5c26885fd697ca7e693c7a71d022d9e49b
GIT binary patch
literal 587
zcmV-R0<`^!P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00F~EL_t(o!|j*5N&`U{g|mthLPFj`FpV}|io|FY;;j&0
zK*Tzr27Ch*Q;4l1K7eSnSG=V1)@bFWh!&bkOrqeTe744!-OTJx3L*cNd*=U!-MO3-
zAkf$+&;*zPSPYS)KnWY07fx9riDd@R$_x+4>W*nz`~o_;#I4Th@B<j8O1-L(@(LKn
zMx|^wgxkldqFNQ_59R!8uh6M8r{C=am_fIubO4sa!gQ-!`M!_?2Bj^wi4!D9f*tAm
zggPK689rO1$VwE;>VSe|_J1{bL35%GC<%k(f@VO_JgWo54HgtMAwl!04*2i{cvlBJ
zDXfsBped>Y4u!!xf@WXP9H;}9B#SUxqgaqA7S#bM=|;*kK!^}Y$?O67nJNdg^QL`N
zywav~*llS8HuX-^er-UX?uB!q)&4^NMw`?EOy~nFZj{?!J9{LzOMhG$Fy_^^94oay
z^6rbe`KsIgi!MLTZmlk0)t_~Y@aWpUNW`!CO}hfpChYr$WBYY8`5^4zlI{tc3Lw3b
zTiT|_WQ3X*0CQ$Dn#EpC`(5)PFv{&O9~x~$%8XG4piHb$F?N)1z8Ps`PR@{NCjI{g
Z_yLBqowqvfpDF+V002ovPDHLkV1hcM`3C?1

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxhdpi/ic_room_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_room_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..00b15508b22a0efce9043713aa51d25c7e84b5e1
GIT binary patch
literal 861
zcmV-j1ETziP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00PxXL_t(&-tC&dYg17a#}iD9$<(0~`ol$`w2PKlsAQ;^
zKR`jSs3;}ItQ7}G5j&*a{Lw{ha1ex$irPVu;tx9LYPBt)2tskOP187}27~F>L2cFM
zp7-88=e|UE=dJI1^Wo;)ch5cF>w~Yk9-jx~0eL{%PY7|0Vj6iAQAHI+<nb8Sa1<f;
zf%=ib7pS6yJ2>PXP!uz;6VK3R9w>qd)L=Kh;|BJa1nR*8oW^@}n*xeq9Xhdw!zO@Y
z*nn=7F(3`pqd7a<v(zmK6w%0?f8(9K^tJ~y0g1RS1r&9#(CLrBK^dSKNX1hLpngb3
zln<1#{E<~;kwzL>6fEDp%>@b(TPOg0#xMd~ZwHaU3i<vzcJqMZ7TZGm4n+s%NzEV+
zXq23t_PUx*tP-lLJfLY}=wYQQNvIz3fbv8t2b8KHk=~0uprUf%EUC*Wbp;+!RXK2)
z)Qu^1-*`Y@HG#&Jx+)LoljdJGrPLL9KyQg$2og!XMtr+iKsjOoCzPrbp?bgrx=akc
zf{wbHE^<%1!UH-&ZUgh^tb?;iYT`VgFtN^lejby5<WdkRiygm$2)F!rWLZ)aki!_p
zF-4^E?|8zmht7!>XbC=03o2qb6|_jy)c3@I?#mSUF)^S)sdL$!2+o|`LGg?T&{;X4
zUHHJp`A8IW8qJ0z8|b`j_alHM7S58r`Ek-8I>7=uX`+MnS{vt$nU>xFHnngz?f1`|
zHa#<1KzGe`VOxn~k-CO%HQA?5IR?65wsG#qOGh}b%v%fl9JGfwu-^@@W5hPlh&$$s
zAJ1*!ynx>=d#Vd1OPmt+y6Kk<Spp5Y?I=!?IFs&MoMGZXxPWjYJl9^772Z#8qg?6J
zb%9Pb(k8#P1LtOAeft1r|H7HITN#?WNYIAmEu3YvHN(w@zF)~*#(`$JYH=Jj)Nrhs
n?tWatMej0-2jl_$A3#3<&#NQEXz~=o00000NkvXXu0mjf&>eq1

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxxhdpi/ic_room_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_room_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5dde3b94ee3e494268ad8b5ab71d6975d9c0737
GIT binary patch
literal 1093
zcmV-L1iJf)P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00X^AL_t(|+U=W7NK{c2$6q?*jMl0Ya+G1*go{=h%_2l;
zDIw0Ft=i-!WAH26<St}DgrFh{!;K#(iLN7pA)Gc6(HBHe`GFOdNthbW$oOwlAUV#Q
zci%bpz2N<4J?EU?aPQo6@BLo`#{c~>TmToq1#kge0A~RdB8*-PBZ)<<A&oTFu!tmv
zaRp%%IvJn{QOsZ+xwMXHG^5CQ0Hugy4OD$cKaM#E;4lWT1+&^j93@Twh+rA2T0)b(
z0DjzuRo#WpE`UnB1c#m@U<W`omcXS2oX`zWjc?%8S5*Yn!LtNzEudT%fS+mX@1F}k
zJpe<H(j6TD5lHHsG{6xH%NA`Wl*j@MKwABh0A&h2k6CTts2o5XI&@tMpvXkSY(=Z^
z$^b-76tRsFL=l7+UIY=v7`9D(yGaIMhFrj8miDXyQ{?YYNdS28laxGz_5)+YkRiqR
zfdYPjF!9%G&lx2~jB<(}pqDs!^2MPIq;7tIVbatM5IWfuA<_^(K$4JlgcNC<5a|g&
zz#<`SloY9j5NVztfU<}MNs&UN#f%*wO-M^yL4AZsDSm)oS^?7h0LyGcsEV|du>-td
zo5ZbzNbmUp9uv}zks?hHA|?0%?vWO<io9`xb}eLWq!!=-Q%@V?2RKP=!*ZwYBt{AI
z0~BC`*iIje&_!&gH|cvaGaH(RCN?CMS;jtnL-a^yM|R1?rZ9zZv>*f@e5gVzCP-8F
zuR3J_juQufb%mskRi0`oe@^aPs7DJxj~qa$slyR9rBNn%Haad2FfDtydqy1Ktn~fB
zYti!G$X{?=6a{FL2k?-#_i9=;Zv#=eBfBgH(52^+&xg+<<$r-+*FABE2tbFvi*7GI
zu$MotW`k0-8k}bbxS-qYF~?f|GaS+lP{#^TXNO;Cg01{X^(w3Yl;?3MQng7qj1jV&
z@$3(-+UJ?`Ftm2B;IY%S7`C`i&fv7&w#yrq0B+jv8!fi5Du1+YedTcOHegq&{9QCS
z#XEgV3E;MK%-?>zHC_HY6g$biUPHPB+<SOZ>$LX+eWn1eIqv~P0TSf$6LdF<&KDd3
ztP&kr0luufFIpN2f2g}?bn+vh!Mp&2&VI$@!EDa*XRWnvI-X&bW97i|SJWKpdI1d7
zV<&6*JE-T+CIMie+nSBcegFfb`^q1c$s`5f|L53cPUYCpP5=XeJtwH2_$RMCfPvaS
zUiU53$YqfPFc3io88l1gkOeT%BlF**4?z6m0=NJ!fD7OPSo-`16T)}G++ta@00000
LNkvXXu0mjf7}C=e

literal 0
HcmV?d00001