gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

revert ReadStatus SENDING and FAILED

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2025-01-02 13:18:17 +01:00
parent 06c8509587
commit 656be3ffce
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
View File

@ -3857,8 +3857,6 @@ class ChatActivity :
CONTENT_TYPE_SYSTEM_MESSAGE -> !TextUtils.isEmpty(message.systemMessage) CONTENT_TYPE_SYSTEM_MESSAGE -> !TextUtils.isEmpty(message.systemMessage)
CONTENT_TYPE_UNREAD_NOTICE_MESSAGE -> message.id == UNREAD_MESSAGES_MARKER_ID.toString() CONTENT_TYPE_UNREAD_NOTICE_MESSAGE -> message.id == UNREAD_MESSAGES_MARKER_ID.toString()
CONTENT_TYPE_CALL_STARTED -> message.id == "-2" CONTENT_TYPE_CALL_STARTED -> message.id == "-2"
// CONTENT_TYPE_TEMP -> message.id == TEMPORARY_MESSAGE_ID_STRING
// CONTENT_TYPE_TEMP -> message.readStatus == ReadStatus.FAILED
CONTENT_TYPE_DECK_CARD -> message.isDeckCard() CONTENT_TYPE_DECK_CARD -> message.isDeckCard()
else -> false else -> false
@ -4053,7 +4051,6 @@ class ChatActivity :
private const val CONTENT_TYPE_POLL: Byte = 6 private const val CONTENT_TYPE_POLL: Byte = 6
private const val CONTENT_TYPE_LINK_PREVIEW: Byte = 7 private const val CONTENT_TYPE_LINK_PREVIEW: Byte = 7
private const val CONTENT_TYPE_DECK_CARD: Byte = 8 private const val CONTENT_TYPE_DECK_CARD: Byte = 8
private const val CONTENT_TYPE_TEMP: Byte = 9
private const val UNREAD_MESSAGES_MARKER_ID = -1 private const val UNREAD_MESSAGES_MARKER_ID = -1
private const val CALL_STARTED_ID = -2 private const val CALL_STARTED_ID = -2
private const val GET_ROOM_INFO_DELAY_NORMAL: Long = 30000 private const val GET_ROOM_INFO_DELAY_NORMAL: Long = 30000
@ -4093,8 +4090,6 @@ class ChatActivity :
private const val RESUME_AUDIO_TAG = "RESUME_AUDIO_TAG" private const val RESUME_AUDIO_TAG = "RESUME_AUDIO_TAG"
private const val DELAY_TO_SHOW_PROGRESS_BAR = 1000L private const val DELAY_TO_SHOW_PROGRESS_BAR = 1000L
private const val FIVE_MINUTES_IN_SECONDS: Long = 300 private const val FIVE_MINUTES_IN_SECONDS: Long = 300
private const val TEMPORARY_MESSAGE_ID_INT: Int = -3
private const val TEMPORARY_MESSAGE_ID_STRING: String = "-3"
private const val ROOM_TYPE_ONE_TO_ONE = "1" private const val ROOM_TYPE_ONE_TO_ONE = "1"
private const val ACTOR_TYPE = "users" private const val ACTOR_TYPE = "users"
const val CONVERSATION_INTERNAL_ID = "CONVERSATION_INTERNAL_ID" const val CONVERSATION_INTERNAL_ID = "CONVERSATION_INTERNAL_ID"

12
app/src/main/java/com/nextcloud/talk/data/database/mappers/ChatMessageMapUtils.kt
View File

@ -68,19 +68,9 @@ fun ChatMessageEntity.asModel() =
referenceId = referenceId, referenceId = referenceId,
isTemporary = isTemporary, isTemporary = isTemporary,
sendingFailed = sendingFailed, sendingFailed = sendingFailed,
readStatus = setStatus(isTemporary, sendingFailed) readStatus = ReadStatus.NONE
) )
fun setStatus(isTemporary: Boolean, sendingFailed: Boolean): ReadStatus {
return if (sendingFailed) {
ReadStatus.FAILED
} else if (isTemporary) {
ReadStatus.SENDING
} else {
ReadStatus.NONE
}
}
fun ChatMessageJson.asModel() = fun ChatMessageJson.asModel() =
ChatMessage( ChatMessage(
jsonMessageId = id.toInt(), jsonMessageId = id.toInt(),

4
app/src/main/java/com/nextcloud/talk/models/json/chat/ReadStatus.kt
View File

@ -9,7 +9,5 @@ package com.nextcloud.talk.models.json.chat
enum class ReadStatus { enum class ReadStatus {
NONE, NONE,
SENT, SENT,
READ, READ
SENDING,
FAILED
} }