Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-25 12:17:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Retry deletion job on verification failure.

Browse Source
This commit is contained in:
Alex Hart
2025-07-31 13:11:36 -03:00
committed by GitHub
parent b37bbcaaa5
commit bdeb5aa96a
1 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/org/thoughtcrime/securesms/jobs/BackupDeleteJob.kt
View File

@@ -52,6 +52,16 @@ class BackupDeleteJob private constructor(
override fun getFactoryKey(): String = KEY
override fun run(): Result {
val result = doRun()
if (result.isFailure) {
clearLocalBackupStateOnFailure()
}
return result
}
private fun doRun(): Result {
if (SignalStore.backup.deletionState.isIdle()) {
Log.w(TAG, "Invalid state ${SignalStore.backup.deletionState}. Exiting.")
return Result.failure()
@@ -212,7 +222,7 @@ class BackupDeleteJob private constructor(
private fun deleteLocalState(): Result {
if (backupDeleteJobData.completed.contains(BackupDeleteJobData.Stage.CLEAR_LOCAL_STATE)) {
Log.d(TAG, "Already deleted messages.")
Log.d(TAG, "Already cleared local backup state.")
return Result.success()
}
@@ -232,13 +242,27 @@ class BackupDeleteJob private constructor(
).build()
Log.d(TAG, "Clearing local backup state.")
clearLocalBackupState()
addStageToCompletions(BackupDeleteJobData.Stage.CLEAR_LOCAL_STATE)
return Result.success()
}
private fun clearLocalBackupStateOnFailure() {
if (backupDeleteJobData.completed.contains(BackupDeleteJobData.Stage.CLEAR_LOCAL_STATE)) {
Log.d(TAG, "[onFailure] Already cleared local backup state.")
return
}
Log.d(TAG, "[onFailure] Clearing local backup state.")
clearLocalBackupState()
}
private fun clearLocalBackupState() {
SignalStore.backup.disableBackups()
SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
StorageSyncHelper.scheduleSyncForDataChange()
SignalDatabase.attachments.clearAllArchiveData()
SignalStore.backup.optimizeStorage = false
addStageToCompletions(BackupDeleteJobData.Stage.CLEAR_LOCAL_STATE)
return Result.success()
}
private fun addStageToCompletions(stage: BackupDeleteJobData.Stage) {
@@ -250,6 +274,11 @@ class BackupDeleteJob private constructor(
private fun <T> handleNetworkError(networkResult: NetworkResult<T>): Result {
Log.d(TAG, "An error occurred.", networkResult.getCause())
if (networkResult.getCause() is org.signal.libsignal.zkgroup.VerificationFailedException) {
Log.i(TAG, "ZK Verification failed. Retrying.")
return Result.retry(defaultBackoff())
}
return when (networkResult) {
is NetworkResult.ApplicationError<*> -> (networkResult.getCause() as? RuntimeException)?.let { Result.fatalFailure(it) } ?: Result.failure()
is NetworkResult.NetworkError<*> -> Result.retry(defaultBackoff())