Fix missing self-avatar during account restore.

This commit is contained in:
Cody Henthorne
2025-02-18 10:43:25 -05:00
committed by Greyson Parrelli
parent d3ff6ba3d2
commit 021fd16540

View File

@@ -9,7 +9,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.net.SignalNetwork
import org.thoughtcrime.securesms.profiles.manage.UsernameRepository.reclaimUsernameIfNecessary
import org.thoughtcrime.securesms.recipients.Recipient.Companion.self
import org.thoughtcrime.securesms.storage.StorageSyncHelper.applyAccountStorageSyncUpdates
import org.thoughtcrime.securesms.storage.StorageSyncHelper
import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException
import org.whispersystems.signalservice.api.storage.SignalAccountRecord
import org.whispersystems.signalservice.api.storage.SignalStorageManifest
@@ -111,7 +111,7 @@ class StorageAccountRestoreJob private constructor(parameters: Parameters) : Bas
Log.i(TAG, "Applying changes locally...")
SignalDatabase.rawDatabase.beginTransaction()
try {
applyAccountStorageSyncUpdates(context, self().fresh(), accountRecord, false)
StorageSyncHelper.applyAccountStorageSyncUpdates(context, self().fresh(), accountRecord, false)
SignalDatabase.rawDatabase.setTransactionSuccessful()
} finally {
SignalDatabase.rawDatabase.endTransaction()
@@ -129,7 +129,7 @@ class StorageAccountRestoreJob private constructor(parameters: Parameters) : Bas
if (accountRecord.proto.avatarUrlPath.isNotEmpty()) {
Log.i(TAG, "Fetching avatar...")
val state = AppDependencies.jobManager.runSynchronously(RetrieveProfileAvatarJob(self(), accountRecord.proto.avatarUrlPath), LIFESPAN / 2)
val state = AppDependencies.jobManager.runSynchronously(RetrieveProfileAvatarJob(self(), accountRecord.proto.avatarUrlPath, true), LIFESPAN / 2)
if (state.isPresent) {
Log.i(TAG, "Avatar retrieved successfully. ${state.get()}")