From d6fd6cb5a3bea9fd329d6bf6dc7193ed8132dbb4 Mon Sep 17 00:00:00 2001
From: Nicholas <nicholas@signal.org>
Date: Wed, 8 Nov 2023 09:53:55 -0500
Subject: [PATCH] Optimize thread ID DB query.

---
 .../database/RemappedRecordTables.kt          | 36 -------------------
 1 file changed, 36 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecordTables.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecordTables.kt
index 56d544ab61..3859c9761b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecordTables.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecordTables.kt
@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.database
 import android.content.Context
 import android.database.Cursor
 import androidx.core.content.contentValuesOf
-import org.signal.core.util.delete
 import org.signal.core.util.logging.Log
 import org.signal.core.util.readToList
 import org.signal.core.util.requireLong
@@ -13,7 +12,6 @@ import org.thoughtcrime.securesms.database.RemappedRecordTables.SharedColumns.ID
 import org.thoughtcrime.securesms.database.RemappedRecordTables.SharedColumns.NEW_ID
 import org.thoughtcrime.securesms.database.RemappedRecordTables.SharedColumns.OLD_ID
 import org.thoughtcrime.securesms.recipients.RecipientId
-import java.util.HashMap
 
 /**
  * The backing datastore for [RemappedRecords]. See that class for more details.
@@ -55,8 +53,6 @@ class RemappedRecordTables internal constructor(context: Context?, databaseHelpe
   }
 
   fun getAllRecipientMappings(): Map<RecipientId, RecipientId> {
-    clearInvalidRecipientMappings()
-
     val recipientMap: MutableMap<RecipientId, RecipientId> = HashMap()
 
     readableDatabase.withinTransaction { db ->
@@ -72,8 +68,6 @@ class RemappedRecordTables internal constructor(context: Context?, databaseHelpe
   }
 
   fun getAllThreadMappings(): Map<Long, Long> {
-    clearInvalidThreadMappings()
-
     val threadMap: MutableMap<Long, Long> = HashMap()
 
     readableDatabase.withinTransaction { db ->
@@ -95,7 +89,6 @@ class RemappedRecordTables internal constructor(context: Context?, databaseHelpe
   }
 
   fun getAllRecipients(): Cursor {
-    clearInvalidRecipientMappings()
     return readableDatabase
       .select()
       .from(Recipients.TABLE_NAME)
@@ -103,7 +96,6 @@ class RemappedRecordTables internal constructor(context: Context?, databaseHelpe
   }
 
   fun getAllThreads(): Cursor {
-    clearInvalidThreadMappings()
     return readableDatabase
       .select()
       .from(Threads.TABLE_NAME)
@@ -130,33 +122,5 @@ class RemappedRecordTables internal constructor(context: Context?, databaseHelpe
     databaseHelper.signalWritableDatabase.insert(table, null, values)
   }
 
-  /**
-   * The old_id should never exist -- this class is intended to remap from IDs that were deleted.
-   */
-  private fun clearInvalidRecipientMappings() {
-    val count = writableDatabase
-      .delete(Recipients.TABLE_NAME)
-      .where("$OLD_ID IN (SELECT ${RecipientTable.ID} FROM ${RecipientTable.TABLE_NAME})")
-      .run()
-
-    if (count > 0) {
-      Log.w(TAG, "Deleted $count invalid recipient mappings!", true)
-    }
-  }
-
-  /**
-   * The old_id should never exist -- this class is intended to remap from IDs that were deleted.
-   */
-  private fun clearInvalidThreadMappings() {
-    val count = writableDatabase
-      .delete(Threads.TABLE_NAME)
-      .where("$OLD_ID IN (SELECT ${ThreadTable.ID} FROM ${ThreadTable.TABLE_NAME})")
-      .run()
-
-    if (count > 0) {
-      Log.w(TAG, "Deleted $count invalid thread mappings!", true)
-    }
-  }
-
   private class Mapping(val oldId: Long, val newId: Long)
 }