Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +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

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

@@ -379,14 +379,14 @@ public class MessageSender {
private static @NonNull OutgoingTextMessage applyUniversalExpireTimerIfNecessary(@NonNull Context context, @NonNull Recipient recipient, @NonNull OutgoingTextMessage outgoingTextMessage, long threadId) {
if (outgoingTextMessage.getExpiresIn() == 0 && RecipientUtil.setAndSendUniversalExpireTimerIfNecessary(context, recipient, threadId)) {
return new OutgoingTextMessage(outgoingTextMessage, TimeUnit.SECONDS.toMillis(SignalStore.settings().getUniversalExpireTimer()));
return outgoingTextMessage.withExpiry(TimeUnit.SECONDS.toMillis(SignalStore.settings().getUniversalExpireTimer()));
}
return outgoingTextMessage;
}
private static @NonNull OutgoingMediaMessage applyUniversalExpireTimerIfNecessary(@NonNull Context context, @NonNull Recipient recipient, @NonNull OutgoingMediaMessage outgoingMediaMessage, long threadId) {
if (!outgoingMediaMessage.isExpirationUpdate() && outgoingMediaMessage.getExpiresIn() == 0 && RecipientUtil.setAndSendUniversalExpireTimerIfNecessary(context, recipient, threadId)) {
return new OutgoingMediaMessage(outgoingMediaMessage, TimeUnit.SECONDS.toMillis(SignalStore.settings().getUniversalExpireTimer()));
return outgoingMediaMessage.withExpiry(TimeUnit.SECONDS.toMillis(SignalStore.settings().getUniversalExpireTimer()));
}
return outgoingMediaMessage;
}

7
app/src/main/java/org/thoughtcrime/securesms/sms/OutgoingEncryptedMessage.java
View File

@@ -1,5 +1,7 @@
package org.thoughtcrime.securesms.sms;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.recipients.Recipient;
public class OutgoingEncryptedMessage extends OutgoingTextMessage {
@@ -17,6 +19,11 @@ public class OutgoingEncryptedMessage extends OutgoingTextMessage {
return true;
}
@Override
public @NonNull OutgoingTextMessage withExpiry(long expiresIn) {
return new OutgoingEncryptedMessage(getRecipient(), getMessageBody(), expiresIn);
};
@Override
public OutgoingTextMessage withBody(String body) {
return new OutgoingEncryptedMessage(this, body);

6
app/src/main/java/org/thoughtcrime/securesms/sms/OutgoingTextMessage.java
View File

@@ -1,5 +1,7 @@
package org.thoughtcrime.securesms.sms;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.database.model.SmsMessageRecord;
import org.thoughtcrime.securesms.recipients.Recipient;
@@ -28,8 +30,8 @@ public class OutgoingTextMessage {
this.message = body;
}
public OutgoingTextMessage(OutgoingTextMessage base, long expiresIn) {
this(base.getRecipient(), base.getMessageBody(), expiresIn, base.getSubscriptionId());
public @NonNull OutgoingTextMessage withExpiry(long expiresIn) {
return new OutgoingTextMessage(recipient, message, expiresIn, subscriptionId);
}
public long getExpiresIn() {