mirror of
https://github.com/nextcloud/talk-android
synced 2025-02-08 23:52:48 +00:00
Kotlin & hardening
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
parent
1116c943a9
commit
ef5dc0f0e2
1293
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
Normal file
1293
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
Normal file
File diff suppressed because it is too large
Load Diff
@ -24,5 +24,5 @@ import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class UserMentionClickEvent {
|
||||
private final String userId;
|
||||
public final String userId;
|
||||
}
|
||||
|
@ -27,6 +27,6 @@ import java.util.Map;
|
||||
@Parcel
|
||||
@Data
|
||||
public class RetrofitBucket {
|
||||
String url;
|
||||
Map<String, String> queryMap;
|
||||
public String url;
|
||||
public Map<String, String> queryMap;
|
||||
}
|
||||
|
@ -56,26 +56,26 @@ public class ChatMessage implements IMessage, MessageContentType, MessageContent
|
||||
MessageType.SYSTEM_MESSAGE, MessageType.SINGLE_LINK_VIDEO_MESSAGE,
|
||||
MessageType.SINGLE_LINK_AUDIO_MESSAGE, MessageType.SINGLE_LINK_MESSAGE);
|
||||
@JsonField(name = "id")
|
||||
int jsonMessageId;
|
||||
public int jsonMessageId;
|
||||
@JsonField(name = "token")
|
||||
String token;
|
||||
public String token;
|
||||
// guests or users
|
||||
@JsonField(name = "actorType")
|
||||
String actorType;
|
||||
public String actorType;
|
||||
@JsonField(name = "actorId")
|
||||
String actorId;
|
||||
public String actorId;
|
||||
// send when crafting a message
|
||||
@JsonField(name = "actorDisplayName")
|
||||
String actorDisplayName;
|
||||
public String actorDisplayName;
|
||||
@JsonField(name = "timestamp")
|
||||
long timestamp;
|
||||
public long timestamp;
|
||||
// send when crafting a message, max 1000 lines
|
||||
@JsonField(name = "message")
|
||||
String message;
|
||||
public String message;
|
||||
@JsonField(name = "messageParameters")
|
||||
HashMap<String, HashMap<String, String>> messageParameters;
|
||||
public HashMap<String, HashMap<String, String>> messageParameters;
|
||||
@JsonField(name = "systemMessage", typeConverter = EnumSystemMessageTypeConverter.class)
|
||||
SystemMessageType systemMessageType;
|
||||
public SystemMessageType systemMessageType;
|
||||
|
||||
private boolean hasFileAttachment() {
|
||||
if (messageParameters != null && messageParameters.size() > 0) {
|
||||
|
@ -32,5 +32,5 @@ import java.util.List;
|
||||
@JsonObject
|
||||
public class ChatOCS extends GenericOCS {
|
||||
@JsonField(name = "data")
|
||||
List<ChatMessage> data;
|
||||
public List<ChatMessage> data;
|
||||
}
|
||||
|
@ -30,5 +30,5 @@ import org.parceler.Parcel;
|
||||
@JsonObject
|
||||
public class ChatOverall {
|
||||
@JsonField(name = "ocs")
|
||||
ChatOCS ocs;
|
||||
public ChatOCS ocs;
|
||||
}
|
||||
|
@ -29,8 +29,8 @@ public class Spans {
|
||||
|
||||
@Data
|
||||
public static class MentionChipSpan extends BetterImageSpan {
|
||||
String id;
|
||||
CharSequence label;
|
||||
public String id;
|
||||
public CharSequence label;
|
||||
|
||||
public MentionChipSpan(@NonNull Drawable drawable, int verticalAlignment, String id, CharSequence label) {
|
||||
super(drawable, verticalAlignment);
|
||||
|
Loading…
Reference in New Issue
Block a user