From 314dd9181c9a50e3ae07e32c67869f09282e7ccf Mon Sep 17 00:00:00 2001
From: Christian Ascheberg <c.ascheberg@gmx.de>
Date: Wed, 28 Sep 2016 20:39:01 +0200
Subject: [PATCH] Fix timer update group notification expiry
Closes #5727
// FREEBIE
---
src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
index 49d65da996..6e3325b3ca 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
@@ -19,7 +19,6 @@ import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientFactory;
import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
import org.thoughtcrime.securesms.recipients.Recipients;
-import org.thoughtcrime.securesms.service.ExpiringMessageManager;
import org.thoughtcrime.securesms.transport.UndeliverableMessageException;
import org.thoughtcrime.securesms.util.GroupUtil;
import org.whispersystems.jobqueue.JobParameters;
@@ -90,7 +89,7 @@ public class PushGroupSendJob extends PushSendJob implements InjectableType {
database.markAsSent(messageId);
markAttachmentsUploaded(messageId, message.getAttachments());
- if (message.getExpiresIn() > 0) {
+ if (message.getExpiresIn() > 0 && !message.isExpirationUpdate()) {
database.markExpireStarted(messageId);
ApplicationContext.getInstance(context)
.getExpiringMessageManager()