From 021fd165401356745b4cd992584d22d7359db48a Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Tue, 18 Feb 2025 10:43:25 -0500 Subject: [PATCH] Fix missing self-avatar during account restore. --- .../thoughtcrime/securesms/jobs/StorageAccountRestoreJob.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageAccountRestoreJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageAccountRestoreJob.kt index 54b6b1bf83..c20e38ea22 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageAccountRestoreJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageAccountRestoreJob.kt @@ -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()}")