Merge pull request #2280 from RocketChat/hotfix/chat-list-not-showing

[HOTFIX] Chat list now showing.

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2060
-        versionName "3.3.0"
+        versionCode 2064
+        versionName "3.3.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

app/schemas/chat.rocket.android.db.RCDatabase/11.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 11,
-    "identityHash": "fb9f1c815809b0217d326452aeb34e92",
+    "identityHash": "1984b5661945bd83607d9a7043ed87b0",
     "entities": [
       {
         "tableName": "users",
@@ -1013,7 +1013,7 @@
       },
       {
         "tableName": "reactions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`reaction` TEXT NOT NULL, `messageId` TEXT NOT NULL, `count` INTEGER NOT NULL, `usernames` TEXT NOT NULL, PRIMARY KEY(`reaction`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`reaction` TEXT NOT NULL, `messageId` TEXT NOT NULL, `count` INTEGER NOT NULL, `usernames` TEXT NOT NULL, `names` TEXT NOT NULL, PRIMARY KEY(`reaction`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
         "fields": [
           {
             "fieldPath": "reaction",
@@ -1038,6 +1038,12 @@
             "columnName": "usernames",
             "affinity": "TEXT",
             "notNull": true
+          },
+          {
+            "fieldPath": "names",
+            "columnName": "names",
+            "affinity": "TEXT",
+            "notNull": true
           }
         ],
         "primaryKey": {
@@ -1099,7 +1105,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"fb9f1c815809b0217d326452aeb34e92\")"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"1984b5661945bd83607d9a7043ed87b0\")"
     ]
   }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt

@@ -60,17 +60,12 @@ private const val BUNDLE_IS_FAVORITE = "BUNDLE_IS_FAVORITE"
 private const val BUNDLE_DISABLE_MENU = "BUNDLE_DISABLE_MENU"
 
 class ChatDetailsFragment : Fragment(), ChatDetailsView {
-    @Inject
-    lateinit var presenter: ChatDetailsPresenter
-    @Inject
-    lateinit var factory: ChatDetailsViewModelFactory
-    @Inject
-    lateinit var serverUrl: CurrentServerRepository
-    @Inject
-    lateinit var settings: GetSettingsInteractor
+    @Inject lateinit var presenter: ChatDetailsPresenter
+    @Inject lateinit var factory: ChatDetailsViewModelFactory
+    @Inject lateinit var serverUrl: CurrentServerRepository
+    @Inject lateinit var settings: GetSettingsInteractor
     private var adapter: ChatDetailsAdapter? = null
     private lateinit var viewModel: ChatDetailsViewModel
-
     internal lateinit var chatRoomId: String
     internal lateinit var chatRoomType: String
     private var isSubscribed: Boolean = true
@@ -154,19 +149,19 @@ class ChatDetailsFragment : Fragment(), ChatDetailsView {
         adapter?.let {
             if (!disableMenu) {
                 it.addOption(getString(R.string.title_files), R.drawable.ic_files_24dp) {
-                    presenter.toFiles(chatRoomId!!)
+                    presenter.toFiles(chatRoomId)
                 }
             }
 
             if (chatRoomType != RoomType.DIRECT_MESSAGE && !disableMenu) {
                 it.addOption(getString(R.string.msg_mentions), R.drawable.ic_at_black_20dp) {
-                    presenter.toMentions(chatRoomId!!)
+                    presenter.toMentions(chatRoomId)
                 }
                 it.addOption(
                     getString(R.string.title_members),
                     R.drawable.ic_people_outline_black_24dp
                 ) {
-                    presenter.toMembers(chatRoomId!!)
+                    presenter.toMembers(chatRoomId)
                 }
             }
 
@@ -174,13 +169,13 @@ class ChatDetailsFragment : Fragment(), ChatDetailsView {
                 getString(R.string.title_favorite_messages),
                 R.drawable.ic_star_border_white_24dp
             ) {
-                presenter.toFavorites(chatRoomId!!)
+                presenter.toFavorites(chatRoomId)
             }
             it.addOption(
                 getString(R.string.title_pinned_messages),
                 R.drawable.ic_action_message_pin_24dp
             ) {
-                presenter.toPinned(chatRoomId!!)
+                presenter.toPinned(chatRoomId)
             }
         }
     }
@@ -206,11 +201,11 @@ class ChatDetailsFragment : Fragment(), ChatDetailsView {
 
     private fun getDetails() {
         if (isSubscribed)
-            viewModel.getDetails(chatRoomId!!).observe(viewLifecycleOwner, Observer { details ->
+            viewModel.getDetails(chatRoomId).observe(viewLifecycleOwner, Observer { details ->
                 displayDetails(details)
             })
         else
-            presenter.getDetails(chatRoomId!!, chatRoomType!!)
+            presenter.getDetails(chatRoomId, chatRoomType)
     }
 
     private fun setupOptions() {

app/src/main/java/chat/rocket/android/chatinformation/ui/MessageInfoFragment.kt

@@ -34,10 +34,8 @@ internal const val TAG_MESSAGE_INFO_FRAGMENT = "MessageInfoFragment"
 private const val BUNDLE_MESSAGE_ID = "message_id"
 
 class MessageInfoFragment : Fragment(), MessageInfoView {
-    @Inject
-    lateinit var presenter: MessageInfoPresenter
-    @Inject
-    lateinit var analyticsManager: AnalyticsManager
+    @Inject lateinit var presenter: MessageInfoPresenter
+    @Inject lateinit var analyticsManager: AnalyticsManager
     private lateinit var adapter: ReadReceiptAdapter
     private lateinit var messageId: String
 

app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt

@@ -401,7 +401,7 @@ class UiModelMapper @Inject constructor(
 
     private fun attachmentUrl(url: String?): String? {
         if (url.isNullOrEmpty()) return null
-        if (url!!.startsWith("http")) return url
+        if (url.startsWith("http")) return url
 
         val fullUrl = "$baseUrl$url"
         val httpUrl = HttpUrl.parse(fullUrl)
@@ -472,18 +472,20 @@ class UiModelMapper @Inject constructor(
             val list = mutableListOf<ReactionUiModel>()
             val customEmojis = EmojiRepository.getCustomEmojis()
             it.getShortNames().forEach { shortname ->
-                val usernames = it.getUsernames(shortname).orEmpty()
-                val count = usernames.size
-                val custom = customEmojis.firstOrNull { emoji -> emoji.shortname == shortname }
-                list.add(
-                    ReactionUiModel(messageId = message.id,
-                        shortname = shortname,
-                        unicode = EmojiParser.parse(context, shortname),
-                        count = count,
-                        usernames = usernames,
-                        url = custom?.url,
-                        isCustom = custom != null)
-                )
+                it.getUsernames(shortname)?.let { usernames ->
+                    val count = usernames.size
+                    val custom = customEmojis.firstOrNull { emoji -> emoji.shortname == shortname }
+                    list.add(
+                        ReactionUiModel(messageId = message.id,
+                            shortname = shortname,
+                            unicode = EmojiParser.parse(context, shortname),
+                            count = count,
+                            usernames = usernames,
+                            url = custom?.url,
+                            isCustom = custom != null)
+                    )
+
+                }
             }
             list
         }

app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt

@@ -101,9 +101,11 @@ class RoomUiModelMapper(
                 avatar = serverUrl.avatarUrl(name!!, isGroupOrChannel = true),
                 lastMessage = if (showLastMessage) {
                     mapLastMessage(
-                            lastMessage?.sender?.id, lastMessage?.sender?.username,
-                            lastMessage?.sender?.name, lastMessage?.message,
-                            isDirectMessage = type is RoomType.DirectMessage
+                        lastMessage?.sender?.id,
+                        lastMessage?.sender?.username,
+                        lastMessage?.sender?.name,
+                        lastMessage?.message,
+                        isDirectMessage = type is RoomType.DirectMessage
                     )
                 } else {
                     null

app/src/main/java/chat/rocket/android/db/DatabaseManager.kt

@@ -31,7 +31,6 @@ import chat.rocket.core.model.ChatRoom
 import chat.rocket.core.model.Message
 import chat.rocket.core.model.Myself
 import chat.rocket.core.model.Room
-import chat.rocket.core.model.attachment.Attachment
 import chat.rocket.core.model.userId
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
@@ -237,7 +236,8 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
                                 reaction,
                                 message.id,
                                 size,
-                                reactionValue.joinToString()
+                                reactionValue.first.joinToString(),
+                                reactionValue.second.joinToString()
                             )
                         )
                     }
@@ -383,17 +383,14 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
         }
     }
 
-    private fun mapLastMessageText(message: Message?): String? = message?.run {
-        if (this.message.isEmpty() && attachments?.isNotEmpty() == true) {
-            message.attachments?.let { mapAttachmentText(it[0]) }
+    private fun mapLastMessageText(message: Message?): String? = message?.let { lastMessage ->
+        if (lastMessage.message.isEmpty() && lastMessage.attachments?.isNotEmpty() == true) {
+            context.getString(R.string.msg_sent_attachment)
         } else {
-            this.message
+            lastMessage.message
         }
     }
 
-    private fun mapAttachmentText(attachment: Attachment): String =
-        context.getString(R.string.msg_sent_attachment)
-
     private suspend fun updateSubscription(data: Subscription): ChatRoomEntity? {
         return retryDB("getRoom(${data.roomId}") { chatRoomDao().getSync(data.roomId) }?.let { current ->
             with(data) {

app/src/main/java/chat/rocket/android/db/RCDatabase.kt

@@ -19,13 +19,20 @@ import chat.rocket.android.emoji.internal.db.StringListConverter
 
 @Database(
     entities = [
-        UserEntity::class, ChatRoomEntity::class, MessageEntity::class,
-        MessageFavoritesRelation::class, MessageMentionsRelation::class,
-        MessageChannels::class, AttachmentEntity::class,
-        AttachmentFieldEntity::class, AttachmentActionEntity::class, UrlEntity::class,
-        ReactionEntity::class, MessagesSync::class
+        UserEntity::class,
+        ChatRoomEntity::class,
+        MessageEntity::class,
+        MessageFavoritesRelation::class,
+        MessageMentionsRelation::class,
+        MessageChannels::class,
+        AttachmentEntity::class,
+        AttachmentFieldEntity::class,
+        AttachmentActionEntity::class,
+        UrlEntity::class,
+        ReactionEntity::class,
+        MessagesSync::class
     ],
-    version = 11,
+    version = 12,
     exportSchema = true
 )
 @TypeConverters(StringListConverter::class)

app/src/main/java/chat/rocket/android/db/model/Messages.kt

@@ -8,11 +8,13 @@ import androidx.room.Relation
 
 interface BaseMessageEntity
 
-@Entity(tableName = "messages",
-        foreignKeys = [
-            ForeignKey(entity = UserEntity::class, parentColumns = ["id"], childColumns = ["senderId"]),
-            ForeignKey(entity = UserEntity::class, parentColumns = ["id"], childColumns = ["editedBy"])
-        ])
+@Entity(
+    tableName = "messages",
+    foreignKeys = [
+        ForeignKey(entity = UserEntity::class, parentColumns = ["id"], childColumns = ["senderId"]),
+        ForeignKey(entity = UserEntity::class, parentColumns = ["id"], childColumns = ["editedBy"])
+    ]
+)
 data class MessageEntity(
     @PrimaryKey val id: String,
     val roomId: String,
@@ -33,36 +35,47 @@ data class MessageEntity(
     val unread: Boolean? = null
 ) : BaseMessageEntity
 
-@Entity(tableName = "message_favorites",
-        primaryKeys = ["messageId", "userId"],
-        foreignKeys = [
-            ForeignKey(entity = MessageEntity::class, parentColumns = ["id"],
-                    childColumns = ["messageId"], onDelete = ForeignKey.CASCADE),
-            ForeignKey(entity = UserEntity::class, parentColumns = ["id"], childColumns = ["userId"])
-        ])
+@Entity(
+    tableName = "message_favorites",
+    primaryKeys = ["messageId", "userId"],
+    foreignKeys = [
+        ForeignKey(
+            entity = MessageEntity::class, parentColumns = ["id"],
+            childColumns = ["messageId"], onDelete = ForeignKey.CASCADE
+        ),
+        ForeignKey(entity = UserEntity::class, parentColumns = ["id"], childColumns = ["userId"])
+    ]
+)
 data class MessageFavoritesRelation(
     val messageId: String,
     val userId: String
 ) : BaseMessageEntity
 
-@Entity(tableName = "message_mentions",
-        primaryKeys = ["messageId", "userId"],
-        foreignKeys = [
-            ForeignKey(entity = MessageEntity::class, parentColumns = ["id"],
-                    childColumns = ["messageId"], onDelete = ForeignKey.CASCADE),
-            ForeignKey(entity = UserEntity::class, parentColumns = ["id"], childColumns = ["userId"])
-        ])
+@Entity(
+    tableName = "message_mentions",
+    primaryKeys = ["messageId", "userId"],
+    foreignKeys = [
+        ForeignKey(
+            entity = MessageEntity::class, parentColumns = ["id"],
+            childColumns = ["messageId"], onDelete = ForeignKey.CASCADE
+        ),
+        ForeignKey(entity = UserEntity::class, parentColumns = ["id"], childColumns = ["userId"])
+    ]
+)
 data class MessageMentionsRelation(
     val messageId: String,
     val userId: String
 ) : BaseMessageEntity
 
-@Entity(tableName = "message_channels",
-        primaryKeys = ["messageId", "roomId"],
-        foreignKeys = [
-            ForeignKey(entity = MessageEntity::class, parentColumns = ["id"],
-                    childColumns = ["messageId"], onDelete = ForeignKey.CASCADE)
-        ]
+@Entity(
+    tableName = "message_channels",
+    primaryKeys = ["messageId", "roomId"],
+    foreignKeys = [
+        ForeignKey(
+            entity = MessageEntity::class, parentColumns = ["id"],
+            childColumns = ["messageId"], onDelete = ForeignKey.CASCADE
+        )
+    ]
 )
 data class MessageChannels(
     val messageId: String,
@@ -95,8 +108,6 @@ data class PartialMessage(
     override fun toString(): String {
         return "PartialMessage(message=$message, senderName=$senderName, senderUsername=$senderUsername, editName=$editName, editUsername=$editUsername, urls=$urls, attachments=$attachments, reactions=$reactions, channels=$channels)"
     }
-
-
 }
 
 data class FullMessage(

app/src/main/java/chat/rocket/android/db/model/Reactions.kt

@@ -5,18 +5,22 @@ import androidx.room.ForeignKey
 import androidx.room.Index
 import androidx.room.PrimaryKey
 
-@Entity(tableName = "reactions",
-        foreignKeys = [
-            ForeignKey(entity = MessageEntity::class, parentColumns = ["id"],
-                    childColumns = ["messageId"], onDelete = ForeignKey.CASCADE)
-        ],
-        indices = [
-            Index(value = ["messageId"])
-        ]
+@Entity(
+    tableName = "reactions",
+    foreignKeys = [
+        ForeignKey(
+            entity = MessageEntity::class,
+            parentColumns = ["id"],
+            childColumns = ["messageId"],
+            onDelete = ForeignKey.CASCADE
+        )
+    ],
+    indices = [Index(value = ["messageId"])]
 )
 data class ReactionEntity(
     @PrimaryKey val reaction: String,
     val messageId: String,
     val count: Int,
-    val usernames: String
+    val usernames: String,
+    val names: String
 ) : BaseMessageEntity
\ No newline at end of file

app/src/main/java/chat/rocket/android/server/domain/SettingsRepository.kt

@@ -116,7 +116,7 @@ fun PublicSettings.messageReadReceiptStoreUsers(): Boolean = this[MESSAGE_READ_R
 fun PublicSettings.uploadMimeTypeFilter(): Array<String>? {
     val values = this[UPLOAD_WHITELIST_MIMETYPES]?.value as String?
     if (!values.isNullOrBlank()) {
-        return values!!.split(",").mapToTypedArray { it.trim() }
+        return values.split(",").mapToTypedArray { it.trim() }
     }
     return null
 }

app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessageMapper.kt

@@ -89,7 +89,8 @@ class DatabaseMessageMapper(private val dbManager: DatabaseManager) {
         val map = Reactions()
         reactions.forEach { reaction ->
             val usernames = reaction.usernames.split(",").map { it.trim() }
-            map[reaction.reaction] = usernames
+            val names = reaction.names.split(",").map { it.trim() }
+            map[reaction.reaction] = Pair(usernames, names)
         }
 
         return map

dependencies.gradle

@@ -56,7 +56,7 @@ ext {
             glide                 : '4.8.0',
             glideTransformations  : '4.0.0',
 
-            jitsi                 : '+', // TODO Avoid using + (https://github.com/jitsi/jitsi-meet/issues/3987)
+            jitsi                 : '1.21.0',
 
             // For testing
             junit                 : '4.12',