Fix for sender's expiring messages in group with unregistered user

Fixes #7719
This commit is contained in:
Moxie Marlinspike 2018-04-23 17:46:57 -07:00 committed by Greyson Parrelli
parent 5006b36e2d
commit a5047cb17b

View file

@ -116,6 +116,13 @@ public class PushGroupSendJob extends PushSendJob implements InjectableType {
if (e.getNetworkExceptions().isEmpty() && e.getUntrustedIdentityExceptions().isEmpty()) {
database.markAsSent(messageId, true);
markAttachmentsUploaded(messageId, message.getAttachments());
if (message.getExpiresIn() > 0 && !message.isExpirationUpdate()) {
database.markExpireStarted(messageId);
ApplicationContext.getInstance(context)
.getExpiringMessageManager()
.scheduleDeletion(messageId, true, message.getExpiresIn());
}
} else {
database.markAsSentFailed(messageId);
notifyMediaMessageDeliveryFailed(context, messageId);