Migrate most of MmsSmsTable.

This commit is contained in:
Greyson Parrelli
2022-12-30 18:17:39 -05:00
parent f149c0adb9
commit 6cd6073bc7
33 changed files with 884 additions and 1069 deletions

View File

@@ -52,7 +52,7 @@ public final class InviteReminderModel {
Long threadId = threadTable.getThreadIdFor(recipient.getId());
if (threadId != null) {
int conversationCount = SignalDatabase.mmsSms().getInsecureSentCount(threadId);
int conversationCount = SignalDatabase.messages().getInsecureMessageSentCount(threadId);
if (conversationCount >= SECOND_INVITE_REMINDER_MESSAGE_THRESHOLD && !resolved.hasSeenSecondInviteReminder()) {
return new SecondInviteReminderInfo(context, resolved, repository, repository.getPercentOfInsecureMessages(conversationCount));

View File

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.invites;
import android.content.Context;
import org.thoughtcrime.securesms.database.MessageTable;
import org.thoughtcrime.securesms.database.MmsSmsTable;
import org.thoughtcrime.securesms.database.RecipientTable;
import org.thoughtcrime.securesms.database.SignalDatabase;
@@ -29,9 +30,9 @@ public final class InviteReminderRepository implements InviteReminderModel.Repos
@Override
public int getPercentOfInsecureMessages(int insecureCount) {
MmsSmsTable mmsSmsDatabase = SignalDatabase.mmsSms();
int insecure = mmsSmsDatabase.getInsecureMessageCountForInsights();
int secure = mmsSmsDatabase.getSecureMessageCountForInsights();
MessageTable messageTable = SignalDatabase.messages();
int insecure = messageTable.getInsecureMessageCountForInsights();
int secure = messageTable.getSecureMessageCountForInsights();
if (insecure + secure == 0) return 0;
return Math.round(100f * (insecureCount / (float) (insecure + secure)));