replace roomToken with token

roomToken was added unnecessarily as it already exists as "token"

By using the duplicated roomToken, this also introduced a bug when that it could be empty.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2024-03-26 16:54:39 +01:00 committed by backportbot[bot]
parent c18536be0c
commit 845f9eb8ef
4 changed files with 4 additions and 6 deletions

View file

@ -3799,7 +3799,7 @@ class ChatActivity :
chatMessage.isFormerOneToOneConversation =
(currentConversation?.type == ConversationType.FORMER_ONE_TO_ONE)
chatMessage.activeUser = conversationUser
chatMessage.roomToken = roomToken
chatMessage.token = roomToken
}
if (adapter != null) {

View file

@ -136,7 +136,7 @@ fun ImageView.loadFederatedUserAvatar(message: ChatMessage): io.reactivex.dispos
return loadFederatedUserAvatar(
message.activeUser!!,
message.activeUser!!.baseUrl!!,
message.roomToken,
message.token!!,
cloudId,
darkTheme,
requestBigSize,

View file

@ -159,9 +159,7 @@ data class ChatMessage(
var hiddenByCollapse: Boolean = false,
var openWhenDownloaded: Boolean = true,
var roomToken: String = ""
var openWhenDownloaded: Boolean = true
) : Parcelable, MessageContentType, MessageContentType.Image {

View file

@ -138,7 +138,7 @@ class MessageUtils(val context: Context) {
themingContext,
messageStringInternal,
id!!,
message.roomToken,
message.token,
individualHashMap["name"]!!,
individualHashMap["type"]!!,
message.activeUser!!,