From db6a63bcf6c100f24b90778c3d69e8b6cec31b16 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Tue, 10 Mar 2015 21:46:13 +0100 Subject: open location directly from notification --- .../services/NotificationService.java | 25 +++++++++++++++++++++ src/main/res/drawable-hdpi/ic_room_white_24dp.png | Bin 0 -> 494 bytes src/main/res/drawable-mdpi/ic_room_white_24dp.png | Bin 0 -> 362 bytes src/main/res/drawable-xhdpi/ic_room_white_24dp.png | Bin 0 -> 587 bytes .../res/drawable-xxhdpi/ic_room_white_24dp.png | Bin 0 -> 861 bytes .../res/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 messages) { + for(final Message message : messages) { + if (GeoHelper.isGeoUri(message.getBody())) { + return message; + } + } + return null; + } + private CharSequence getMergedBodies(final ArrayList 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 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 00000000..c2ccd510 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_room_white_24dp.png differ 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 00000000..a4fcd770 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_room_white_24dp.png differ 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 00000000..e1e60a5c Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_room_white_24dp.png differ 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 00000000..00b15508 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_room_white_24dp.png differ 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 00000000..a5dde3b9 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_room_white_24dp.png differ -- cgit v1.2.3