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

Ignore contact joined message when determining if we should apply universal disappearing messages.

Browse Source
This commit is contained in:
Cody Henthorne
2023-03-28 16:06:23 -04:00
committed by GitHub
parent 5f645193e4
commit 0017b7af26
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java
View File

@@ -314,7 +314,7 @@ public class RecipientUtil {
return false;
}
if (threadId == -1 || !SignalDatabase.messages().hasMeaningfulMessage(threadId)) {
if (threadId == -1 || SignalDatabase.messages().canSetUniversalTimer(threadId)) {
SignalDatabase.recipients().setExpireMessages(recipient.getId(), defaultTimer);
OutgoingMessage outgoingMessage = OutgoingMessage.expirationUpdateMessage(recipient, System.currentTimeMillis(), defaultTimer * 1000L);
MessageSender.send(context, outgoingMessage, SignalDatabase.threads().getOrCreateThreadIdFor(recipient), MessageSender.SendType.SIGNAL, null, null);