[SES-3575] - Refactor sent status querying (#1122)

Author: SessionHero01

app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt

@@ -71,7 +71,6 @@ import org.thoughtcrime.securesms.AppContext.configureKovenant
 import org.thoughtcrime.securesms.components.TypingStatusSender
 import org.thoughtcrime.securesms.configs.ConfigUploader
 import org.thoughtcrime.securesms.database.EmojiSearchDatabase
-import org.thoughtcrime.securesms.database.LastSentTimestampCache
 import org.thoughtcrime.securesms.database.LokiAPIDatabase
 import org.thoughtcrime.securesms.database.Storage
 import org.thoughtcrime.securesms.database.model.EmojiSearchData
@@ -151,7 +150,6 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
     @Inject lateinit var messageDataProvider: MessageDataProvider
     @Inject lateinit var textSecurePreferences: TextSecurePreferences
     @Inject lateinit var configFactory: ConfigFactory
-    @Inject lateinit var lastSentTimestampCache: LastSentTimestampCache
     @Inject lateinit var versionDataFetcher: VersionDataFetcher
     @Inject lateinit var pushRegistrationHandler: PushRegistrationHandler
     @Inject lateinit var tokenFetcher: TokenFetcher
@@ -279,7 +277,6 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
             device,
             messageDataProvider,
             configFactory,
-            lastSentTimestampCache,
             this,
             tokenFetcher,
             groupManagerV2,

app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt

@@ -211,7 +211,6 @@ class DatabaseAttachmentProvider(context: Context, helper: Provider<SQLCipherOpe
 
         threadId ?: return
         timestamp ?: return
-        MessagingModuleConfiguration.shared.lastSentTimestampCache.delete(threadId, timestamp)
     }
 
     override fun deleteMessages(messageIDs: List<Long>, threadId: Long, isSms: Boolean) {
@@ -226,9 +225,6 @@ class DatabaseAttachmentProvider(context: Context, helper: Provider<SQLCipherOpe
         // Perform online delete
         DatabaseComponent.get(context).lokiMessageDatabase().deleteMessages(messageIDs)
         DatabaseComponent.get(context).lokiMessageDatabase().deleteMessageServerHashes(messageIDs, mms = !isSms)
-
-        val threadId = messages.firstOrNull()?.threadId
-        threadId?.let{ MessagingModuleConfiguration.shared.lastSentTimestampCache.delete(it, messages.map { it.timestamp }) }
     }
 
     override fun markMessageAsDeleted(timestamp: Long, author: String, displayedMessage: String) {

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -742,6 +742,12 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
                 adapter.isAdmin = it
             }
         }
+
+        lifecycleScope.launch {
+            viewModel
+                .lastSeenMessageId
+                .collectLatest { adapter.lastSentMessageId = it }
+        }
     }
 
     private fun scrollToMostRecentMessageIfWeShould() {

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt

@@ -28,6 +28,7 @@ import org.thoughtcrime.securesms.conversation.v2.messages.ControlMessageView
 import org.thoughtcrime.securesms.conversation.v2.messages.VisibleMessageView
 import org.thoughtcrime.securesms.conversation.v2.messages.VisibleMessageViewDelegate
 import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter
+import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
 
@@ -58,6 +59,14 @@ class ConversationAdapter(
     private val contactLoadedCache = SparseBooleanArray(100)
     private val lastSeen = AtomicLong(originalLastSeen)
 
+    var lastSentMessageId: MessageId? = null
+        set(value) {
+            if (field != value) {
+                field = value
+                notifyDataSetChanged()
+            }
+        }
+
     private val groupId = if(conversation?.isGroupV2Recipient == true)
         AccountId(conversation.address.toString())
     else null
@@ -133,19 +142,20 @@ class ConversationAdapter(
                 val contact = contactCache[senderIdHash]
 
                 visibleMessageView.bind(
-                    message,
-                    messageBefore,
-                    getMessageAfter(position, cursor),
-                    glide,
-                    searchQuery,
-                    contact,
+                    message = message,
+                    previous = messageBefore,
+                    next = getMessageAfter(position, cursor),
+                    glide = glide,
+                    searchQuery = searchQuery,
+                    contact = contact,
                     // we pass in the groupId for groupV2 to use for determining the name of the members
-                    groupId,
-                    senderId,
-                    lastSeen.get(),
-                    visibleMessageViewDelegate,
-                    downloadPendingAttachment,
-                    retryFailedAttachments
+                    groupId = groupId,
+                    senderAccountID = senderId,
+                    lastSeen = lastSeen.get(),
+                    lastSentMessageId = lastSentMessageId,
+                    delegate = visibleMessageViewDelegate,
+                    downloadPendingAttachment = downloadPendingAttachment,
+                    retryFailedAttachments = retryFailedAttachments
                 )
 
                 if (!message.isDeleted) {

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationLoader.kt

@@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.conversation.v2
 
 import android.content.Context
 import android.database.Cursor
-import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
 import org.thoughtcrime.securesms.util.AbstractCursorLoader
 
@@ -13,7 +12,6 @@ class ConversationLoader(
 ) : AbstractCursorLoader(context) {
 
     override fun getCursor(): Cursor {
-        MessagingModuleConfiguration.shared.lastSentTimestampCache.refresh(threadID)
         return DatabaseComponent.get(context).mmsSmsDatabase().getConversation(threadID, reverse)
     }
 }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt

@@ -77,7 +77,6 @@ import java.util.UUID
 class ConversationViewModel(
     val threadId: Long,
     val edKeyPair: KeyPair?,
-    private val context: Context,
     private val application: Application,
     private val repository: ConversationRepository,
     private val storage: StorageProtocol,
@@ -272,11 +271,14 @@ class ConversationViewModel(
         // a call is in progress if it isn't idle nor disconnected and the recipient is the person on the call
         if(it !is State.Idle && it !is State.Disconnected && callManager.recipient?.address == recipient?.address){
             // call is started, we need to differentiate between in progress vs incoming
-            if(it is State.Connected) context.getString(R.string.callsInProgress)
-            else context.getString(R.string.callsIncomingUnknown)
+            if(it is State.Connected) application.getString(R.string.callsInProgress)
+            else application.getString(R.string.callsIncomingUnknown)
         } else null // null when the call isn't in progress / incoming
     }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
 
+    val lastSeenMessageId: Flow<MessageId?>
+        get() = repository.getLastSentMessageID(threadId)
+
     init {
         viewModelScope.launch(Dispatchers.Default) {
             combine(
@@ -1149,7 +1151,6 @@ class ConversationViewModel(
 
         override fun <T : ViewModel> create(modelClass: Class<T>): T {
             return ConversationViewModel(
-                context = context,
                 threadId = threadId,
                 edKeyPair = edKeyPair,
                 application = application,

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt

@@ -49,13 +49,13 @@ import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.IdPrefix
 import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
 import org.thoughtcrime.securesms.database.GroupDatabase
-import org.thoughtcrime.securesms.database.LastSentTimestampCache
 import org.thoughtcrime.securesms.database.LokiAPIDatabase
 import org.thoughtcrime.securesms.database.LokiThreadDatabase
 import org.thoughtcrime.securesms.database.MmsDatabase
 import org.thoughtcrime.securesms.database.MmsSmsDatabase
 import org.thoughtcrime.securesms.database.SmsDatabase
 import org.thoughtcrime.securesms.database.ThreadDatabase
+import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.groups.OpenGroupManager
@@ -84,7 +84,6 @@ class VisibleMessageView : FrameLayout {
     @Inject lateinit var mmsSmsDb: MmsSmsDatabase
     @Inject lateinit var smsDb: SmsDatabase
     @Inject lateinit var mmsDb: MmsDatabase
-    @Inject lateinit var lastSentTimestampCache: LastSentTimestampCache
     @Inject lateinit var configFactory: ConfigFactoryProtocol
     @Inject lateinit var usernameUtils: UsernameUtils
 
@@ -166,6 +165,7 @@ class VisibleMessageView : FrameLayout {
         groupId: AccountId? = null,
         senderAccountID: String,
         lastSeen: Long,
+        lastSentMessageId: MessageId?,
         delegate: VisibleMessageViewDelegate? = null,
         downloadPendingAttachment: (DatabaseAttachment) -> Unit,
         retryFailedAttachments: (List<DatabaseAttachment>) -> Unit,
@@ -271,7 +271,7 @@ class VisibleMessageView : FrameLayout {
         binding.dateBreakTextView.isVisible = showDateBreak
 
         // Update message status indicator
-        showStatusMessage(message)
+        showStatusMessage(message, lastSentMessageId)
 
         // Emoji Reactions
         if (!message.isDeleted && message.reactions.isNotEmpty()) {
@@ -312,7 +312,7 @@ class VisibleMessageView : FrameLayout {
     // Note: Although most commonly used to display the delivery status of a message, we also use the
     // message status area to display the disappearing messages state - so in this latter case we'll
     // be displaying either "Sent" or "Read" and the animating clock icon.
-    private fun showStatusMessage(message: MessageRecord) {
+    private fun showStatusMessage(message: MessageRecord, lastSentMessageId: MessageId?) {
         // We'll start by hiding everything and then only make visible what we need
         binding.messageStatusTextView.isVisible  = false
         binding.messageStatusImageView.isVisible = false
@@ -376,8 +376,7 @@ class VisibleMessageView : FrameLayout {
             } else {
                 // ..but if the message HAS been successfully sent or read then only display the delivery status
                 // text and image if this is the last sent message.
-                val lastSentTimestamp = lastSentTimestampCache.getTimestamp(message.threadId)
-                val isLastSent = lastSentTimestamp == message.timestamp
+                val isLastSent = lastSentMessageId != null && lastSentMessageId.id == message.id && lastSentMessageId.mms == message.isMms
                 binding.messageStatusTextView.isVisible  = isLastSent
                 binding.messageStatusImageView.isVisible = isLastSent
                 if (isLastSent) { binding.messageStatusImageView.bringToFront() }

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

@@ -2,17 +2,13 @@
 
 import android.content.ContentValues;
 import android.content.Context;
-import android.database.Cursor;
-
-import androidx.annotation.NonNull;
 
 import net.zetetic.database.sqlcipher.SQLiteDatabase;
 
 import org.apache.commons.lang3.StringUtils;
 import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 
-import java.util.LinkedList;
 import java.util.List;
 
 import javax.inject.Provider;
@@ -26,6 +22,8 @@ public class GroupReceiptDatabase extends Database {
   private static final String ADDRESS      = "address";
   private static final String STATUS       = "status";
   private static final String TIMESTAMP    = "timestamp";
+
+  @Deprecated(forRemoval = true)
   private static final String UNIDENTIFIED = "unidentified";
 
   public static final int STATUS_UNKNOWN     = -1;
@@ -68,32 +66,6 @@ public void update(Address address, long mmsId, int status, long timestamp) {
               new String[] {String.valueOf(mmsId), address.toString(), String.valueOf(status)});
   }
 
-  public void setUnidentified(Address address, long mmsId, boolean unidentified) {
-    SQLiteDatabase db     = getWritableDatabase();
-    ContentValues  values = new ContentValues(1);
-    values.put(UNIDENTIFIED, unidentified ? 1 : 0);
-
-    db.update(TABLE_NAME, values, MMS_ID + " = ? AND " + ADDRESS + " = ?",
-              new String[] {String.valueOf(mmsId), address.toString()});
-
-  }
-
-  public @NonNull List<GroupReceiptInfo> getGroupReceiptInfo(long mmsId) {
-    SQLiteDatabase         db      = getReadableDatabase();
-    List<GroupReceiptInfo> results = new LinkedList<>();
-
-    try (Cursor cursor = db.query(TABLE_NAME, null, MMS_ID + " = ?", new String[] {String.valueOf(mmsId)}, null, null, null)) {
-      while (cursor != null && cursor.moveToNext()) {
-        results.add(new GroupReceiptInfo(Address.fromSerialized(cursor.getString(cursor.getColumnIndexOrThrow(ADDRESS))),
-                                         cursor.getInt(cursor.getColumnIndexOrThrow(STATUS)),
-                                         cursor.getLong(cursor.getColumnIndexOrThrow(TIMESTAMP)),
-                                         cursor.getInt(cursor.getColumnIndexOrThrow(UNIDENTIFIED)) == 1));
-      }
-    }
-
-    return results;
-  }
-
   void deleteRowsForMessages(String[] mmsIds) {
     StringBuilder queryBuilder = new StringBuilder();
     for (int i = 0; i < mmsIds.length; i++) {
@@ -116,39 +88,4 @@ void deleteRowsForMessages(long[] mmsIds) {
     SQLiteDatabase db = getWritableDatabase();
     db.delete(TABLE_NAME, MMS_ID + " IN (?)", new String[] {StringUtils.join(mmsIds, ',')});
   }
-
-  void deleteAllRows() {
-    SQLiteDatabase db = getWritableDatabase();
-    db.delete(TABLE_NAME, null, null);
-  }
-
-  public static class GroupReceiptInfo {
-    private final Address address;
-    private final int     status;
-    private final long    timestamp;
-    private final boolean unidentified;
-
-    GroupReceiptInfo(Address address, int status, long timestamp, boolean unidentified) {
-      this.address      = address;
-      this.status       = status;
-      this.timestamp    = timestamp;
-      this.unidentified = unidentified;
-    }
-
-    public Address getAddress() {
-      return address;
-    }
-
-    public int getStatus() {
-      return status;
-    }
-
-    public long getTimestamp() {
-      return timestamp;
-    }
-
-    public boolean isUnidentified() {
-      return unidentified;
-    }
-  }
 }

app/src/main/java/org/thoughtcrime/securesms/database/LastSentTimestampCache.kt

@@ -45,7 +45,6 @@ public MessagingDatabase(Context context, Provider<SQLCipherOpenHelper> database
 
   public abstract void markAsSyncFailed(long id);
 
-  public abstract void markUnidentified(long messageId, boolean unidentified);
 
   public abstract void markAsDeleted(long messageId, boolean isOutgoing, String displayedMessage);