Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-19 16:19:33 +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

11
app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java
View File

@@ -43,8 +43,6 @@ import org.thoughtcrime.securesms.mms.VideoSlide;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.sms.MessageSender;
import org.thoughtcrime.securesms.sms.OutgoingEncryptedMessage;
import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
import org.thoughtcrime.securesms.stories.Stories;
import org.thoughtcrime.securesms.util.Base64;
import org.thoughtcrime.securesms.util.MediaUtil;
@@ -386,15 +384,16 @@ public final class MultiShareSender {
long expiresIn,
int subscriptionId)
{
String body = multiShareArgs.getDraftText() == null ? "" : multiShareArgs.getDraftText();
final OutgoingTextMessage outgoingTextMessage;
OutgoingMediaMessage outgoingMessage;
if (shouldSendAsPush(recipient, forceSms)) {
outgoingTextMessage = new OutgoingEncryptedMessage(recipient, multiShareArgs.getDraftText(), expiresIn);
outgoingMessage = OutgoingMediaMessage.text(recipient, body, expiresIn, System.currentTimeMillis());
} else {
outgoingTextMessage = new OutgoingTextMessage(recipient, multiShareArgs.getDraftText(), expiresIn, subscriptionId);
outgoingMessage = OutgoingMediaMessage.sms(recipient, body, subscriptionId);
}
MessageSender.send(context, outgoingTextMessage, threadId, forceSms, null, null);
MessageSender.send(context, outgoingMessage, threadId, forceSms, null, null);
}
private static @NonNull OutgoingMediaMessage generateTextStory(@NonNull Context context,