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

Rename SignalDatabase.sms/mms to SignalDatabase.messages

Browse Source
This commit is contained in:
Greyson Parrelli
2022-12-14 20:08:23 -05:00
parent a7e3bdc892
commit 60ae883df6
109 changed files with 391 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java
View File

@@ -68,7 +68,7 @@ public class AttachmentUtil {
.size();
if (attachmentCount <= 1) {
SignalDatabase.mms().deleteMessage(mmsId);
SignalDatabase.messages().deleteMessage(mmsId);
} else {
SignalDatabase.attachments().deleteAttachment(attachmentId);
}
@@ -91,7 +91,7 @@ public class AttachmentUtil {
@WorkerThread
private static boolean isFromTrustedConversation(@NonNull Context context, @NonNull DatabaseAttachment attachment) {
try {
MessageRecord message = SignalDatabase.mms().getMessageRecord(attachment.getMmsId());
MessageRecord message = SignalDatabase.messages().getMessageRecord(attachment.getMmsId());
Recipient individualRecipient = message.getRecipient();
Recipient threadRecipient = SignalDatabase.threads().getRecipientForThreadId(message.getThreadId());

4
app/src/main/java/org/thoughtcrime/securesms/util/DeleteDialog.kt
View File

@@ -93,9 +93,9 @@ object DeleteDialog {
override fun doInBackground(vararg params: Void?): Boolean {
return messageRecords.map { record ->
if (record.isMms) {
SignalDatabase.mms.deleteMessage(record.id)
SignalDatabase.messages.deleteMessage(record.id)
} else {
SignalDatabase.sms.deleteMessage(record.id)
SignalDatabase.messages.deleteMessage(record.id)
}
}.any { it }
}

8
app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java
View File

@@ -62,7 +62,7 @@ public final class IdentityUtil {
public static void markIdentityVerified(Context context, Recipient recipient, boolean verified, boolean remote)
{
long time = System.currentTimeMillis();
MessageTable smsDatabase = SignalDatabase.sms();
MessageTable smsDatabase = SignalDatabase.messages();
GroupTable groupDatabase = SignalDatabase.groups();
try (GroupTable.Reader reader = groupDatabase.getGroups()) {
@@ -92,7 +92,7 @@ public final class IdentityUtil {
}
try {
SignalDatabase.sms().insertMessageOutbox(outgoing, threadId, false, null);
SignalDatabase.messages().insertMessageOutbox(outgoing, threadId, false, null);
} catch (MmsException e) {
throw new AssertionError(e);
}
@@ -121,7 +121,7 @@ public final class IdentityUtil {
Log.i(TAG, "Inserting verified outbox...");
try {
SignalDatabase.sms().insertMessageOutbox(outgoing, threadId, false, null);
SignalDatabase.messages().insertMessageOutbox(outgoing, threadId, false, null);
} catch (MmsException e) {
throw new AssertionError();
}
@@ -134,7 +134,7 @@ public final class IdentityUtil {
Log.w(TAG, "Inserting safety number change event(s) for " + recipientId, new Throwable());
long time = System.currentTimeMillis();
MessageTable smsDatabase = SignalDatabase.sms();
MessageTable smsDatabase = SignalDatabase.messages();
GroupTable groupDatabase = SignalDatabase.groups();
try (GroupTable.Reader reader = groupDatabase.getGroups()) {