From 3da2fc4d9b7faccd63aa65148a1f90eb5872972d Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 31 Mar 2022 17:46:27 -0300 Subject: [PATCH] Clear storage keys for deleted distribution lists. --- .../database/helpers/SignalDatabaseMigrations.kt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt index d841f77b9a..168cc990cf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt @@ -196,8 +196,9 @@ object SignalDatabaseMigrations { private const val MMS_COUNT_INDEX = 135 private const val STORY_SENDS = 136 private const val STORY_TYPE_AND_DISTRIBUTION = 137 + private const val CLEAN_DELETED_DISTRIBUTION_LISTS = 138 - const val DATABASE_VERSION = 137 + const val DATABASE_VERSION = 138 @JvmStatic fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { @@ -2524,6 +2525,16 @@ object SignalDatabaseMigrations { """.trimIndent() ) } + + if (oldVersion < CLEAN_DELETED_DISTRIBUTION_LISTS) { + db.execSQL( + """ + UPDATE recipient + SET storage_service_key = NULL + WHERE distribution_list_id IS NOT NULL AND NOT EXISTS(SELECT _id from distribution_list WHERE _id = distribution_list_id) + """.trimIndent() + ) + } } @JvmStatic