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

Fix 404 handling in StorageForcePushJob.

Browse source
This commit is contained in:
Greyson Parrelli 2025-01-23 10:22:20 -05:00
parent 04c903c4c4
commit 249dd7a1e7
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.kt
View file

@ -1,6 +1,7 @@
package org.thoughtcrime.securesms.jobs package org.thoughtcrime.securesms.jobs
import org.signal.core.util.logging.Log import org.signal.core.util.logging.Log
import org.signal.core.util.logging.logI
import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.jobmanager.Job import org.thoughtcrime.securesms.jobmanager.Job
@ -66,11 +67,16 @@ class StorageForcePushJob private constructor(parameters: Parameters) : BaseJob(
val storageServiceKey = SignalStore.storageService.storageKey val storageServiceKey = SignalStore.storageService.storageKey
val repository = StorageServiceRepository(AppDependencies.storageServiceApi) val repository = StorageServiceRepository(AppDependencies.storageServiceApi)
val currentVersion = when (val result = repository.getManifestVersion()) { val currentVersion: Long = when (val result = repository.getManifestVersion()) {
is NetworkResult.Success -> result.result is NetworkResult.Success -> result.result
is NetworkResult.ApplicationError -> throw result.throwable is NetworkResult.ApplicationError -> throw result.throwable
is NetworkResult.NetworkError -> throw result.exception is NetworkResult.NetworkError -> throw result.exception
is NetworkResult.StatusCodeError -> throw result.exception is NetworkResult.StatusCodeError -> {
when (result.code) {
404 -> 0L.logI(TAG, "No manifest found, defaulting to version 0.")
else -> throw result.exception
}
}
} }
val oldContactStorageIds: Map<RecipientId, StorageId> = SignalDatabase.recipients.getContactStorageSyncIdsMap() val oldContactStorageIds: Map<RecipientId, StorageId> = SignalDatabase.recipients.getContactStorageSyncIdsMap()