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

14
app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
View File

@@ -113,7 +113,7 @@ public class MessageSender {
{
Log.i(TAG, "Sending story messages to " + messages.size() + " targets.");
ThreadTable threadTable = SignalDatabase.threads();
MessageTable database = SignalDatabase.mms();
MessageTable database = SignalDatabase.messages();
List<Long> messageIds = new ArrayList<>(messages.size());
List<Long> threads = new ArrayList<>(messages.size());
UploadDependencyGraph dependencyGraph;
@@ -228,7 +228,7 @@ public class MessageSender {
Log.i(TAG, "Sending media message to " + message.getRecipient().getId() + ", thread: " + threadId);
try {
ThreadTable threadTable = SignalDatabase.threads();
MessageTable database = SignalDatabase.mms();
MessageTable database = SignalDatabase.messages();
long allocatedThreadId = threadTable.getOrCreateValidThreadId(message.getRecipient(), threadId, message.getDistributionType());
Recipient recipient = message.getRecipient();
@@ -262,7 +262,7 @@ public class MessageSender {
try {
ThreadTable threadTable = SignalDatabase.threads();
MessageTable mmsDatabase = SignalDatabase.mms();
MessageTable mmsDatabase = SignalDatabase.messages();
AttachmentTable attachmentDatabase = SignalDatabase.attachments();
long allocatedThreadId;
@@ -306,7 +306,7 @@ public class MessageSender {
JobManager jobManager = ApplicationDependencies.getJobManager();
AttachmentTable attachmentDatabase = SignalDatabase.attachments();
MessageTable mmsDatabase = SignalDatabase.mms();
MessageTable mmsDatabase = SignalDatabase.messages();
ThreadTable threadTable = SignalDatabase.threads();
List<AttachmentId> preUploadAttachmentIds = Stream.of(preUploadResults).map(PreUploadResult::getAttachmentId).toList();
List<String> preUploadJobIds = Stream.of(preUploadResults).map(PreUploadResult::getJobIds).flatMap(Stream::of).toList();
@@ -467,7 +467,7 @@ public class MessageSender {
}
public static void sendRemoteDelete(long messageId, boolean isMms) {
MessageTable db = isMms ? SignalDatabase.mms() : SignalDatabase.sms();
MessageTable db = isMms ? SignalDatabase.messages() : SignalDatabase.messages();
db.markAsRemoteDelete(messageId);
db.markAsSending(messageId);
@@ -623,7 +623,7 @@ public class MessageSender {
private static void sendLocalMediaSelf(Context context, long messageId) {
try {
ExpiringMessageManager expirationManager = ApplicationDependencies.getExpiringMessageManager();
MessageTable mmsDatabase = SignalDatabase.mms();
MessageTable mmsDatabase = SignalDatabase.messages();
MmsSmsTable mmsSmsDatabase = SignalDatabase.mmsSms();
OutgoingMessage message = mmsDatabase.getOutgoingMessage(messageId);
SyncMessageId syncId = new SyncMessageId(Recipient.self().getId(), message.getSentTimeMillis());
@@ -674,7 +674,7 @@ public class MessageSender {
private static void sendLocalTextSelf(Context context, long messageId) {
try {
ExpiringMessageManager expirationManager = ApplicationDependencies.getExpiringMessageManager();
MessageTable smsDatabase = SignalDatabase.sms();
MessageTable smsDatabase = SignalDatabase.messages();
MmsSmsTable mmsSmsDatabase = SignalDatabase.mmsSms();
SmsMessageRecord message = smsDatabase.getSmsMessage(messageId);
SyncMessageId syncId = new SyncMessageId(Recipient.self().getId(), message.getDateSent());