gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-16 17:25:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add replyable flag

Browse Source
This commit is contained in:
Mario Danic 2019-12-13 13:34:12 +01:00
parent fbbd46ef20
commit a9933b484c
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,6 +95,8 @@ public class ChatMessage implements IMessage, MessageContentType, MessageContent
public HashMap<String, HashMap<String, String>> messageParameters; public HashMap<String, HashMap<String, String>> messageParameters;
@JsonField(name = "systemMessage", typeConverter = EnumSystemMessageTypeConverter.class) @JsonField(name = "systemMessage", typeConverter = EnumSystemMessageTypeConverter.class)
public SystemMessageType systemMessageType; public SystemMessageType systemMessageType;
@JsonField(name = "isReplyable")
public boolean replyable;
@JsonIgnore @JsonIgnore
@Ignore @Ignore

3
app/src/main/java/com/nextcloud/talk/newarch/local/models/MessageEntity.kt
View File

@ -48,6 +48,7 @@ data class MessageEntity(
@ColumnInfo(name = "message") var message: String? = null, @ColumnInfo(name = "message") var message: String? = null,
/*@JsonField(name = "messageParameters") /*@JsonField(name = "messageParameters")
public HashMap<String, HashMap<String, String>> messageParameters;*/ public HashMap<String, HashMap<String, String>> messageParameters;*/
@ColumnInfo(name = "replyable") var replyable: Boolean = false,
@ColumnInfo(name = "system_message_type") var systemMessageType: SystemMessageType? = null @ColumnInfo(name = "system_message_type") var systemMessageType: SystemMessageType? = null
) )
@ -64,6 +65,7 @@ fun MessageEntity.toChatMessage(): ChatMessage {
chatMessage.message = this.message chatMessage.message = this.message
//chatMessage.messageParameters = this.messageParameters //chatMessage.messageParameters = this.messageParameters
chatMessage.systemMessageType = this.systemMessageType chatMessage.systemMessageType = this.systemMessageType
chatMessage.replyable = this.replyable
return chatMessage return chatMessage
} }
@ -77,6 +79,7 @@ fun ChatMessage.toMessageEntity(): MessageEntity {
messageEntity.timestamp = this.timestamp messageEntity.timestamp = this.timestamp
messageEntity.message = this.message messageEntity.message = this.message
messageEntity.systemMessageType = this.systemMessageType messageEntity.systemMessageType = this.systemMessageType
messageEntity.replyable = this.replyable
//messageEntity.messageParameters = this.messageParameters //messageEntity.messageParameters = this.messageParameters
return messageEntity return messageEntity