From 504a70f3ee3e01f18411700df97cbc2687374e7f Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Thu, 3 Jun 2021 10:08:39 -0400 Subject: [PATCH] Skip emoji search data in backup/restore. --- .../org/thoughtcrime/securesms/backup/FullBackupExporter.java | 4 +++- .../org/thoughtcrime/securesms/backup/FullBackupImporter.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 2ce94eddea..6eee7657eb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java @@ -24,6 +24,7 @@ import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream; import org.thoughtcrime.securesms.crypto.IdentityKeyUtil; import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream; import org.thoughtcrime.securesms.database.AttachmentDatabase; +import org.thoughtcrime.securesms.database.EmojiSearchDatabase; import org.thoughtcrime.securesms.database.GroupReceiptDatabase; import org.thoughtcrime.securesms.database.KeyValueDatabase; import org.thoughtcrime.securesms.database.MmsDatabase; @@ -75,7 +76,8 @@ public class FullBackupExporter extends FullBackupBase { OneTimePreKeyDatabase.TABLE_NAME, SessionDatabase.TABLE_NAME, SearchDatabase.SMS_FTS_TABLE_NAME, - SearchDatabase.MMS_FTS_TABLE_NAME + SearchDatabase.MMS_FTS_TABLE_NAME, + EmojiSearchDatabase.TABLE_NAME ); public static void export(@NonNull Context context, diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java index b24d56e857..42ef62cd70 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java @@ -26,6 +26,7 @@ import org.thoughtcrime.securesms.backup.BackupProtos.Sticker; import org.thoughtcrime.securesms.crypto.AttachmentSecret; import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream; import org.thoughtcrime.securesms.database.AttachmentDatabase; +import org.thoughtcrime.securesms.database.EmojiSearchDatabase; import org.thoughtcrime.securesms.database.KeyValueDatabase; import org.thoughtcrime.securesms.database.SearchDatabase; import org.thoughtcrime.securesms.database.StickerDatabase; @@ -136,6 +137,7 @@ public class FullBackupImporter extends FullBackupBase { private static void processStatement(@NonNull SQLiteDatabase db, SqlStatement statement) { boolean isForSmsFtsSecretTable = statement.getStatement().contains(SearchDatabase.SMS_FTS_TABLE_NAME + "_"); boolean isForMmsFtsSecretTable = statement.getStatement().contains(SearchDatabase.MMS_FTS_TABLE_NAME + "_"); + boolean isForEmojiSecretTable = statement.getStatement().contains(EmojiSearchDatabase.TABLE_NAME); boolean isForSqliteSecretTable = statement.getStatement().toLowerCase().startsWith("create table sqlite_"); if (isForSmsFtsSecretTable || isForMmsFtsSecretTable || isForSqliteSecretTable) {