Merge pull request #1283 from bemusementpark/prefix-conversation

[SES-621] Add message sender to ConversationActivity

app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java

@@ -320,6 +320,19 @@ public class MmsSmsDatabase extends Database {
     return -1;
   }
 
+  public long getLastMessageTimestamp(long threadId) {
+    String order     = MmsSmsColumns.NORMALIZED_DATE_SENT + " DESC";
+    String selection = MmsSmsColumns.THREAD_ID + " = " + threadId;
+
+    try (Cursor cursor = queryTables(PROJECTION, selection, order, "1")) {
+      if (cursor.moveToFirst()) {
+        return cursor.getLong(cursor.getColumnIndexOrThrow(MmsSmsColumns.NORMALIZED_DATE_SENT));
+      }
+    }
+
+    return -1;
+  }
+
   public Cursor getUnread() {
     String order           = MmsSmsColumns.NORMALIZED_DATE_SENT + " ASC";
     String selection       = "(" + MmsSmsColumns.READ + " = 0 OR " + MmsSmsColumns.REACTIONS_UNREAD + " = 1) AND " + MmsSmsColumns.NOTIFIED + " = 0";

app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java

@@ -934,7 +934,17 @@ public class ThreadDatabase extends Database {
         readReceiptCount = 0;
       }
 
-      return new ThreadRecord(body, snippetUri, recipient, date, count,
+      MessageRecord lastMessage = null;
+
+      if (count > 0) {
+        MmsSmsDatabase mmsSmsDatabase = DatabaseComponent.get(context).mmsSmsDatabase();
+        long messageTimestamp = mmsSmsDatabase.getLastMessageTimestamp(threadId);
+        if (messageTimestamp > 0) {
+          lastMessage = mmsSmsDatabase.getMessageForTimestamp(messageTimestamp);
+        }
+      }
+
+      return new ThreadRecord(body, snippetUri, lastMessage, recipient, date, count,
                               unreadCount, unreadMentionCount, threadId, deliveryReceiptCount, status, type,
                               distributionType, archived, expiresIn, lastSeen, readReceiptCount, pinned);
     }

app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java

@@ -43,6 +43,7 @@ import network.loki.messenger.R;
 public class ThreadRecord extends DisplayRecord {
 
   private @Nullable final Uri     snippetUri;
+  public @Nullable  final MessageRecord lastMessage;
   private           final long    count;
   private           final int     unreadCount;
   private           final int     unreadMentionCount;
@@ -54,13 +55,14 @@ public class ThreadRecord extends DisplayRecord {
   private           final int initialRecipientHash;
 
   public ThreadRecord(@NonNull String body, @Nullable Uri snippetUri,
-                      @NonNull Recipient recipient, long date, long count, int unreadCount,
+                      @Nullable MessageRecord lastMessage, @NonNull Recipient recipient, long date, long count, int unreadCount,
                       int unreadMentionCount, long threadId, int deliveryReceiptCount, int status,
                       long snippetType,  int distributionType, boolean archived, long expiresIn,
                       long lastSeen, int readReceiptCount, boolean pinned)
   {
     super(body, recipient, date, date, threadId, status, deliveryReceiptCount, snippetType, readReceiptCount);
     this.snippetUri         = snippetUri;
+    this.lastMessage        = lastMessage;
     this.count              = count;
     this.unreadCount        = unreadCount;
     this.unreadMentionCount = unreadMentionCount;

app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt

@@ -4,6 +4,8 @@ import android.content.Context
 import android.content.res.Resources
 import android.graphics.Typeface
 import android.graphics.drawable.ColorDrawable
+import android.text.SpannableString
+import android.text.TextUtils
 import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.View
@@ -89,7 +91,7 @@ class ConversationView : LinearLayout {
                 || (configFactory.convoVolatile?.getConversationUnread(thread) == true)
         binding.unreadMentionTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, textSize)
         binding.unreadMentionIndicator.isVisible = (thread.unreadMentionCount != 0 && thread.recipient.address.isGroup)
-        val senderDisplayName = getUserDisplayName(thread.recipient)
+        val senderDisplayName = getTitle(thread.recipient)
                 ?: thread.recipient.address.toString()
         binding.conversationViewDisplayNameTextView.text = senderDisplayName
         binding.timestampTextView.text = thread.date.takeIf { it != 0L }?.let { DateUtils.getDisplayFormattedTimeSpanString(context, Locale.getDefault(), it) }
@@ -101,9 +103,7 @@ class ConversationView : LinearLayout {
             R.drawable.ic_notifications_mentions
         }
         binding.muteIndicatorImageView.setImageResource(drawableRes)
-        val rawSnippet = thread.getDisplayBody(context)
+        binding.snippetTextView.text = highlightMentions(thread.getSnippet(), thread.threadId, context)
-        val snippet = highlightMentions(rawSnippet, thread.threadId, context)
-        binding.snippetTextView.text = snippet
         binding.snippetTextView.typeface = if (unreadCount > 0 && !thread.isRead) Typeface.DEFAULT_BOLD else Typeface.DEFAULT
         binding.snippetTextView.visibility = if (isTyping) View.GONE else View.VISIBLE
         if (isTyping) {
@@ -131,12 +131,21 @@ class ConversationView : LinearLayout {
         binding.profilePictureView.recycle()
     }
 
-    private fun getUserDisplayName(recipient: Recipient): String? {
+    private fun getTitle(recipient: Recipient): String? = when {
-        return if (recipient.isLocalNumber) {
+        recipient.isLocalNumber -> context.getString(R.string.note_to_self)
-            context.getString(R.string.note_to_self)
+        else -> recipient.toShortString() // Internally uses the Contact API
-        } else {
+    }
-            recipient.toShortString() // Internally uses the Contact API
+
-        }
+    private fun ThreadRecord.getSnippet(): CharSequence =
+        concatSnippet(getSnippetPrefix(), getDisplayBody(context))
+
+    private fun concatSnippet(prefix: CharSequence?, body: CharSequence): CharSequence =
+        prefix?.let { TextUtils.concat(it, ": ", body) } ?: body
+
+    private fun ThreadRecord.getSnippetPrefix(): CharSequence? = when {
+        recipient.isLocalNumber || lastMessage?.isControlMessage == true -> null
+        lastMessage?.isOutgoing == true -> resources.getString(R.string.MessageRecord_you)
+        else -> lastMessage?.individualRecipient?.toShortString()
     }
     // endregion
 }