From 7320a662731de5d8358bd590fca21fba980f5d70 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 20 Dec 2024 21:34:59 -0500 Subject: [PATCH] Ensure that the V262 database migration runs. --- .../securesms/database/InAppPaymentSubscriberTable.kt | 6 ++++-- .../securesms/database/helpers/SignalDatabaseMigrations.kt | 7 ++++--- ...uild.kt => V263_InAppPaymentsSubscriberTableRebuild.kt} | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) rename app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/{V262_InAppPaymentsSubscriberTableRebuild.kt => V263_InAppPaymentsSubscriberTableRebuild.kt} (97%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentSubscriberTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentSubscriberTable.kt index c939c405a6..4fef902373 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentSubscriberTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentSubscriberTable.kt @@ -146,7 +146,8 @@ class InAppPaymentSubscriberTable( * Retrieves a subscriber for the given type by the currency code. */ fun getByCurrencyCode(currencyCode: String): InAppPaymentSubscriberRecord? { - return readableDatabase.select() + return readableDatabase + .select() .from(TABLE_NAME) .where("$CURRENCY_CODE = ?", currencyCode.uppercase()) .run() @@ -157,7 +158,8 @@ class InAppPaymentSubscriberTable( * Retrieves a subscriber by SubscriberId */ fun getBySubscriberId(subscriberId: SubscriberId): InAppPaymentSubscriberRecord? { - return readableDatabase.select() + return readableDatabase + .select() .from(TABLE_NAME) .where("$SUBSCRIBER_ID = ?", subscriberId.serialize()) .run() 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 7bdb3c7a34..0389a700f7 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 @@ -118,7 +118,7 @@ import org.thoughtcrime.securesms.database.helpers.migration.V258_FixGroupRevoke import org.thoughtcrime.securesms.database.helpers.migration.V259_AdjustNotificationProfileMidnightEndTimes import org.thoughtcrime.securesms.database.helpers.migration.V260_RemapQuoteAuthors import org.thoughtcrime.securesms.database.helpers.migration.V261_RemapCallRingers -import org.thoughtcrime.securesms.database.helpers.migration.V262_InAppPaymentsSubscriberTableRebuild +import org.thoughtcrime.securesms.database.helpers.migration.V263_InAppPaymentsSubscriberTableRebuild /** * Contains all of the database migrations for [SignalDatabase]. Broken into a separate file for cleanliness. @@ -240,10 +240,11 @@ object SignalDatabaseMigrations { 259 to V259_AdjustNotificationProfileMidnightEndTimes, 260 to V260_RemapQuoteAuthors, 261 to V261_RemapCallRingers, - 261 to V262_InAppPaymentsSubscriberTableRebuild + // V263 was originally V262, but a typo in the version mapping caused it not to be run. + 263 to V263_InAppPaymentsSubscriberTableRebuild ) - const val DATABASE_VERSION = 262 + const val DATABASE_VERSION = 263 @JvmStatic fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V262_InAppPaymentsSubscriberTableRebuild.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V263_InAppPaymentsSubscriberTableRebuild.kt similarity index 97% rename from app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V262_InAppPaymentsSubscriberTableRebuild.kt rename to app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V263_InAppPaymentsSubscriberTableRebuild.kt index 81fae4ec59..3afe873f44 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V262_InAppPaymentsSubscriberTableRebuild.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V263_InAppPaymentsSubscriberTableRebuild.kt @@ -12,7 +12,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase * Adds IAP fields and updates constraints. */ @Suppress("ClassName") -object V262_InAppPaymentsSubscriberTableRebuild : SignalDatabaseMigration { +object V263_InAppPaymentsSubscriberTableRebuild : SignalDatabaseMigration { private const val DONOR_TYPE = 0 private const val BACKUP_TYPE = 1