Fix attachment upload retrying

This commit is contained in:
nielsandriesse 2020-08-31 10:47:39 +10:00
parent 4b57114f25
commit e391ad8edd

View File

@ -27,6 +27,7 @@ import org.whispersystems.signalservice.api.SignalServiceMessageSender;
import org.whispersystems.signalservice.api.messages.SignalServiceAttachment; import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer; import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.loki.api.utilities.HTTP;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -52,7 +53,7 @@ public class AttachmentUploadJob extends BaseJob implements InjectableType {
this(new Job.Parameters.Builder() this(new Job.Parameters.Builder()
.addConstraint(NetworkConstraint.KEY) .addConstraint(NetworkConstraint.KEY)
.setLifespan(TimeUnit.DAYS.toMillis(1)) .setLifespan(TimeUnit.DAYS.toMillis(1))
.setMaxAttempts(5) .setMaxAttempts(10)
.build(), .build(),
attachmentId, destination); attachmentId, destination);
} }
@ -102,7 +103,8 @@ public class AttachmentUploadJob extends BaseJob implements InjectableType {
@Override @Override
protected boolean onShouldRetry(@NonNull Exception exception) { protected boolean onShouldRetry(@NonNull Exception exception) {
return exception instanceof IOException; return exception instanceof IOException ||
exception instanceof HTTP.HTTPRequestFailedException;
} }
private SignalServiceAttachment getAttachmentFor(Attachment attachment) { private SignalServiceAttachment getAttachmentFor(Attachment attachment) {