feat: Show draft message in case the conversation has one attached to it

also fixing the issue that before when fetching the conversations from the server, the server-state has been exposed to the UI, not the upserted state from DB including the client-side only data.

AI-assistant: Claude Code v2.1.76 (Claude Sonnet 4.6)

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

Author: AndyScherzinger

app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt

@@ -246,6 +246,16 @@ class ConversationItem(
         }
 
     private fun setLastMessage(holder: ConversationItemViewHolder, appContext: Context) {
+        val draftText = model.messageDraft?.messageText?.takeIf { it.isNotBlank() }
+        if (draftText != null) {
+            showDraft(holder, appContext, draftText)
+            return
+        }
+
+        holder.binding.dialogLastMessage.setTextColor(
+            ContextCompat.getColor(context, R.color.textColorMaxContrast)
+        )
+
         if (chatMessage != null) {
             holder.binding.dialogDate.visibility = View.VISIBLE
             holder.binding.dialogDate.text = DateUtils.getRelativeTimeSpanString(
@@ -277,6 +287,19 @@ class ConversationItem(
         }
     }
 
+    private fun showDraft(holder: ConversationItemViewHolder, appContext: Context, draftText: String) {
+        holder.binding.dialogDate.visibility = View.VISIBLE
+        holder.binding.dialogDate.text = DateUtils.getRelativeTimeSpanString(
+            model.lastActivity * MILLIES,
+            System.currentTimeMillis(),
+            0,
+            DateUtils.FORMAT_ABBREV_RELATIVE
+        )
+
+        val label = String.format(appContext.getString(R.string.nc_draft_prefix), draftText)
+        viewThemeUtils.talk.themeDraftSubline(holder.binding.dialogLastMessage, label, draftText)
+    }
+
     private fun calculateRegularLastMessageText(appContext: Context): CharSequence =
         if (chatMessage?.actorId == user.userId) {
             String.format(

app/src/main/java/com/nextcloud/talk/conversationlist/data/network/OfflineFirstConversationsRepository.kt

@@ -58,7 +58,7 @@ class OfflineFirstConversationsRepository @Inject constructor(
             if (networkMonitor.isOnline.value) {
                 val conversationEntitiesFromSync = getRoomsFromServer(user)
                 if (!conversationEntitiesFromSync.isNullOrEmpty()) {
-                    val conversationModelsFromSync = conversationEntitiesFromSync.map(ConversationEntity::asModel)
+                    val conversationModelsFromSync = getListOfConversations(user.id!!)
                     _roomListFlow.emit(conversationModelsFromSync)
                 }
             }

app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt

@@ -325,6 +325,28 @@ class TalkSpecificViewThemeUtils @Inject constructor(
         }
     }
 
+    fun themeDraftSubline(textView: TextView, fullText: String, draftText: String) {
+        withScheme(textView) { scheme ->
+            val prefixEnd = fullText.length - draftText.length
+            val spannable = android.text.SpannableStringBuilder(fullText)
+            spannable.setSpan(
+                StyleSpan(Typeface.BOLD),
+                0,
+                prefixEnd,
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+            )
+            spannable.setSpan(
+                ForegroundColorSpan(dynamicColor.primary().getArgb(scheme)),
+                0,
+                prefixEnd,
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+            )
+            textView.setTypeface(null, Typeface.NORMAL)
+            textView.setTextColor(ContextCompat.getColor(textView.context, R.color.textColorMaxContrast))
+            textView.setText(spannable, TextView.BufferType.SPANNABLE)
+        }
+    }
+
     fun themeForegroundColorSpan(context: Context): ForegroundColorSpan {
         return withScheme(context) { scheme ->
             return@withScheme ForegroundColorSpan(dynamicColor.primary().getArgb(scheme))

app/src/main/res/values/strings.xml

@@ -465,6 +465,7 @@ How to translate with transifex:
     <string name="nc_message_quote_cancel_reply">Cancel reply</string>
     <!-- When translating to German, please use non-formal variant -->
     <string name="nc_formatted_message_you">You: %1$s</string>
+    <string name="nc_draft_prefix">Draft: %1$s</string>
     <string name="nc_message_read">Message read</string>
     <string name="nc_message_sent">Message sent</string>
     <string name="nc_message_added_to_notes">Message added to notes</string>