From 0b27c42e890cd5c53f585a6fe659892146424b6e Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 27 Oct 2025 11:46:40 -0400
Subject: [PATCH] Update archive processors with consistent naming scheme.

---
 .../securesms/backup/v2/BackupRepository.kt          | 12 ++++++------
 ...derProcessor.kt => ChatFolderArchiveProcessor.kt} |  4 ++--
 ...sor.kt => NotificationProfileArchiveProcessor.kt} |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/{ChatFolderProcessor.kt => ChatFolderArchiveProcessor.kt} (98%)
 rename app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/{NotificationProfileProcessor.kt => NotificationProfileArchiveProcessor.kt} (98%)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
index fe4349c86f..75d91d0857 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
@@ -65,9 +65,9 @@ import org.thoughtcrime.securesms.backup.v2.importer.ChatItemArchiveImporter
 import org.thoughtcrime.securesms.backup.v2.processor.AccountDataArchiveProcessor
 import org.thoughtcrime.securesms.backup.v2.processor.AdHocCallArchiveProcessor
 import org.thoughtcrime.securesms.backup.v2.processor.ChatArchiveProcessor
-import org.thoughtcrime.securesms.backup.v2.processor.ChatFolderProcessor
+import org.thoughtcrime.securesms.backup.v2.processor.ChatFolderArchiveProcessor
 import org.thoughtcrime.securesms.backup.v2.processor.ChatItemArchiveProcessor
-import org.thoughtcrime.securesms.backup.v2.processor.NotificationProfileProcessor
+import org.thoughtcrime.securesms.backup.v2.processor.NotificationProfileArchiveProcessor
 import org.thoughtcrime.securesms.backup.v2.processor.RecipientArchiveProcessor
 import org.thoughtcrime.securesms.backup.v2.processor.StickerArchiveProcessor
 import org.thoughtcrime.securesms.backup.v2.proto.BackupDebugInfo
@@ -1035,7 +1035,7 @@ object BackupRepository {
           }
 
           progressEmitter?.onNotificationProfile()
-          NotificationProfileProcessor.export(dbSnapshot, exportState) { frame ->
+          NotificationProfileArchiveProcessor.export(dbSnapshot, exportState) { frame ->
             writer.write(frame)
             extraFrameOperation?.invoke(frame)
             eventTimer.emit("notification-profile")
@@ -1047,7 +1047,7 @@ object BackupRepository {
           }
 
           progressEmitter?.onChatFolder()
-          ChatFolderProcessor.export(dbSnapshot, exportState) { frame ->
+          ChatFolderArchiveProcessor.export(dbSnapshot, exportState) { frame ->
             writer.write(frame)
             extraFrameOperation?.invoke(frame)
             eventTimer.emit("chat-folder")
@@ -1338,13 +1338,13 @@ object BackupRepository {
           }
 
           frame.notificationProfile != null -> {
-            NotificationProfileProcessor.import(frame.notificationProfile, importState)
+            NotificationProfileArchiveProcessor.import(frame.notificationProfile, importState)
             eventTimer.emit("notification-profile")
             frameCount++
           }
 
           frame.chatFolder != null -> {
-            ChatFolderProcessor.import(frame.chatFolder, importState)
+            ChatFolderArchiveProcessor.import(frame.chatFolder, importState)
             eventTimer.emit("chat-folder")
             frameCount++
           }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatFolderProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatFolderArchiveProcessor.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatFolderProcessor.kt
rename to app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatFolderArchiveProcessor.kt
index a5fa9c6767..3ac28902b1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatFolderProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatFolderArchiveProcessor.kt
@@ -29,9 +29,9 @@ import org.thoughtcrime.securesms.backup.v2.proto.ChatFolder as ChatFolderProto
 /**
  * Handles exporting and importing [ChatFolderRecord]s.
  */
-object ChatFolderProcessor {
+object ChatFolderArchiveProcessor {
 
-  private val TAG = Log.tag(ChatFolderProcessor::class)
+  private val TAG = Log.tag(ChatFolderArchiveProcessor::class)
 
   fun export(db: SignalDatabase, exportState: ExportState, emitter: BackupFrameEmitter) {
     val folders = db
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/NotificationProfileProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/NotificationProfileArchiveProcessor.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/NotificationProfileProcessor.kt
rename to app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/NotificationProfileArchiveProcessor.kt
index 3917029a06..6de052c9ee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/NotificationProfileProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/NotificationProfileArchiveProcessor.kt
@@ -31,9 +31,9 @@ import org.thoughtcrime.securesms.backup.v2.proto.NotificationProfile as Notific
 /**
  * Handles exporting and importing [NotificationProfile] models.
  */
-object NotificationProfileProcessor {
+object NotificationProfileArchiveProcessor {
 
-  private val TAG = Log.tag(NotificationProfileProcessor::class)
+  private val TAG = Log.tag(NotificationProfileArchiveProcessor::class)
 
   fun export(db: SignalDatabase, exportState: ExportState, emitter: BackupFrameEmitter) {
     db.notificationProfileTables