gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-02-08 23:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kotlin & hardening

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-09-27 12:48:22 +02:00
parent 1116c943a9
commit ef5dc0f0e2
7 changed files with 1309 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1293
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt Normal file
View File

File diff suppressed because it is too large Load Diff

2
app/src/main/java/com/nextcloud/talk/events/UserMentionClickEvent.java
View File

@ -24,5 +24,5 @@ import lombok.Data;
@Data @Data
public class UserMentionClickEvent { public class UserMentionClickEvent {
private final String userId; public final String userId;
} }

4
app/src/main/java/com/nextcloud/talk/models/RetrofitBucket.java
View File

@ -27,6 +27,6 @@ import java.util.Map;
@Parcel @Parcel
@Data @Data
public class RetrofitBucket { public class RetrofitBucket {
String url; public String url;
Map<String, String> queryMap; public Map<String, String> queryMap;
} }

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

@ -56,26 +56,26 @@ public class ChatMessage implements IMessage, MessageContentType, MessageContent
MessageType.SYSTEM_MESSAGE, MessageType.SINGLE_LINK_VIDEO_MESSAGE, MessageType.SYSTEM_MESSAGE, MessageType.SINGLE_LINK_VIDEO_MESSAGE,
MessageType.SINGLE_LINK_AUDIO_MESSAGE, MessageType.SINGLE_LINK_MESSAGE); MessageType.SINGLE_LINK_AUDIO_MESSAGE, MessageType.SINGLE_LINK_MESSAGE);
@JsonField(name = "id") @JsonField(name = "id")
int jsonMessageId; public int jsonMessageId;
@JsonField(name = "token") @JsonField(name = "token")
String token; public String token;
// guests or users // guests or users
@JsonField(name = "actorType") @JsonField(name = "actorType")
String actorType; public String actorType;
@JsonField(name = "actorId") @JsonField(name = "actorId")
String actorId; public String actorId;
// send when crafting a message // send when crafting a message
@JsonField(name = "actorDisplayName") @JsonField(name = "actorDisplayName")
String actorDisplayName; public String actorDisplayName;
@JsonField(name = "timestamp") @JsonField(name = "timestamp")
long timestamp; public long timestamp;
// send when crafting a message, max 1000 lines // send when crafting a message, max 1000 lines
@JsonField(name = "message") @JsonField(name = "message")
String message; public String message;
@JsonField(name = "messageParameters") @JsonField(name = "messageParameters")
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)
SystemMessageType systemMessageType; public SystemMessageType systemMessageType;
private boolean hasFileAttachment() { private boolean hasFileAttachment() {
if (messageParameters != null && messageParameters.size() > 0) { if (messageParameters != null && messageParameters.size() > 0) {

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

@ -32,5 +32,5 @@ import java.util.List;
@JsonObject @JsonObject
public class ChatOCS extends GenericOCS { public class ChatOCS extends GenericOCS {
@JsonField(name = "data") @JsonField(name = "data")
List<ChatMessage> data; public List<ChatMessage> data;
} }

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

@ -30,5 +30,5 @@ import org.parceler.Parcel;
@JsonObject @JsonObject
public class ChatOverall { public class ChatOverall {
@JsonField(name = "ocs") @JsonField(name = "ocs")
ChatOCS ocs; public ChatOCS ocs;
} }

4
app/src/main/java/com/nextcloud/talk/utils/text/Spans.java
View File

@ -29,8 +29,8 @@ public class Spans {
@Data @Data
public static class MentionChipSpan extends BetterImageSpan { public static class MentionChipSpan extends BetterImageSpan {
String id; public String id;
CharSequence label; public CharSequence label;
public MentionChipSpan(@NonNull Drawable drawable, int verticalAlignment, String id, CharSequence label) { public MentionChipSpan(@NonNull Drawable drawable, int verticalAlignment, String id, CharSequence label) {
super(drawable, verticalAlignment); super(drawable, verticalAlignment);