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

Remove OutgoingTextMessage and PushTextSendJob.

Browse Source
This commit is contained in:
Greyson Parrelli
2022-12-14 16:05:09 -05:00
parent e9d98b7d39
commit 9b60bd9a4b
26 changed files with 150 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java
View File

@@ -120,9 +120,6 @@ import org.thoughtcrime.securesms.service.webrtc.WebRtcData;
import org.thoughtcrime.securesms.sms.IncomingEncryptedMessage;
import org.thoughtcrime.securesms.sms.IncomingEndSessionMessage;
import org.thoughtcrime.securesms.sms.IncomingTextMessage;
import org.thoughtcrime.securesms.sms.OutgoingEncryptedMessage;
import org.thoughtcrime.securesms.sms.OutgoingEndSessionMessage;
import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
import org.thoughtcrime.securesms.stickers.StickerLocator;
import org.thoughtcrime.securesms.storage.StorageSyncHelper;
import org.thoughtcrime.securesms.stories.Stories;
@@ -772,14 +769,13 @@ public final class MessageContentProcessor {
}
private long handleSynchronizeSentEndSessionMessage(@NonNull SentTranscriptMessage message, long envelopeTimestamp)
throws BadGroupIdException
throws MmsException
{
log(envelopeTimestamp, "Synchronize end session message.");
MessageTable database = SignalDatabase.sms();
Recipient recipient = getSyncMessageDestination(message);
OutgoingTextMessage outgoingTextMessage = new OutgoingTextMessage(recipient, "", -1);
OutgoingEndSessionMessage outgoingEndSessionMessage = new OutgoingEndSessionMessage(outgoingTextMessage);
MessageTable database = SignalDatabase.sms();
Recipient recipient = getSyncMessageDestination(message);
OutgoingMediaMessage outgoingEndSessionMessage = OutgoingMediaMessage.endSessionMessage(recipient, message.getTimestamp());
long threadId = SignalDatabase.threads().getOrCreateThreadIdFor(recipient);
@@ -788,10 +784,9 @@ public final class MessageContentProcessor {
SecurityEvent.broadcastSecurityUpdateEvent(context);
long messageId = database.insertMessageOutbox(threadId,
outgoingEndSessionMessage,
long messageId = database.insertMessageOutbox(outgoingEndSessionMessage,
threadId,
false,
message.getTimestamp(),
null);
database.markAsSent(messageId, true);
SignalDatabase.threads().update(threadId, true);
@@ -2448,9 +2443,9 @@ public final class MessageContentProcessor {
updateGroupReceiptStatus(message, messageId, recipient.requireGroupId());
} else {
OutgoingTextMessage outgoingTextMessage = new OutgoingEncryptedMessage(recipient, body, expiresInMillis);
OutgoingMediaMessage outgoingTextMessage = OutgoingMediaMessage.text(recipient, body, expiresInMillis, message.getTimestamp());
messageId = SignalDatabase.sms().insertMessageOutbox(threadId, outgoingTextMessage, false, message.getTimestamp(), null);
messageId = SignalDatabase.sms().insertMessageOutbox(outgoingTextMessage, threadId, false, null);
database = SignalDatabase.sms();
database.markUnidentified(messageId, isUnidentified(message, recipient));
}