From 427119cef295dc6948dfd79ae8a5686eec8c8dc8 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 26 Jul 2021 10:40:55 -0400
Subject: [PATCH] Do not backup the avatar picker database.

---
 .../org/thoughtcrime/securesms/backup/FullBackupExporter.java | 4 +++-
 .../securesms/database/model/AvatarPickerDatabase.kt          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
index 941373c45..81ad11f5c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
@@ -38,6 +38,7 @@ import org.thoughtcrime.securesms.database.SessionDatabase;
 import org.thoughtcrime.securesms.database.SignedPreKeyDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.StickerDatabase;
+import org.thoughtcrime.securesms.database.model.AvatarPickerDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -84,7 +85,8 @@ public class FullBackupExporter extends FullBackupBase {
     EmojiSearchDatabase.TABLE_NAME,
     SenderKeyDatabase.TABLE_NAME,
     SenderKeySharedDatabase.TABLE_NAME,
-    PendingRetryReceiptDatabase.TABLE_NAME
+    PendingRetryReceiptDatabase.TABLE_NAME,
+    AvatarPickerDatabase.TABLE_NAME
   );
 
   public static void export(@NonNull Context context,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/AvatarPickerDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/model/AvatarPickerDatabase.kt
index d284de23e..0fae6b4c4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/AvatarPickerDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/AvatarPickerDatabase.kt
@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.util.SqlUtil
 class AvatarPickerDatabase(context: Context, databaseHelper: SQLCipherOpenHelper) : Database(context, databaseHelper) {
 
   companion object {
-    private const val TABLE_NAME = "avatar_picker"
+    const val TABLE_NAME = "avatar_picker"
     private const val ID = "_id"
     private const val LAST_USED = "last_used"
     private const val GROUP_ID = "group_id"