mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-20 16:49:40 +01:00
Migrate most of MmsSmsTable.
This commit is contained in:
@@ -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));
|
||||
|
||||
@@ -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)));
|
||||
|
||||
Reference in New Issue
Block a user