Fixes

Signed-off-by: Mario Danic <mario@lovelyhq.com>

Fix issues

Signed-off-by: Mario Danic <mario@lovelyhq.com>

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<String, Map<String, String>> messageParameters = message.getMessageParameters();
+        HashMap<String, HashMap<String, String>> messageParameters = message.getMessageParameters();
 
         Context context = NextcloudTalkApplication.getSharedApplication().getApplicationContext();
         itemView.setSelected(false);

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<String, Map<String, String>> messageParameters = message.getMessageParameters();
+        HashMap<String, HashMap<String, String>> messageParameters = message.getMessageParameters();
 
         Spannable messageString = new SpannableString(message.getText());
 

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(),

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<String, Map<String, String>> messageParameters;
+    HashMap<String, HashMap<String, String>> messageParameters;
 
     @JsonField(name = "systemMessage", typeConverter = EnumSystemMessageTypeConverter.class)
     SystemMessageType systemMessageType;

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<String, Map<String, String>> messageParameters) {
+    public static String getParsedMessage(String message, HashMap<String, HashMap<String, String>> messageParameters) {
         if (messageParameters != null && messageParameters.size() > 0) {
             for (String key : messageParameters.keySet()) {
-                Map<String, String> individualHashMap = messageParameters.get(key);
+                HashMap<String, String> individualHashMap = messageParameters.get(key);
                 if (individualHashMap.get("type").equals("user")) {
                     message = message.replaceAll("\\{" + key + "\\}", "@" +
                             messageParameters.get(key).get("name"));

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<String, Map<String, String>> subjectRichParameters;
+    HashMap<String, HashMap<String, String>> subjectRichParameters;
 
     @JsonField(name = "message")
     String message;
@@ -69,7 +69,7 @@ public class Notification {
     String messageRich;
 
     @JsonField(name = "messageRichParameters")
-    Map<String, Map<String, String>> messageRichParameters;
+    HashMap<String, HashMap<String, String>> messageRichParameters;
 
     @JsonField(name = "link")
     String link;