gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-06 22:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

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

Fix issues

Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-08-07 21:46:34 +02:00
parent c7e82012b9
commit 8c45893bbe
6 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java
View File

@ -44,6 +44,7 @@ import com.nextcloud.talk.utils.database.user.UserUtils;
import com.stfalcon.chatkit.messages.MessageHolders; import com.stfalcon.chatkit.messages.MessageHolders;
import com.stfalcon.chatkit.utils.ShapeImageView; import com.stfalcon.chatkit.utils.ShapeImageView;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.inject.Inject; import javax.inject.Inject;
@ -120,7 +121,7 @@ public class MagicIncomingTextMessageViewHolder
messageAuthor.setVisibility(View.VISIBLE); 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(); Context context = NextcloudTalkApplication.getSharedApplication().getApplicationContext();
itemView.setSelected(false); itemView.setSelected(false);

3
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java
View File

@ -41,6 +41,7 @@ import com.nextcloud.talk.utils.EmojiDetection;
import com.nextcloud.talk.utils.database.user.UserUtils; import com.nextcloud.talk.utils.database.user.UserUtils;
import com.stfalcon.chatkit.messages.MessageHolders; import com.stfalcon.chatkit.messages.MessageHolders;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.inject.Inject; import javax.inject.Inject;
@ -77,7 +78,7 @@ public class MagicOutcomingTextMessageViewHolder extends MessageHolders.Outcomin
public void onBind(ChatMessage message) { public void onBind(ChatMessage message) {
super.onBind(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()); Spannable messageString = new SpannableString(message.getText());

5
app/src/main/java/com/nextcloud/talk/jobs/NotificationJob.java
View File

@ -265,6 +265,11 @@ public class NotificationJob extends Job {
com.nextcloud.talk.models.json.notifications.Notification notification = com.nextcloud.talk.models.json.notifications.Notification notification =
notificationOverall.getOcs().getNotification(); notificationOverall.getOcs().getNotification();
// subject: group name
// content -
// group: name of author: message
// user: message
if (notification.getMessageRichParameters() != null && if (notification.getMessageRichParameters() != null &&
notification.getMessageRichParameters().size() > 0) { notification.getMessageRichParameters().size() > 0) {
decryptedPushMessage.setText(ChatUtils.getParsedMessage(notification.getMessageRich(), decryptedPushMessage.setText(ChatUtils.getParsedMessage(notification.getMessageRich(),

7
app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
View File

@ -26,18 +26,19 @@ import com.nextcloud.talk.models.json.converters.EnumSystemMessageTypeConverter;
import com.nextcloud.talk.utils.ApiUtils; import com.nextcloud.talk.utils.ApiUtils;
import com.stfalcon.chatkit.commons.models.IMessage; import com.stfalcon.chatkit.commons.models.IMessage;
import com.stfalcon.chatkit.commons.models.IUser; import com.stfalcon.chatkit.commons.models.IUser;
import com.stfalcon.chatkit.commons.models.MessageContentType;
import org.parceler.Parcel; import org.parceler.Parcel;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.HashMap;
import lombok.Data; import lombok.Data;
@Parcel @Parcel
@Data @Data
@JsonObject @JsonObject
public class ChatMessage implements IMessage { public class ChatMessage implements IMessage, MessageContentType {
public enum SystemMessageType { public enum SystemMessageType {
DUMMY, DUMMY,
@ -75,7 +76,7 @@ public class ChatMessage implements IMessage {
@JsonField(name = "message") @JsonField(name = "message")
String message; String message;
@JsonField(name = "messageParameters") @JsonField(name = "messageParameters")
Map<String, Map<String, String>> messageParameters; HashMap<String, HashMap<String, String>> messageParameters;
@JsonField(name = "systemMessage", typeConverter = EnumSystemMessageTypeConverter.class) @JsonField(name = "systemMessage", typeConverter = EnumSystemMessageTypeConverter.class)
SystemMessageType systemMessageType; SystemMessageType systemMessageType;

6
app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java
View File

@ -20,14 +20,14 @@
package com.nextcloud.talk.models.json.chat; package com.nextcloud.talk.models.json.chat;
import java.util.Map; import java.util.HashMap;
public class ChatUtils { 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) { if (messageParameters != null && messageParameters.size() > 0) {
for (String key : messageParameters.keySet()) { 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")) { if (individualHashMap.get("type").equals("user")) {
message = message.replaceAll("\\{" + key + "\\}", "@" + message = message.replaceAll("\\{" + key + "\\}", "@" +
messageParameters.get(key).get("name")); messageParameters.get(key).get("name"));

6
app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.java
View File

@ -26,8 +26,8 @@ import com.bluelinelabs.logansquare.annotation.JsonObject;
import org.parceler.Parcel; import org.parceler.Parcel;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import lombok.Data; import lombok.Data;
@ -60,7 +60,7 @@ public class Notification {
String subjectRich; String subjectRich;
@JsonField(name = "subjectRichParameters") @JsonField(name = "subjectRichParameters")
Map<String, Map<String, String>> subjectRichParameters; HashMap<String, HashMap<String, String>> subjectRichParameters;
@JsonField(name = "message") @JsonField(name = "message")
String message; String message;
@ -69,7 +69,7 @@ public class Notification {
String messageRich; String messageRich;
@JsonField(name = "messageRichParameters") @JsonField(name = "messageRichParameters")
Map<String, Map<String, String>> messageRichParameters; HashMap<String, HashMap<String, String>> messageRichParameters;
@JsonField(name = "link") @JsonField(name = "link")
String link; String link;