Remove MmsSmsColumns.

All the columns got moved to MessageTable.
I kept the types though and renamed the class to MessageTypes because
it's a lot of boring domain-specific code.
This commit is contained in:
Greyson Parrelli
2022-12-30 15:56:47 -05:00
parent 3708cc5583
commit f149c0adb9
32 changed files with 883 additions and 989 deletions

View File

@@ -19,7 +19,6 @@ import org.thoughtcrime.securesms.database.GroupTable;
import org.thoughtcrime.securesms.database.MentionTable;
import org.thoughtcrime.securesms.database.MentionUtil;
import org.thoughtcrime.securesms.database.MessageTable;
import org.thoughtcrime.securesms.database.MmsSmsColumns;
import org.thoughtcrime.securesms.database.RecipientTable;
import org.thoughtcrime.securesms.database.SearchTable;
import org.thoughtcrime.securesms.database.SignalDatabase;
@@ -451,8 +450,8 @@ public class SearchRepository {
Recipient messageRecipient = Recipient.live(messageRecipientId).get();
String body = CursorUtil.requireString(cursor, SearchTable.BODY);
String bodySnippet = CursorUtil.requireString(cursor, SearchTable.SNIPPET);
long receivedMs = CursorUtil.requireLong(cursor, MmsSmsColumns.DATE_RECEIVED);
long threadId = CursorUtil.requireLong(cursor, MmsSmsColumns.THREAD_ID);
long receivedMs = CursorUtil.requireLong(cursor, MessageTable.DATE_RECEIVED);
long threadId = CursorUtil.requireLong(cursor, MessageTable.THREAD_ID);
int messageId = CursorUtil.requireInt(cursor, SearchTable.MESSAGE_ID);
boolean isMms = CursorUtil.requireInt(cursor, SearchTable.IS_MMS) == 1;