Fix conversations

app/schemas/com.keylesspalace.tusky.db.AppDatabase/38.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 38,
-    "identityHash": "11033751d382aa8a1c6fc68833097d35",
+    "identityHash": "798fc8d34064eb671c079689d4650ea5",
     "entities": [
       {
         "tableName": "DraftEntity",
@@ -690,7 +690,7 @@
       },
       {
         "tableName": "ConversationEntity",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`accountId` INTEGER NOT NULL, `id` TEXT NOT NULL, `accounts` TEXT NOT NULL, `unread` INTEGER NOT NULL, `s_id` TEXT NOT NULL, `s_url` TEXT, `s_inReplyToId` TEXT, `s_inReplyToAccountId` TEXT, `s_account` TEXT NOT NULL, `s_content` TEXT NOT NULL, `s_createdAt` INTEGER NOT NULL, `s_emojis` TEXT NOT NULL, `s_favouritesCount` INTEGER NOT NULL, `s_repliesCount` INTEGER NOT NULL, `s_favourited` INTEGER NOT NULL, `s_bookmarked` INTEGER NOT NULL, `s_sensitive` INTEGER NOT NULL, `s_spoilerText` TEXT NOT NULL, `s_attachments` TEXT NOT NULL, `s_mentions` TEXT NOT NULL, `s_tags` TEXT, `s_showingHiddenContent` INTEGER NOT NULL, `s_expanded` INTEGER NOT NULL, `s_collapsed` INTEGER NOT NULL, `s_muted` INTEGER NOT NULL, `s_poll` TEXT, PRIMARY KEY(`id`, `accountId`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`accountId` INTEGER NOT NULL, `id` TEXT NOT NULL, `order` INTEGER NOT NULL, `accounts` TEXT NOT NULL, `unread` INTEGER NOT NULL, `s_id` TEXT NOT NULL, `s_url` TEXT, `s_inReplyToId` TEXT, `s_inReplyToAccountId` TEXT, `s_account` TEXT NOT NULL, `s_content` TEXT NOT NULL, `s_createdAt` INTEGER NOT NULL, `s_emojis` TEXT NOT NULL, `s_favouritesCount` INTEGER NOT NULL, `s_repliesCount` INTEGER NOT NULL, `s_favourited` INTEGER NOT NULL, `s_bookmarked` INTEGER NOT NULL, `s_sensitive` INTEGER NOT NULL, `s_spoilerText` TEXT NOT NULL, `s_attachments` TEXT NOT NULL, `s_mentions` TEXT NOT NULL, `s_tags` TEXT, `s_showingHiddenContent` INTEGER NOT NULL, `s_expanded` INTEGER NOT NULL, `s_collapsed` INTEGER NOT NULL, `s_muted` INTEGER NOT NULL, `s_poll` TEXT, PRIMARY KEY(`id`, `accountId`))",
         "fields": [
           {
             "fieldPath": "accountId",
@@ -704,6 +704,12 @@
             "affinity": "TEXT",
             "notNull": true
           },
+          {
+            "fieldPath": "order",
+            "columnName": "order",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
           {
             "fieldPath": "accounts",
             "columnName": "accounts",
@@ -863,7 +869,7 @@
     "views": [],
     "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, '11033751d382aa8a1c6fc68833097d35')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '798fc8d34064eb671c079689d4650ea5')"
     ]
   }
 }

app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationAdapter.kt

@@ -20,21 +20,40 @@ import android.view.ViewGroup
 import androidx.paging.PagingDataAdapter
 import androidx.recyclerview.widget.DiffUtil
 import com.keylesspalace.tusky.R
+import com.keylesspalace.tusky.adapter.StatusBaseViewHolder
 import com.keylesspalace.tusky.interfaces.StatusActionListener
 import com.keylesspalace.tusky.util.StatusDisplayOptions
 
 class ConversationAdapter(
-    private val statusDisplayOptions: StatusDisplayOptions,
+    private var statusDisplayOptions: StatusDisplayOptions,
     private val listener: StatusActionListener
 ) : PagingDataAdapter<ConversationViewData, ConversationViewHolder>(CONVERSATION_COMPARATOR) {
 
+    var mediaPreviewEnabled: Boolean
+        get() = statusDisplayOptions.mediaPreviewEnabled
+        set(mediaPreviewEnabled) {
+            statusDisplayOptions = statusDisplayOptions.copy(
+                mediaPreviewEnabled = mediaPreviewEnabled
+            )
+        }
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ConversationViewHolder {
         val view = LayoutInflater.from(parent.context).inflate(R.layout.item_conversation, parent, false)
         return ConversationViewHolder(view, statusDisplayOptions, listener)
     }
 
     override fun onBindViewHolder(holder: ConversationViewHolder, position: Int) {
-        holder.setupWithConversation(getItem(position))
+        onBindViewHolder(holder, position, emptyList())
+    }
+
+    override fun onBindViewHolder(
+        holder: ConversationViewHolder,
+        position: Int,
+        payloads: List<Any>
+    ) {
+        getItem(position)?.let { conversationViewData ->
+            holder.setupWithConversation(conversationViewData, payloads.firstOrNull())
+        }
     }
 
     companion object {
@@ -44,7 +63,17 @@ class ConversationAdapter(
             }
 
             override fun areContentsTheSame(oldItem: ConversationViewData, newItem: ConversationViewData): Boolean {
-                return oldItem == newItem
+                return false // Items are different always. It allows to refresh timestamp on every view holder update
+            }
+
+            override fun getChangePayload(oldItem: ConversationViewData, newItem: ConversationViewData): Any? {
+                return if (oldItem == newItem) {
+                    // If items are equal - update timestamp only
+                    listOf(StatusBaseViewHolder.Key.KEY_CREATED)
+                } else {
+                    // If items are different - update the whole view holder
+                    null
+                }
             }
         }
     }

app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationEntity.kt

@@ -34,13 +34,15 @@ import java.util.Date
 data class ConversationEntity(
     val accountId: Long,
     val id: String,
+    val order: Int,
     val accounts: List<ConversationAccountEntity>,
     val unread: Boolean,
     @Embedded(prefix = "s_") val lastStatus: ConversationStatusEntity
 ) {
     fun toViewData(): ConversationViewData {
         return ConversationViewData(
             id = id,
+            order = order,
             accounts = accounts,
             unread = unread,
             lastStatus = lastStatus.toViewData()
@@ -50,6 +52,7 @@ data class ConversationEntity(
 
 data class ConversationAccountEntity(
     val id: String,
+    val localUsername: String,
     val username: String,
     val displayName: String,
     val avatar: String,
@@ -58,12 +61,12 @@ data class ConversationAccountEntity(
     fun toAccount(): TimelineAccount {
         return TimelineAccount(
             id = id,
+            localUsername = localUsername,
             username = username,
             displayName = displayName,
             url = "",
             avatar = avatar,
             emojis = emojis,
-            localUsername = "",
         )
     }
 }
@@ -134,6 +137,7 @@ data class ConversationStatusEntity(
 fun TimelineAccount.toEntity() =
     ConversationAccountEntity(
         id = id,
+        localUsername = localUsername,
         username = username,
         displayName = name,
         avatar = avatar,
@@ -166,10 +170,11 @@ fun Status.toEntity() =
         poll = poll
     )
 
-fun Conversation.toEntity(accountId: Long) =
+fun Conversation.toEntity(accountId: Long, order: Int) =
     ConversationEntity(
         accountId = accountId,
         id = id,
+        order = order,
         accounts = accounts.map { it.toEntity() },
         unread = unread,
         lastStatus = lastStatus!!.toEntity()

app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationLoadStateAdapter.kt

@@ -19,22 +19,35 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.paging.LoadState
 import androidx.paging.LoadStateAdapter
-import com.keylesspalace.tusky.adapter.NetworkStateViewHolder
 import com.keylesspalace.tusky.databinding.ItemNetworkStateBinding
+import com.keylesspalace.tusky.util.BindingHolder
+import com.keylesspalace.tusky.util.visible
 
 class ConversationLoadStateAdapter(
     private val retryCallback: () -> Unit
-) : LoadStateAdapter<NetworkStateViewHolder>() {
+) : LoadStateAdapter<BindingHolder<ItemNetworkStateBinding>>() {
 
-    override fun onBindViewHolder(holder: NetworkStateViewHolder, loadState: LoadState) {
-        holder.setUpWithNetworkState(loadState)
+    override fun onBindViewHolder(holder: BindingHolder<ItemNetworkStateBinding>, loadState: LoadState) {
+        val binding = holder.binding
+        binding.progressBar.visible(loadState == LoadState.Loading)
+        binding.retryButton.visible(loadState is LoadState.Error)
+        val msg = if (loadState is LoadState.Error) {
+            loadState.error.message
+        } else {
+            null
+        }
+        binding.errorMsg.visible(msg != null)
+        binding.errorMsg.text = msg
+        binding.retryButton.setOnClickListener {
+            retryCallback()
+        }
     }
 
     override fun onCreateViewHolder(
         parent: ViewGroup,
         loadState: LoadState
-    ): NetworkStateViewHolder {
+    ): BindingHolder<ItemNetworkStateBinding> {
         val binding = ItemNetworkStateBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return NetworkStateViewHolder(binding, retryCallback)
+        return BindingHolder(binding)
     }
 }

app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationViewData.kt

@@ -20,6 +20,7 @@ import com.keylesspalace.tusky.viewdata.StatusViewData
 
 data class ConversationViewData(
     val id: String,
+    val order: Int,
     val accounts: List<ConversationAccountEntity>,
     val unread: Boolean,
     val lastStatus: StatusViewData.Concrete
@@ -37,6 +38,7 @@ data class ConversationViewData(
         return ConversationEntity(
             accountId = accountId,
             id = id,
+            order = order,
             accounts = accounts,
             unread = unread,
             lastStatus = lastStatus.toConversationStatusEntity(