From d6316d955f57851049ce963efa7dda377b87b335 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Tue, 11 Mar 2025 07:57:49 -0400 Subject: [PATCH] Remove unusued NetworkFailureException. --- .../securesms/jobs/RefreshAttributesJob.java | 6 +-- .../securesms/jobs/SyncArchivedMediaJob.kt | 12 +++-- .../exceptions/EncapsulatedExceptions.java | 47 ------------------- .../exceptions/NetworkFailureException.java | 21 --------- 4 files changed, 10 insertions(+), 76 deletions(-) delete mode 100644 libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/EncapsulatedExceptions.java delete mode 100644 libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NetworkFailureException.java diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java index 42ca686b63..e2477eb42b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java @@ -9,7 +9,6 @@ import org.signal.core.util.Base64; import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.AppCapabilities; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; -import org.thoughtcrime.securesms.dependencies.AppDependencies; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.JsonJobData; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; @@ -19,12 +18,11 @@ import org.thoughtcrime.securesms.keyvalue.SvrValues; import org.thoughtcrime.securesms.net.SignalNetwork; import org.thoughtcrime.securesms.registration.data.RegistrationRepository; import org.thoughtcrime.securesms.registration.secondary.DeviceNameCipher; -import org.thoughtcrime.securesms.util.RemoteConfig; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.whispersystems.signalservice.api.NetworkResultUtil; import org.whispersystems.signalservice.api.account.AccountAttributes; import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess; -import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException; +import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -134,7 +132,7 @@ public class RefreshAttributesJob extends BaseJob { @Override public boolean onShouldRetry(@NonNull Exception e) { - return e instanceof NetworkFailureException; + return e instanceof IOException && !(e instanceof NonSuccessfulResponseCodeException); } @Override diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SyncArchivedMediaJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/SyncArchivedMediaJob.kt index a32b4e39a9..fd4bf13e46 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SyncArchivedMediaJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SyncArchivedMediaJob.kt @@ -13,8 +13,10 @@ import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.jobmanager.Job import org.thoughtcrime.securesms.jobmanager.JsonJobData import org.thoughtcrime.securesms.keyvalue.SignalStore +import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.archive.ArchiveGetMediaItemsResponse -import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException +import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException +import java.io.IOException import java.lang.Exception /** @@ -63,8 +65,10 @@ class SyncArchivedMediaJob private constructor( attachmentsToDelete += syncPage(archivedItemPage) cursor = archivedItemPage.cursor if (attachmentsToDelete.size >= batchSize) { - BackupRepository.deleteAbandonedMediaObjects(attachmentsToDelete) - Log.i(TAG, "Deleted ${attachmentsToDelete.size} attachments off CDN") + when (val result = BackupRepository.deleteAbandonedMediaObjects(attachmentsToDelete)) { + is NetworkResult.Success -> Log.i(TAG, "Deleted ${attachmentsToDelete.size} attachments off CDN") + else -> Log.w(TAG, "Failed to delete attachments from CDN", result.getCause()) + } attachmentsToDelete.clear() } if (attachmentsToDelete.isEmpty()) { @@ -97,7 +101,7 @@ class SyncArchivedMediaJob private constructor( } override fun onShouldRetry(e: Exception): Boolean { - return e is NetworkFailureException + return e is IOException && e !is NonSuccessfulResponseCodeException } class Factory : Job.Factory { diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/EncapsulatedExceptions.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/EncapsulatedExceptions.java deleted file mode 100644 index 7e76a03eca..0000000000 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/EncapsulatedExceptions.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright (C) 2014-2016 Open Whisper Systems - * - * Licensed according to the LICENSE file in this repository. - */ -package org.whispersystems.signalservice.api.push.exceptions; - -import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; - -import java.util.LinkedList; -import java.util.List; - -public class EncapsulatedExceptions extends Throwable { - - private final List untrustedIdentityExceptions; - private final List unregisteredUserExceptions; - private final List networkExceptions; - - public EncapsulatedExceptions(List untrustedIdentities, - List unregisteredUsers, - List networkExceptions) - { - this.untrustedIdentityExceptions = untrustedIdentities; - this.unregisteredUserExceptions = unregisteredUsers; - this.networkExceptions = networkExceptions; - } - - public EncapsulatedExceptions(UntrustedIdentityException e) { - this.untrustedIdentityExceptions = new LinkedList<>(); - this.unregisteredUserExceptions = new LinkedList<>(); - this.networkExceptions = new LinkedList<>(); - - this.untrustedIdentityExceptions.add(e); - } - - public List getUntrustedIdentityExceptions() { - return untrustedIdentityExceptions; - } - - public List getUnregisteredUserExceptions() { - return unregisteredUserExceptions; - } - - public List getNetworkExceptions() { - return networkExceptions; - } -} diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NetworkFailureException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NetworkFailureException.java deleted file mode 100644 index a35072909a..0000000000 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NetworkFailureException.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Copyright (C) 2014-2016 Open Whisper Systems - * - * Licensed according to the LICENSE file in this repository. - */ - -package org.whispersystems.signalservice.api.push.exceptions; - -public class NetworkFailureException extends Exception { - - private final String e164number; - - public NetworkFailureException(String e164number, Exception nested) { - super(nested); - this.e164number = e164number; - } - - public String getE164number() { - return e164number; - } -}