mirror of
https://github.com/nextcloud/talk-android.git
synced 2024-12-18 06:32:08 +03:00
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:
parent
c18536be0c
commit
845f9eb8ef
4 changed files with 4 additions and 6 deletions
|
@ -3799,7 +3799,7 @@ class ChatActivity :
|
||||||
chatMessage.isFormerOneToOneConversation =
|
chatMessage.isFormerOneToOneConversation =
|
||||||
(currentConversation?.type == ConversationType.FORMER_ONE_TO_ONE)
|
(currentConversation?.type == ConversationType.FORMER_ONE_TO_ONE)
|
||||||
chatMessage.activeUser = conversationUser
|
chatMessage.activeUser = conversationUser
|
||||||
chatMessage.roomToken = roomToken
|
chatMessage.token = roomToken
|
||||||
}
|
}
|
||||||
|
|
||||||
if (adapter != null) {
|
if (adapter != null) {
|
||||||
|
|
|
@ -136,7 +136,7 @@ fun ImageView.loadFederatedUserAvatar(message: ChatMessage): io.reactivex.dispos
|
||||||
return loadFederatedUserAvatar(
|
return loadFederatedUserAvatar(
|
||||||
message.activeUser!!,
|
message.activeUser!!,
|
||||||
message.activeUser!!.baseUrl!!,
|
message.activeUser!!.baseUrl!!,
|
||||||
message.roomToken,
|
message.token!!,
|
||||||
cloudId,
|
cloudId,
|
||||||
darkTheme,
|
darkTheme,
|
||||||
requestBigSize,
|
requestBigSize,
|
||||||
|
|
|
@ -159,9 +159,7 @@ data class ChatMessage(
|
||||||
|
|
||||||
var hiddenByCollapse: Boolean = false,
|
var hiddenByCollapse: Boolean = false,
|
||||||
|
|
||||||
var openWhenDownloaded: Boolean = true,
|
var openWhenDownloaded: Boolean = true
|
||||||
|
|
||||||
var roomToken: String = ""
|
|
||||||
|
|
||||||
) : Parcelable, MessageContentType, MessageContentType.Image {
|
) : Parcelable, MessageContentType, MessageContentType.Image {
|
||||||
|
|
||||||
|
|
|
@ -138,7 +138,7 @@ class MessageUtils(val context: Context) {
|
||||||
themingContext,
|
themingContext,
|
||||||
messageStringInternal,
|
messageStringInternal,
|
||||||
id!!,
|
id!!,
|
||||||
message.roomToken,
|
message.token,
|
||||||
individualHashMap["name"]!!,
|
individualHashMap["name"]!!,
|
||||||
individualHashMap["type"]!!,
|
individualHashMap["type"]!!,
|
||||||
message.activeUser!!,
|
message.activeUser!!,
|
||||||
|
|
Loading…
Reference in a new issue