empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix error handling for resumable uploads to cdn3.

Browse source
This commit is contained in:
Cody Henthorne 2024-06-05 15:07:21 -04:00
parent 220d3877a2
commit 7402959ac6
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.kt
View file

@ -32,6 +32,7 @@ import org.whispersystems.signalservice.api.crypto.AttachmentCipherStreamUtil
import org.whispersystems.signalservice.api.messages.SignalServiceAttachment import org.whispersystems.signalservice.api.messages.SignalServiceAttachment
import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream
import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResumableUploadResponseCodeException import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResumableUploadResponseCodeException
import org.whispersystems.signalservice.api.push.exceptions.ResumeLocationInvalidException
import org.whispersystems.signalservice.internal.crypto.PaddingInputStream import org.whispersystems.signalservice.internal.crypto.PaddingInputStream
import java.io.IOException import java.io.IOException
import java.util.Optional import java.util.Optional
@ -167,6 +168,11 @@ class AttachmentUploadJob private constructor(
uploadSpec = null uploadSpec = null
} }
throw e
} catch (e: ResumeLocationInvalidException) {
Log.w(TAG, "Resume location invalid. Clearing upload spec.", e)
uploadSpec = null
throw e throw e
} }
} }

6
libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
View file

@ -2027,11 +2027,9 @@ public class PushServiceSocket {
try (Response response = call.execute()) { try (Response response = call.execute()) {
if (response.isSuccessful()) { if (response.isSuccessful()) {
offset = Long.parseLong(response.header("Upload-Offset")); offset = Long.parseLong(Objects.requireNonNull(response.header("Upload-Offset")));
} else if (response.code() >= 400 || response.code() < 500) {
throw new ResumeLocationInvalidException("Response: " + response);
} else { } else {
throw new NonSuccessfulResumableUploadResponseCodeException(response.code(), "Response: " + response); throw new ResumeLocationInvalidException("Response: " + response);
} }
} catch (PushNetworkException | NonSuccessfulResponseCodeException e) { } catch (PushNetworkException | NonSuccessfulResponseCodeException e) {
throw e; throw e;