From e391ad8edd3bd8515f8c19db7697c5a4bda26d8b Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Mon, 31 Aug 2020 10:47:39 +1000 Subject: [PATCH 1/2] Fix attachment upload retrying --- .../thoughtcrime/securesms/jobs/AttachmentUploadJob.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java b/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java index 766e8f20f6..72a83a47a7 100644 --- a/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java +++ b/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java @@ -27,6 +27,7 @@ import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.messages.SignalServiceAttachment; import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer; import org.whispersystems.signalservice.api.push.SignalServiceAddress; +import org.whispersystems.signalservice.loki.api.utilities.HTTP; import java.io.IOException; import java.io.InputStream; @@ -52,7 +53,7 @@ public class AttachmentUploadJob extends BaseJob implements InjectableType { this(new Job.Parameters.Builder() .addConstraint(NetworkConstraint.KEY) .setLifespan(TimeUnit.DAYS.toMillis(1)) - .setMaxAttempts(5) + .setMaxAttempts(10) .build(), attachmentId, destination); } @@ -102,7 +103,8 @@ public class AttachmentUploadJob extends BaseJob implements InjectableType { @Override protected boolean onShouldRetry(@NonNull Exception exception) { - return exception instanceof IOException; + return exception instanceof IOException || + exception instanceof HTTP.HTTPRequestFailedException; } private SignalServiceAttachment getAttachmentFor(Attachment attachment) { From 967b621615bdc62a2f67cd249185f76a98680aec Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Mon, 31 Aug 2020 11:22:38 +1000 Subject: [PATCH 2/2] Update version number --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 35037ee020..137160529e 100644 --- a/build.gradle +++ b/build.gradle @@ -185,8 +185,8 @@ dependencies { implementation "com.opencsv:opencsv:4.6" } -def canonicalVersionCode = 74 -def canonicalVersionName = "1.4.5" +def canonicalVersionCode = 75 +def canonicalVersionName = "1.4.6" def postFixSize = 10 def abiPostFix = ['armeabi-v7a' : 1,