From 8c45893bbe34dceda158432e5b3a1ff96e52e6a2 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Tue, 7 Aug 2018 21:46:34 +0200 Subject: [PATCH] Fixes Signed-off-by: Mario Danic Fix issues Signed-off-by: Mario Danic --- .../messages/MagicIncomingTextMessageViewHolder.java | 3 ++- .../messages/MagicOutcomingTextMessageViewHolder.java | 3 ++- .../main/java/com/nextcloud/talk/jobs/NotificationJob.java | 5 +++++ .../com/nextcloud/talk/models/json/chat/ChatMessage.java | 7 ++++--- .../com/nextcloud/talk/models/json/chat/ChatUtils.java | 6 +++--- .../talk/models/json/notifications/Notification.java | 6 +++--- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java index df0df07dd..7f097f93c 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java @@ -44,6 +44,7 @@ import com.nextcloud.talk.utils.database.user.UserUtils; import com.stfalcon.chatkit.messages.MessageHolders; import com.stfalcon.chatkit.utils.ShapeImageView; +import java.util.HashMap; import java.util.Map; import javax.inject.Inject; @@ -120,7 +121,7 @@ public class MagicIncomingTextMessageViewHolder messageAuthor.setVisibility(View.VISIBLE); } - Map> messageParameters = message.getMessageParameters(); + HashMap> messageParameters = message.getMessageParameters(); Context context = NextcloudTalkApplication.getSharedApplication().getApplicationContext(); itemView.setSelected(false); diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java index dfddc0853..4b95e4160 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java @@ -41,6 +41,7 @@ import com.nextcloud.talk.utils.EmojiDetection; import com.nextcloud.talk.utils.database.user.UserUtils; import com.stfalcon.chatkit.messages.MessageHolders; +import java.util.HashMap; import java.util.Map; import javax.inject.Inject; @@ -77,7 +78,7 @@ public class MagicOutcomingTextMessageViewHolder extends MessageHolders.Outcomin public void onBind(ChatMessage message) { super.onBind(message); - Map> messageParameters = message.getMessageParameters(); + HashMap> messageParameters = message.getMessageParameters(); Spannable messageString = new SpannableString(message.getText()); diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationJob.java b/app/src/main/java/com/nextcloud/talk/jobs/NotificationJob.java index f59d2a8fe..6d8db1c17 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationJob.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationJob.java @@ -265,6 +265,11 @@ public class NotificationJob extends Job { com.nextcloud.talk.models.json.notifications.Notification notification = notificationOverall.getOcs().getNotification(); + // subject: group name + // content - + // group: name of author: message + // user: message + if (notification.getMessageRichParameters() != null && notification.getMessageRichParameters().size() > 0) { decryptedPushMessage.setText(ChatUtils.getParsedMessage(notification.getMessageRich(), diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java index 7d4dd0405..15526ddb6 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java +++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java @@ -26,18 +26,19 @@ import com.nextcloud.talk.models.json.converters.EnumSystemMessageTypeConverter; import com.nextcloud.talk.utils.ApiUtils; import com.stfalcon.chatkit.commons.models.IMessage; import com.stfalcon.chatkit.commons.models.IUser; +import com.stfalcon.chatkit.commons.models.MessageContentType; import org.parceler.Parcel; import java.util.Date; -import java.util.Map; +import java.util.HashMap; import lombok.Data; @Parcel @Data @JsonObject -public class ChatMessage implements IMessage { +public class ChatMessage implements IMessage, MessageContentType { public enum SystemMessageType { DUMMY, @@ -75,7 +76,7 @@ public class ChatMessage implements IMessage { @JsonField(name = "message") String message; @JsonField(name = "messageParameters") - Map> messageParameters; + HashMap> messageParameters; @JsonField(name = "systemMessage", typeConverter = EnumSystemMessageTypeConverter.class) SystemMessageType systemMessageType; diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java index 7904a3b44..0e4adc264 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java +++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java @@ -20,14 +20,14 @@ package com.nextcloud.talk.models.json.chat; -import java.util.Map; +import java.util.HashMap; public class ChatUtils { - public static String getParsedMessage(String message, Map> messageParameters) { + public static String getParsedMessage(String message, HashMap> messageParameters) { if (messageParameters != null && messageParameters.size() > 0) { for (String key : messageParameters.keySet()) { - Map individualHashMap = messageParameters.get(key); + HashMap individualHashMap = messageParameters.get(key); if (individualHashMap.get("type").equals("user")) { message = message.replaceAll("\\{" + key + "\\}", "@" + messageParameters.get(key).get("name")); diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.java b/app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.java index db00ff614..6a425679c 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.java +++ b/app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.java @@ -26,8 +26,8 @@ import com.bluelinelabs.logansquare.annotation.JsonObject; import org.parceler.Parcel; import java.util.Date; +import java.util.HashMap; import java.util.List; -import java.util.Map; import lombok.Data; @@ -60,7 +60,7 @@ public class Notification { String subjectRich; @JsonField(name = "subjectRichParameters") - Map> subjectRichParameters; + HashMap> subjectRichParameters; @JsonField(name = "message") String message; @@ -69,7 +69,7 @@ public class Notification { String messageRich; @JsonField(name = "messageRichParameters") - Map> messageRichParameters; + HashMap> messageRichParameters; @JsonField(name = "link") String link;