Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash with missing last_resort_key_tuple table.

Browse Source
This commit is contained in:
Cody Henthorne
2025-10-15 14:21:41 -04:00
committed by GitHub
parent 7b6c2fa729
commit 56725f0f5c
5 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
View File

@@ -33,6 +33,7 @@ import org.thoughtcrime.securesms.database.EmojiSearchTable;
import org.thoughtcrime.securesms.database.GroupReceiptTable;
import org.thoughtcrime.securesms.database.KeyValueDatabase;
import org.thoughtcrime.securesms.database.KyberPreKeyTable;
import org.thoughtcrime.securesms.database.LastResortKeyTupleTable;
import org.thoughtcrime.securesms.database.MentionTable;
import org.thoughtcrime.securesms.database.MessageTable;
import org.thoughtcrime.securesms.database.OneTimePreKeyTable;
@@ -90,6 +91,7 @@ public class FullBackupExporter extends FullBackupBase {
SignedPreKeyTable.TABLE_NAME,
OneTimePreKeyTable.TABLE_NAME,
KyberPreKeyTable.TABLE_NAME,
LastResortKeyTupleTable.TABLE_NAME,
SessionTable.TABLE_NAME,
SearchTable.FTS_TABLE_NAME,
EmojiSearchTable.TABLE_NAME,

3
app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java
View File

@@ -30,6 +30,7 @@ import org.thoughtcrime.securesms.database.AttachmentTable;
import org.thoughtcrime.securesms.database.EmojiSearchTable;
import org.thoughtcrime.securesms.database.KeyValueDatabase;
import org.thoughtcrime.securesms.database.KyberPreKeyTable;
import org.thoughtcrime.securesms.database.LastResortKeyTupleTable;
import org.thoughtcrime.securesms.database.OneTimePreKeyTable;
import org.thoughtcrime.securesms.database.SearchTable;
import org.thoughtcrime.securesms.database.SignedPreKeyTable;
@@ -70,7 +71,7 @@ public class FullBackupImporter extends FullBackupBase {
@SuppressWarnings("unused")
private static final String TAG = Log.tag(FullBackupImporter.class);
private static final Set<String> KEY_TABLES = SetsKt.setOf(KyberPreKeyTable.TABLE_NAME, OneTimePreKeyTable.TABLE_NAME, SignedPreKeyTable.TABLE_NAME);
private static final Set<String> KEY_TABLES = SetsKt.setOf(KyberPreKeyTable.TABLE_NAME, LastResortKeyTupleTable.TABLE_NAME, OneTimePreKeyTable.TABLE_NAME, SignedPreKeyTable.TABLE_NAME);
public static boolean validatePassphrase(@NonNull Context context,
@NonNull Uri uri,

2
app/src/main/java/org/thoughtcrime/securesms/database/LastResortKeyTupleTable.kt
View File

@@ -23,7 +23,7 @@ class LastResortKeyTupleTable(context: Context, databaseHelper: SignalDatabase)
companion object {
private val TAG = Log.tag(LastResortKeyTupleTable::class)
private const val TABLE_NAME = "last_resort_key_tuple"
const val TABLE_NAME = "last_resort_key_tuple"
private const val ID = "_id"
private const val KYBER_PREKEY = "kyber_prekey_id"

6
app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt
View File

@@ -149,6 +149,7 @@ import org.thoughtcrime.securesms.database.helpers.migration.V291_NullOutRemoteK
import org.thoughtcrime.securesms.database.helpers.migration.V292_AddPollTables
import org.thoughtcrime.securesms.database.helpers.migration.V293_LastResortKeyTupleTableMigration
import org.thoughtcrime.securesms.database.helpers.migration.V294_RemoveLastResortKeyTupleColumnConstraintMigration
import org.thoughtcrime.securesms.database.helpers.migration.V295_AddLastRestoreKeyTypeTableIfMissingMigration
import org.thoughtcrime.securesms.database.SQLiteDatabase as SignalSqliteDatabase
/**
@@ -303,10 +304,11 @@ object SignalDatabaseMigrations {
291 to V291_NullOutRemoteKeyIfEmpty,
292 to V292_AddPollTables,
293 to V293_LastResortKeyTupleTableMigration,
294 to V294_RemoveLastResortKeyTupleColumnConstraintMigration
294 to V294_RemoveLastResortKeyTupleColumnConstraintMigration,
295 to V295_AddLastRestoreKeyTypeTableIfMissingMigration
)
const val DATABASE_VERSION = 294
const val DATABASE_VERSION = 295
@JvmStatic
fun migrate(context: Application, db: SignalSqliteDatabase, oldVersion: Int, newVersion: Int) {

29
app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V295_AddLastRestoreKeyTypeTableIfMissingMigration.kt Normal file
View File

@@ -0,0 +1,29 @@
/*
* Copyright 2025 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only
*/
package org.thoughtcrime.securesms.database.helpers.migration
import android.app.Application
import org.thoughtcrime.securesms.database.SQLiteDatabase
/**
* Creates the LastResortKeyTuple table if missed getting created on backup or device transfer import.
*/
@Suppress("ClassName")
object V295_AddLastRestoreKeyTypeTableIfMissingMigration : SignalDatabaseMigration {
override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
db.execSQL(
"""
CREATE TABLE IF NOT EXISTS last_resort_key_tuple (
_id INTEGER PRIMARY KEY,
kyber_prekey_id INTEGER NOT NULL REFERENCES kyber_prekey (_id) ON DELETE CASCADE,
signed_key_id INTEGER NOT NULL,
public_key BLOB NOT NULL,
UNIQUE(kyber_prekey_id, signed_key_id, public_key)
)
""".trimIndent()
)
}
}