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

Fix issue where forwarded messages would show unlock icon.

Browse Source
This commit is contained in:
Alex Hart
2021-08-18 11:37:38 -03:00
committed by Greyson Parrelli
parent fec4a7692d
commit 7bede7e98a
6 changed files with 62 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ import org.thoughtcrime.securesms.database.model.Mention;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.mediasend.Media;
import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
import org.thoughtcrime.securesms.mms.OutgoingSecureMediaMessage;
import org.thoughtcrime.securesms.mms.Slide;
import org.thoughtcrime.securesms.mms.SlideDeck;
import org.thoughtcrime.securesms.mms.SlideFactory;
@@ -26,6 +27,7 @@ import org.thoughtcrime.securesms.mms.StickerSlide;
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.util.MessageUtil;
import org.thoughtcrime.securesms.util.Util;
@@ -176,7 +178,12 @@ public final class MultiShareSender {
: Collections.emptyList(),
validatedMentions);
MessageSender.send(context, outgoingMediaMessage, threadId, forceSms, null);
if (recipient.isRegistered() && !forceSms) {
MessageSender.send(context, new OutgoingSecureMediaMessage(outgoingMediaMessage), threadId, false, null);
} else {
MessageSender.send(context, outgoingMediaMessage, threadId, forceSms, null);
}
}
private static void sendTextMessage(@NonNull Context context,
@@ -187,7 +194,13 @@ public final class MultiShareSender {
long expiresIn,
int subscriptionId)
{
OutgoingTextMessage outgoingTextMessage = new OutgoingTextMessage(recipient, multiShareArgs.getDraftText(), expiresIn, subscriptionId);
final OutgoingTextMessage outgoingTextMessage;
if (recipient.isRegistered() && !forceSms) {
outgoingTextMessage = new OutgoingEncryptedMessage(recipient, multiShareArgs.getDraftText(), expiresIn);
} else {
outgoingTextMessage = new OutgoingTextMessage(recipient, multiShareArgs.getDraftText(), expiresIn, subscriptionId);
}
MessageSender.send(context, outgoingTextMessage, threadId, forceSms, null);
}