From 877c03e6a1a5c79717fe078f7593077e79e61c66 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 10 May 2021 11:18:45 -0400
Subject: [PATCH] Fix issue where bulk-archive wasn't triggering a storage
 sync.

Also took the opportunity to consolidate our archive code to reduce
duplication.
---
 .../securesms/database/ThreadDatabase.java    | 60 ++-----------------
 1 file changed, 6 insertions(+), 54 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
index 8e197d3c26..a104b7eeb0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -605,35 +605,6 @@ public class ThreadDatabase extends Database {
     return false;
   }
 
-  public void setArchived(@NonNull RecipientId recipientId, boolean status) {
-    setArchived(Collections.singletonMap(recipientId, status));
-  }
-
-  public void setArchived(@NonNull Map<RecipientId, Boolean> status) {
-    SQLiteDatabase db    = databaseHelper.getReadableDatabase();
-
-    db.beginTransaction();
-    try {
-      String query = RECIPIENT_ID + " = ?";
-
-      for (Map.Entry<RecipientId, Boolean> entry : status.entrySet()) {
-        ContentValues values   = new ContentValues(2);
-
-        if (entry.getValue()) {
-          values.put(PINNED, "0");
-        }
-
-        values.put(ARCHIVED, entry.getValue() ? "1" : "0");
-        db.update(TABLE_NAME, values, query, new String[] { entry.getKey().serialize() });
-      }
-
-      db.setTransactionSuccessful();
-    } finally {
-      db.endTransaction();
-      notifyConversationListListeners();
-    }
-  }
-
   public void setArchived(Set<Long> threadIds, boolean archive) {
     SQLiteDatabase db = databaseHelper.getReadableDatabase();
 
@@ -650,10 +621,14 @@ public class ThreadDatabase extends Database {
         db.update(TABLE_NAME, values, ID_WHERE, SqlUtil.buildArgs(threadId));
       }
 
+      List<RecipientId> recipientIds = getRecipientIdsForThreadIds(threadIds);
+      DatabaseFactory.getRecipientDatabase(context).markNeedsSync(recipientIds);
+
       db.setTransactionSuccessful();
     } finally {
       db.endTransaction();
       notifyConversationListListeners();
+      StorageSyncHelper.scheduleSyncForDataChange();
     }
   }
 
@@ -874,34 +849,11 @@ public class ThreadDatabase extends Database {
   }
 
   public void archiveConversation(long threadId) {
-    SQLiteDatabase db            = databaseHelper.getWritableDatabase();
-    ContentValues  contentValues = new ContentValues(1);
-    contentValues.put(PINNED, 0);
-    contentValues.put(ARCHIVED, 1);
-
-    db.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {threadId + ""});
-    notifyConversationListListeners();
-
-    Recipient recipient = getRecipientForThreadId(threadId);
-    if (recipient != null) {
-      DatabaseFactory.getRecipientDatabase(context).markNeedsSync(recipient.getId());
-      StorageSyncHelper.scheduleSyncForDataChange();
-    }
+    setArchived(Collections.singleton(threadId), true);
   }
 
   public void unarchiveConversation(long threadId) {
-    SQLiteDatabase db            = databaseHelper.getWritableDatabase();
-    ContentValues  contentValues = new ContentValues(1);
-    contentValues.put(ARCHIVED, 0);
-
-    db.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {threadId + ""});
-    notifyConversationListListeners();
-
-    Recipient recipient = getRecipientForThreadId(threadId);
-    if (recipient != null) {
-      DatabaseFactory.getRecipientDatabase(context).markNeedsSync(recipient.getId());
-      StorageSyncHelper.scheduleSyncForDataChange();
-    }
+    setArchived(Collections.singleton(threadId), false);
   }
 
   public void setLastSeen(long threadId) {