From dee19ed94afac308dc3b5f9c3a0a9010be6528c8 Mon Sep 17 00:00:00 2001 From: Clark Chen Date: Wed, 22 May 2024 18:31:53 -0400 Subject: [PATCH] Fix attachment table v231 migration consistency. --- .../org/thoughtcrime/securesms/database/AttachmentTable.kt | 4 ++-- .../helpers/migration/V231_ArchiveThumbnailColumns.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt index cd6158e13f..7ed5a09994 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt @@ -247,10 +247,10 @@ class AttachmentTable( $ARCHIVE_CDN INTEGER DEFAULT 0, $ARCHIVE_MEDIA_NAME TEXT DEFAULT NULL, $ARCHIVE_MEDIA_ID TEXT DEFAULT NULL, - $ARCHIVE_THUMBNAIL_MEDIA_ID TEXT DEFAULT NULL, - $ARCHIVE_THUMBNAIL_CDN INTEGER DEFAULT 0, $ARCHIVE_TRANSFER_FILE TEXT DEFAULT NULL, $ARCHIVE_TRANSFER_STATE INTEGER DEFAULT ${ArchiveTransferState.NONE.value}, + $ARCHIVE_THUMBNAIL_CDN INTEGER DEFAULT 0, + $ARCHIVE_THUMBNAIL_MEDIA_ID TEXT DEFAULT NULL, $THUMBNAIL_FILE TEXT DEFAULT NULL, $THUMBNAIL_RANDOM BLOB DEFAULT NULL ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V231_ArchiveThumbnailColumns.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V231_ArchiveThumbnailColumns.kt index dda3d63074..68d1776f83 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V231_ArchiveThumbnailColumns.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V231_ArchiveThumbnailColumns.kt @@ -10,9 +10,9 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase object V231_ArchiveThumbnailColumns : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { - db.execSQL("ALTER TABLE attachment ADD COLUMN thumbnail_file TEXT DEFAULT NULL") - db.execSQL("ALTER TABLE attachment ADD COLUMN thumbnail_random BLOB DEFAULT NULL") db.execSQL("ALTER TABLE attachment ADD COLUMN archive_thumbnail_cdn INTEGER DEFAULT 0") db.execSQL("ALTER TABLE attachment ADD COLUMN archive_thumbnail_media_id TEXT DEFAULT NULL") + db.execSQL("ALTER TABLE attachment ADD COLUMN thumbnail_file TEXT DEFAULT NULL") + db.execSQL("ALTER TABLE attachment ADD COLUMN thumbnail_random BLOB DEFAULT NULL") } }