From e45eabc714124106d30a771b1a10aa359829a132 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 18 Apr 2025 09:32:33 -0400
Subject: [PATCH] Convert avatar migration to just be a force push.

---
 .../AvatarColorStorageServiceMigrationJob.kt  | 31 ++-----------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/AvatarColorStorageServiceMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/AvatarColorStorageServiceMigrationJob.kt
index d775d68abe..fe2a315fad 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/AvatarColorStorageServiceMigrationJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/AvatarColorStorageServiceMigrationJob.kt
@@ -1,20 +1,11 @@
 package org.thoughtcrime.securesms.migrations
 
 import org.signal.core.util.logging.Log
-import org.signal.core.util.requireLong
-import org.signal.core.util.select
-import org.signal.core.util.withinTransaction
-import org.thoughtcrime.securesms.database.RecipientTable
-import org.thoughtcrime.securesms.database.RecipientTable.Companion.ID
-import org.thoughtcrime.securesms.database.RecipientTable.Companion.STORAGE_SERVICE_ID
-import org.thoughtcrime.securesms.database.RecipientTable.Companion.TABLE_NAME
-import org.thoughtcrime.securesms.database.RecipientTable.Companion.TYPE
-import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
+import org.thoughtcrime.securesms.jobs.StorageForcePushJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.storage.StorageSyncHelper
 
 /**
  * A job that marks all contacts and groups as needing to be synced, so that we'll update the
@@ -42,27 +33,11 @@ internal class AvatarColorStorageServiceMigrationJob(
       return
     }
 
-    SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
-    SignalDatabase.recipients.markAllContactsAndGroupsAsNeedsSync()
-    StorageSyncHelper.scheduleSyncForDataChange()
+    AppDependencies.jobManager.add(StorageForcePushJob())
   }
 
   override fun shouldRetry(e: Exception): Boolean = false
 
-  private fun RecipientTable.markAllContactsAndGroupsAsNeedsSync() {
-    writableDatabase.withinTransaction { db ->
-      db.select(ID)
-        .from(TABLE_NAME)
-        .where("$STORAGE_SERVICE_ID NOT NULL AND $TYPE IN (${RecipientTable.RecipientType.INDIVIDUAL.id}, ${RecipientTable.RecipientType.GV2.id})")
-        .run()
-        .use { cursor ->
-          while (cursor.moveToNext()) {
-            rotateStorageId(RecipientId.from(cursor.requireLong(ID)))
-          }
-        }
-    }
-  }
-
   class Factory : Job.Factory<AvatarColorStorageServiceMigrationJob> {
     override fun create(parameters: Parameters, serializedData: ByteArray?): AvatarColorStorageServiceMigrationJob {
       return AvatarColorStorageServiceMigrationJob(parameters)