From a5047cb17b6a7f67bb5040e984122844f39f704a Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Mon, 23 Apr 2018 17:46:57 -0700
Subject: [PATCH] Fix for sender's expiring messages in group with unregistered
 user

Fixes #7719
---
 src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
index 7bff074b97..5e05f633b8 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
@@ -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);