Fix timer update group notification expiry

Closes #5727
// FREEBIE
fork-5.53.8
Christian Ascheberg 2016-09-28 20:39:01 +02:00 zatwierdzone przez Moxie Marlinspike
rodzic 68b48ebe00
commit 314dd9181c
1 zmienionych plików z 1 dodań i 2 usunięć

Wyświetl plik

@ -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()