From fb600e98291951efbab37ee6033624db67ffa78b Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Fri, 5 Jun 2020 13:46:25 -0400 Subject: [PATCH] Update SMS/MMS as sending when retrying failed send. This was only impacting SMS/MMS as Push already reset the status. --- .../java/org/thoughtcrime/securesms/jobs/MmsSendJob.java | 5 +++++ .../java/org/thoughtcrime/securesms/jobs/SmsSendJob.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java index 4bcf5a185..f225462c0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java @@ -113,6 +113,11 @@ public final class MmsSendJob extends SendJob { return KEY; } + @Override + public void onAdded() { + DatabaseFactory.getMmsDatabase(context).markAsSending(messageId); + } + @Override public void onSend() throws MmsException, NoSuchMessageException, IOException { MmsDatabase database = DatabaseFactory.getMmsDatabase(context); diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java index 4b91a482e..2a962b050 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java @@ -65,6 +65,11 @@ public class SmsSendJob extends SendJob { return KEY; } + @Override + public void onAdded() { + DatabaseFactory.getSmsDatabase(context).markAsSending(messageId); + } + @Override public void onSend() throws NoSuchMessageException, TooManyRetriesException { if (runAttempt >= MAX_ATTEMPTS) {