Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 16:49:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Introduce SignalDatabase as the main database entrypoint.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-11-18 12:36:52 -05:00
committed by GitHub
parent e17c49505c
commit 843ed24bbb
371 changed files with 4198 additions and 4434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/invites/InviteReminderModel.java
View File

@@ -9,8 +9,7 @@ import androidx.annotation.WorkerThread;
import org.thoughtcrime.securesms.components.reminder.FirstInviteReminder;
import org.thoughtcrime.securesms.components.reminder.Reminder;
import org.thoughtcrime.securesms.components.reminder.SecondInviteReminder;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MmsSmsDatabase;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.ThreadDatabase;
import org.thoughtcrime.securesms.recipients.LiveRecipient;
import org.thoughtcrime.securesms.recipients.Recipient;
@@ -49,11 +48,11 @@ public final class InviteReminderModel {
return new NoReminderInfo();
}
ThreadDatabase threadDatabase = DatabaseFactory.getThreadDatabase(context);
ThreadDatabase threadDatabase = SignalDatabase.threads();
Long threadId = threadDatabase.getThreadIdFor(recipient.getId());
if (threadId != null) {
int conversationCount = DatabaseFactory.getMmsSmsDatabase(context).getInsecureSentCount(threadId);
int conversationCount = SignalDatabase.mmsSms().getInsecureSentCount(threadId);
if (conversationCount >= SECOND_INVITE_REMINDER_MESSAGE_THRESHOLD && !resolved.hasSeenSecondInviteReminder()) {
return new SecondInviteReminderInfo(context, resolved, repository, repository.getPercentOfInsecureMessages(conversationCount));

8
app/src/main/java/org/thoughtcrime/securesms/invites/InviteReminderRepository.java
View File

@@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.invites;
import android.content.Context;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MmsSmsDatabase;
import org.thoughtcrime.securesms.database.RecipientDatabase;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.recipients.Recipient;
public final class InviteReminderRepository implements InviteReminderModel.Repository {
@@ -17,19 +17,19 @@ public final class InviteReminderRepository implements InviteReminderModel.Repos
@Override
public void setHasSeenFirstInviteReminder(Recipient recipient) {
RecipientDatabase recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
RecipientDatabase recipientDatabase = SignalDatabase.recipients();
recipientDatabase.setSeenFirstInviteReminder(recipient.getId());
}
@Override
public void setHasSeenSecondInviteReminder(Recipient recipient) {
RecipientDatabase recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
RecipientDatabase recipientDatabase = SignalDatabase.recipients();
recipientDatabase.setSeenSecondInviteReminder(recipient.getId());
}
@Override
public int getPercentOfInsecureMessages(int insecureCount) {
MmsSmsDatabase mmsSmsDatabase = DatabaseFactory.getMmsSmsDatabase(context);
MmsSmsDatabase mmsSmsDatabase = SignalDatabase.mmsSms();
int insecure = mmsSmsDatabase.getInsecureMessageCountForInsights();
int secure = mmsSmsDatabase.getSecureMessageCountForInsights();