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

Rename OutgoingMediaMessage -> OutgoingMessage.

Browse Source
This commit is contained in:
Greyson Parrelli
2022-12-14 16:19:12 -05:00
parent 9b60bd9a4b
commit a7e3bdc892
41 changed files with 438 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreview;
import org.thoughtcrime.securesms.mediasend.Media;
import org.thoughtcrime.securesms.mediasend.v2.text.TextStoryBackgroundColors;
import org.thoughtcrime.securesms.mms.ImageSlide;
import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
import org.thoughtcrime.securesms.mms.OutgoingMessage;
import org.thoughtcrime.securesms.mms.SentMediaQuality;
import org.thoughtcrime.securesms.mms.Slide;
import org.thoughtcrime.securesms.mms.SlideDeck;
@@ -86,7 +86,7 @@ public final class MultiShareSender {
boolean isMmsEnabled = Util.isMmsCapable(context);
String message = multiShareArgs.getDraftText();
SlideDeck slideDeck;
List<OutgoingMediaMessage> storiesBatch = new LinkedList<>();
List<OutgoingMessage> storiesBatch = new LinkedList<>();
ChatColors generatedTextStoryBackgroundColor = TextStoryBackgroundColors.getRandomBackgroundColor();
try {
@@ -164,7 +164,7 @@ public final class MultiShareSender {
if (!storiesBatch.isEmpty()) {
MessageSender.sendStories(context,
storiesBatch.stream()
.map(OutgoingMediaMessage::makeSecure)
.map(OutgoingMessage::makeSecure)
.collect(Collectors.toList()),
null,
null);
@@ -210,7 +210,7 @@ public final class MultiShareSender {
boolean isStory,
long sentTimestamp,
boolean canSendAsTextStory,
@NonNull List<OutgoingMediaMessage> storiesToBatchSend,
@NonNull List<OutgoingMessage> storiesToBatchSend,
@NonNull ChatColors generatedTextStoryBackgroundColor)
{
String body = multiShareArgs.getDraftText();
@@ -223,7 +223,7 @@ public final class MultiShareSender {
}
}
List<OutgoingMediaMessage> outgoingMessages = new ArrayList<>();
List<OutgoingMessage> outgoingMessages = new ArrayList<>();
if (isStory) {
final StoryType storyType;
@@ -238,19 +238,19 @@ public final class MultiShareSender {
}
if (multiShareArgs.isTextStory()) {
OutgoingMediaMessage outgoingMediaMessage = new OutgoingMediaMessage(recipient,
new SlideDeck(),
body,
sentTimestamp,
subscriptionId,
0L,
false,
storyType.toTextStoryType(),
buildLinkPreviews(context, multiShareArgs.getLinkPreview()),
Collections.emptyList(),
false);
OutgoingMessage outgoingMessage = new OutgoingMessage(recipient,
new SlideDeck(),
body,
sentTimestamp,
subscriptionId,
0L,
false,
storyType.toTextStoryType(),
buildLinkPreviews(context, multiShareArgs.getLinkPreview()),
Collections.emptyList(),
false);
outgoingMessages.add(outgoingMediaMessage);
outgoingMessages.add(outgoingMessage);
} else if (canSendAsTextStory) {
outgoingMessages.add(generateTextStory(context, recipient, multiShareArgs, sentTimestamp, storyType, generatedTextStoryBackgroundColor));
} else {
@@ -272,45 +272,45 @@ public final class MultiShareSender {
SlideDeck singletonDeck = new SlideDeck();
singletonDeck.addSlide(slide);
OutgoingMediaMessage outgoingMediaMessage = new OutgoingMediaMessage(recipient,
singletonDeck,
body,
sentTimestamp,
subscriptionId,
0L,
false,
storyType,
Collections.emptyList(),
validatedMentions,
false);
OutgoingMessage outgoingMessage = new OutgoingMessage(recipient,
singletonDeck,
body,
sentTimestamp,
subscriptionId,
0L,
false,
storyType,
Collections.emptyList(),
validatedMentions,
false);
outgoingMessages.add(outgoingMediaMessage);
outgoingMessages.add(outgoingMessage);
}
}
} else {
OutgoingMediaMessage outgoingMediaMessage = new OutgoingMediaMessage(recipient,
slideDeck,
body,
sentTimestamp,
subscriptionId,
expiresIn,
isViewOnce,
StoryType.NONE,
buildLinkPreviews(context, multiShareArgs.getLinkPreview()),
validatedMentions,
false);
OutgoingMessage outgoingMessage = new OutgoingMessage(recipient,
slideDeck,
body,
sentTimestamp,
subscriptionId,
expiresIn,
isViewOnce,
StoryType.NONE,
buildLinkPreviews(context, multiShareArgs.getLinkPreview()),
validatedMentions,
false);
outgoingMessages.add(outgoingMediaMessage);
outgoingMessages.add(outgoingMessage);
}
if (isStory) {
storiesToBatchSend.addAll(outgoingMessages);
} else if (shouldSendAsPush(recipient, forceSms)) {
for (final OutgoingMediaMessage outgoingMessage : outgoingMessages) {
for (final OutgoingMessage outgoingMessage : outgoingMessages) {
MessageSender.send(context, outgoingMessage.makeSecure(), threadId, false, null, null);
}
} else {
for (final OutgoingMediaMessage outgoingMessage : outgoingMessages) {
for (final OutgoingMessage outgoingMessage : outgoingMessages) {
MessageSender.send(context, outgoingMessage, threadId, forceSms, null, null);
}
}
@@ -386,24 +386,24 @@ public final class MultiShareSender {
{
String body = multiShareArgs.getDraftText() == null ? "" : multiShareArgs.getDraftText();
OutgoingMediaMessage outgoingMessage;
OutgoingMessage outgoingMessage;
if (shouldSendAsPush(recipient, forceSms)) {
outgoingMessage = OutgoingMediaMessage.text(recipient, body, expiresIn, System.currentTimeMillis());
outgoingMessage = OutgoingMessage.text(recipient, body, expiresIn, System.currentTimeMillis());
} else {
outgoingMessage = OutgoingMediaMessage.sms(recipient, body, subscriptionId);
outgoingMessage = OutgoingMessage.sms(recipient, body, subscriptionId);
}
MessageSender.send(context, outgoingMessage, threadId, forceSms, null, null);
}
private static @NonNull OutgoingMediaMessage generateTextStory(@NonNull Context context,
@NonNull Recipient recipient,
@NonNull MultiShareArgs multiShareArgs,
long sentTimestamp,
@NonNull StoryType storyType,
@NonNull ChatColors background)
private static @NonNull OutgoingMessage generateTextStory(@NonNull Context context,
@NonNull Recipient recipient,
@NonNull MultiShareArgs multiShareArgs,
long sentTimestamp,
@NonNull StoryType storyType,
@NonNull ChatColors background)
{
return OutgoingMediaMessage.textStoryMessage(
return OutgoingMessage.textStoryMessage(
recipient,
Base64.encodeBytes(StoryTextPost.newBuilder()
.setBody(getBodyForTextStory(multiShareArgs.getDraftText(), multiShareArgs.getLinkPreview()))