Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-08-05 04:45:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash with unknown sticker packs.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-07-28 12:22:56 -04:00
parent 5c0fbdc8b5
commit 5f9b9d2d3a
1 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.kt
+24 -27
View File
@@ -374,6 +374,30 @@ class StorageSyncJob private constructor(parameters: Parameters, private var loc
return false
}
val knownTypes = getKnownTypes()
val knownUnknownIds = SignalDatabase.unknownStorageIds.getAllWithTypes(knownTypes)
if (knownUnknownIds.isNotEmpty()) {
Log.i(TAG, "We have ${knownUnknownIds.size} unknown records that we can now process.")
val remote = when (val result = repository.readStorageRecords(storageServiceKey, remoteManifest.recordIkm, knownUnknownIds)) {
is StorageServiceService.StorageRecordResult.Success -> result.records
is StorageServiceService.StorageRecordResult.DecryptionError -> throw result.exception
is StorageServiceService.StorageRecordResult.NetworkError -> throw result.exception
is StorageServiceService.StorageRecordResult.StatusCodeError -> throw result.exception
}
val records = StorageRecordCollection(remote)
Log.i(TAG, "Found ${remote.size} of the known-unknowns remotely.")
db.withinTransaction {
processKnownRecords(context, records)
SignalDatabase.unknownStorageIds.deleteAllWithTypes(knownTypes)
}
}
stopwatch.split("known-unknowns")
val remoteWriteOperation: WriteOperationResult = db.withinTransaction {
self = freshSelf()
@@ -433,33 +457,6 @@ class StorageSyncJob private constructor(parameters: Parameters, private var loc
Log.i(TAG, "No remote writes needed. Still at version: " + remoteManifest.versionString)
}
val knownTypes = getKnownTypes()
val knownUnknownIds = SignalDatabase.unknownStorageIds.getAllWithTypes(knownTypes)
if (knownUnknownIds.isNotEmpty()) {
Log.i(TAG, "We have ${knownUnknownIds.size} unknown records that we can now process.")
val remote = when (val result = repository.readStorageRecords(storageServiceKey, remoteManifest.recordIkm, knownUnknownIds)) {
is StorageServiceService.StorageRecordResult.Success -> result.records
is StorageServiceService.StorageRecordResult.DecryptionError -> throw result.exception
is StorageServiceService.StorageRecordResult.NetworkError -> throw result.exception
is StorageServiceService.StorageRecordResult.StatusCodeError -> throw result.exception
}
val records = StorageRecordCollection(remote)
Log.i(TAG, "Found ${remote.size} of the known-unknowns remotely.")
db.withinTransaction {
processKnownRecords(context, records)
SignalDatabase.unknownStorageIds.deleteAllWithTypes(knownTypes)
}
Log.i(TAG, "Enqueueing a storage sync job to handle any possible merges after applying unknown records.")
AppDependencies.jobManager.add(StorageSyncJob.forLocalChange())
}
stopwatch.split("known-unknowns")
if (needsForcePush && SignalStore.account.isPrimaryDevice) {
Log.w(TAG, "Scheduling a force push.")
AppDependencies.jobManager.add(StorageForcePushJob())