瀏覽代碼

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>
Marcel Hibbe 1 年之前
父節點
當前提交
4c5ffdbae7

+ 1 - 1
app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

@@ -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) {

+ 1 - 1
app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt

@@ -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,

+ 1 - 3
app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt

@@ -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 {
 

+ 1 - 1
app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt

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