refactor: trim thread is now queued after batch processing messages, for other conversations still after every persisted message

migrate TrimThreadJob.kt to new job system deleting more open group references in removal open group last message / last deletion now sets after processing vs after fetching
2025-08-12 11:07:42 +00:00 · 2021-05-26 15:22:19 +10:00
parent 02bbd3b8bf
commit efa36d4cea
14 changed files with 130 additions and 34 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -46,7 +46,6 @@ import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.NotificationMmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.Quote;
-import org.thoughtcrime.securesms.jobs.TrimThreadJob;
 import org.session.libsession.messaging.messages.signal.IncomingMediaMessage;
 import org.thoughtcrime.securesms.mms.MmsException;
 import org.session.libsession.messaging.messages.signal.OutgoingExpirationUpdateMessage;
@@ -668,7 +667,6 @@ public class MmsDatabase extends MessagingDatabase {
    }

    notifyConversationListeners(threadId);
-    ApplicationContext.getInstance(context).getJobManager().add(new TrimThreadJob(threadId));

    return Optional.of(new InsertResult(messageId, threadId));
  }
@@ -812,7 +810,6 @@ public class MmsDatabase extends MessagingDatabase {

    DatabaseFactory.getThreadDatabase(context).setLastSeen(threadId);
    DatabaseFactory.getThreadDatabase(context).setHasSent(threadId, true);
-    ApplicationContext.getInstance(context).getJobManager().add(new TrimThreadJob(threadId));

    return messageId;
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
@@ -35,7 +35,6 @@ import org.session.libsession.utilities.IdentityKeyMismatchList;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.SmsMessageRecord;
-import org.thoughtcrime.securesms.jobs.TrimThreadJob;
 import org.session.libsession.messaging.messages.signal.IncomingGroupMessage;
 import org.session.libsession.messaging.messages.signal.IncomingTextMessage;
 import org.session.libsession.messaging.messages.signal.OutgoingTextMessage;
@@ -414,7 +413,6 @@ public class SmsDatabase extends MessagingDatabase {

      notifyConversationListeners(threadId);

-      ApplicationContext.getInstance(context).getJobManager().add(new TrimThreadJob(threadId));

      return Optional.of(new InsertResult(messageId, threadId));
    }
@@ -484,7 +482,6 @@ public class SmsDatabase extends MessagingDatabase {

    notifyConversationListeners(threadId);

-    ApplicationContext.getInstance(context).getJobManager().add(new TrimThreadJob(threadId));

    return messageId;
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.database

+import android.app.job.JobScheduler
 import android.content.Context
 import android.net.Uri
 import org.session.libsession.database.StorageProtocol
@@ -161,6 +162,11 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
                messageID = result.messageId
            }
        }
+        val threadID = message.threadID
+        if (openGroupID.isNullOrEmpty() && threadID != null && threadID >= 0) {
+            JobQueue.shared.add(TrimThreadJob(threadID))
+            // open group trim thread job is scheduled after processing
+        }
        return messageID
    }

@@ -539,6 +545,11 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
        return threadDB.getLastUpdated(threadID)
    }

+    override fun trimThread(threadID: Long, threadLimit: Int) {
+        val threadDB = DatabaseFactory.getThreadDatabase(context)
+        threadDB.trimThread(threadID, threadLimit)
+    }
+
    override fun getAttachmentDataUri(attachmentId: AttachmentId): Uri {
        return PartAuthority.getAttachmentDataUri(attachmentId)
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -423,6 +423,7 @@ public class ThreadDatabase extends Database {
    DatabaseFactory.getSmsDatabase(context).deleteThread(threadId);
    DatabaseFactory.getMmsDatabase(context).deleteThread(threadId);
    DatabaseFactory.getDraftDatabase(context).clearDrafts(threadId);
+    DatabaseFactory.getLokiMessageDatabase(context).deleteThread(threadId);
    deleteThread(threadId);
    notifyConversationListeners(threadId);
    notifyConversationListListeners();
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
@@ -330,9 +330,6 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
                // Delete the conversation
                val v2OpenGroup = DatabaseFactory.getLokiThreadDatabase(context).getOpenGroupChat(threadID)
                if (v2OpenGroup != null) {
-                    val apiDB = DatabaseFactory.getLokiAPIDatabase(context)
-                    apiDB.removeLastMessageServerID(v2OpenGroup.room, v2OpenGroup.server)
-                    apiDB.removeLastDeletionServerID(v2OpenGroup.room, v2OpenGroup.server)
                    OpenGroupManager.delete(v2OpenGroup.server, v2OpenGroup.room, this@HomeActivity)
                } else {
                    ThreadUtils.queue {
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/OpenGroupManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/api/OpenGroupManager.kt
@@ -89,7 +89,7 @@ object OpenGroupManager {
        val openGroup = OpenGroupV2(server, room, info.name, publicKey)
        threadDB.setOpenGroupChat(openGroup, threadID)
        // Start the poller if needed
-        if (pollers[server] == null) {
+        pollers[server]?.startIfNeeded() ?: run {
            val poller = OpenGroupPollerV2(server, executorService)
            Util.runOnMain { poller.startIfNeeded() }
            pollers[server] = poller
@@ -111,9 +111,11 @@ object OpenGroupManager {
            pollers.remove(server)
        }
        // Delete
+        storage.removeLastDeletionServerID(room, server)
+        storage.removeLastMessageServerID(room, server)
+        val lokiThreadDB = DatabaseFactory.getLokiThreadDatabase(context)
+        lokiThreadDB.removeOpenGroupChat(threadID)
        ThreadUtils.queue {
-            storage.removeLastDeletionServerID(room, server)
-            storage.removeLastMessageServerID(room, server)
            GroupManager.deleteGroup(groupID, context) // Must be invoked on a background thread
        }
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt
@@ -8,6 +8,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.loki.utilities.*
 import org.session.libsignal.database.LokiMessageDatabaseProtocol
+import org.session.libsignal.utilities.Log

 class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper), LokiMessageDatabaseProtocol {

@@ -131,4 +132,31 @@ class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Datab
        contentValues.put(Companion.errorMessage, errorMessage)
        database.insertOrUpdate(errorMessageTable, contentValues, "${Companion.messageID} = ?", arrayOf(messageID.toString()))
    }
+
+    fun deleteThread(threadId: Long) {
+        val database = databaseHelper.writableDatabase
+        try {
+            val messages = mutableSetOf<Pair<Long,Long>>()
+            database.get(messageThreadMappingTable,  "${Companion.threadID} = ?", arrayOf(threadId.toString())) { cursor ->
+                // for each add
+                while (cursor.moveToNext()) {
+                    messages.add(cursor.getLong(Companion.messageID) to cursor.getLong(Companion.serverID))
+                }
+            }
+            Log.d("Test", "Need to delete ${messages.size} number of messages")
+
+            var deletedCount = 0L
+
+            database.beginTransaction()
+            messages.forEach { (messageId, serverId) ->
+                deletedCount += database.delete(messageIDTable, "${Companion.messageID} = ? AND ${Companion.serverID} = ?", arrayOf(messageId.toString(), serverId.toString()))
+            }
+            Log.d("Test", "Deleted $deletedCount from messageIDTable")
+            val mappingDeleted = database.delete(messageThreadMappingTable, "${Companion.threadID} = ?", arrayOf(threadId.toString()))
+            Log.d("Test", "Deleted $mappingDeleted from mapping table")
+            database.setTransactionSuccessful()
+        } finally {
+            database.endTransaction()
+        }
+    }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt
@@ -73,4 +73,12 @@ class LokiThreadDatabase(context: Context, helper: SQLCipherOpenHelper) : Databa
        contentValues.put(publicChat, JsonUtil.toJson(openGroupV2.toJson()))
        database.insertOrUpdate(publicChatTable, contentValues, "${Companion.threadID} = ?", arrayOf(threadID.toString()))
    }
+
+    fun removeOpenGroupChat(threadID: Long) {
+        if (threadID < 0) return
+
+        val database = databaseHelper.writableDatabase
+        database.delete(publicChatTable,"${Companion.threadID} = ?", arrayOf(threadID.toString()))
+    }
+
 }