From e460e086e6fe1a64d43c4dc6546088bdbf6ee3c9 Mon Sep 17 00:00:00 2001
From: charles <charles@oxen.io>
Date: Wed, 21 Dec 2022 18:33:48 +1100
Subject: [PATCH] Cleanup

---
 .../attachments/DatabaseAttachmentProvider.kt        | 11 -----------
 .../securesms/database/LokiMessageDatabase.kt        | 12 ------------
 .../securesms/database/MmsSmsDatabase.java           |  6 ------
 .../libsession/database/MessageDataProvider.kt       |  2 --
 4 files changed, 31 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
index 9c5afdd122..fa0fce7bd3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
@@ -201,17 +201,6 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper)
         return messageDB.getMessageServerHash(messageID)
     }
 
-    override fun getServerHashForMessages(messageIDs: List<Long>): List<Pair<Long, String?>> {
-        val messageDB = DatabaseComponent.get(context).lokiMessageDatabase()
-        return messageDB.getMessageServerHashes(messageIDs)
-    }
-
-    override fun getMessageTimestampForServerHash(serverHash: String): Long? {
-        return DatabaseComponent.get(context).lokiMessageDatabase().getMessageIdForServerHash(serverHash)?.let {
-            DatabaseComponent.get(context).mmsSmsDatabase().getMessage(it)?.timestamp
-        }
-    }
-
     override fun getDatabaseAttachment(attachmentId: Long): DatabaseAttachment? {
         val attachmentDatabase = DatabaseComponent.get(context).attachmentDatabase()
         return attachmentDatabase.getAttachment(AttachmentId(attachmentId, 0))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/LokiMessageDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/LokiMessageDatabase.kt
index 6c3e72cf00..a3f6395b15 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/LokiMessageDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/LokiMessageDatabase.kt
@@ -170,13 +170,6 @@ class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Datab
         }
     }
 
-    fun getMessageServerHashes(messageIDs: List<Long>): List<Pair<Long, String?>> {
-        val database = databaseHelper.readableDatabase
-        return database.getAll(messageHashTable, "${Companion.messageID} IN (?)", arrayOf(messageIDs.joinToString(","))) { cursor ->
-            cursor.getLong(messageID) to cursor.getStringOrNull(serverHash)
-        }
-    }
-
     fun setMessageServerHash(messageID: Long, serverHash: String) {
         val database = databaseHelper.writableDatabase
         val contentValues = ContentValues(2)
@@ -197,9 +190,4 @@ class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Datab
         database.update(messageThreadMappingTable, contentValues, "$threadID = ?", arrayOf(legacyThreadId.toString()))
     }
 
-    fun getMessageIdForServerHash(serverHash: String): Long? {
-        return readableDatabase.get(messageHashTable, "$serverHash = ?", arrayOf(serverHash)) { cursor ->
-            cursor.getLong(messageID)
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
index 1211ea3210..b3afeac477 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
@@ -81,12 +81,6 @@ public class MmsSmsDatabase extends Database {
     super(context, databaseHelper);
   }
 
-  public @Nullable MessageRecord getMessage(long messageId) {
-    try (Cursor cursor = queryTables(PROJECTION, MmsSmsColumns.ID + " = " + messageId, null, null)) {
-      return readerFor(cursor).getNext();
-    }
-  }
-
   public @Nullable MessageRecord getMessageForTimestamp(long timestamp) {
     try (Cursor cursor = queryTables(PROJECTION, MmsSmsColumns.NORMALIZED_DATE_SENT + " = " + timestamp, null, null)) {
       MmsSmsDatabase.Reader reader = readerFor(cursor);
diff --git a/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt b/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt
index e22a8b5b10..eb40df6e09 100644
--- a/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt
+++ b/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt
@@ -23,8 +23,6 @@ interface MessageDataProvider {
     fun deleteMessage(messageID: Long, isSms: Boolean)
     fun updateMessageAsDeleted(timestamp: Long, author: String)
     fun getServerHashForMessage(messageID: Long): String?
-    fun getServerHashForMessages(messageIDs: List<Long>): List<Pair<Long, String?>>
-    fun getMessageTimestampForServerHash(serverHash: String): Long?
     fun getDatabaseAttachment(attachmentId: Long): DatabaseAttachment?
     fun getAttachmentStream(attachmentId: Long): SessionServiceAttachmentStream?
     fun getAttachmentPointer(attachmentId: Long): SessionServiceAttachmentPointer?