Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-21 10:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible dangling thread records.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-03-30 17:17:10 -04:00
committed by GitHub
parent 5c65d5435c
commit de0a37d356
2 changed files with 59 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@ import org.thoughtcrime.securesms.database.helpers.migration.V177_MessageSendLog
import org.thoughtcrime.securesms.database.helpers.migration.V178_ReportingTokenColumnMigration
import org.thoughtcrime.securesms.database.helpers.migration.V179_CleanupDanglingMessageSendLogMigration
import org.thoughtcrime.securesms.database.helpers.migration.V180_RecipientNicknameMigration
import org.thoughtcrime.securesms.database.helpers.migration.V181_ThreadTableForeignKeyCleanup
/**
* Contains all of the database migrations for [SignalDatabase]. Broken into a separate file for cleanliness.
@@ -44,7 +45,7 @@ object SignalDatabaseMigrations {
val TAG: String = Log.tag(SignalDatabaseMigrations.javaClass)
const val DATABASE_VERSION = 180
const val DATABASE_VERSION = 181
@JvmStatic
fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
@@ -175,6 +176,10 @@ object SignalDatabaseMigrations {
if (oldVersion < 180) {
V180_RecipientNicknameMigration.migrate(context, db, oldVersion, newVersion)
}
if (oldVersion < 181) {
V181_ThreadTableForeignKeyCleanup.migrate(context, db, oldVersion, newVersion)
}
}
@JvmStatic

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

@@ -0,0 +1,53 @@
package org.thoughtcrime.securesms.database.helpers.migration
import android.app.Application
import net.zetetic.database.sqlcipher.SQLiteDatabase
import org.signal.core.util.Stopwatch
import org.signal.core.util.logging.Log
/**
* We saw evidence (via failed backup restores) that some people have recipients in their thread table that do not exist in the recipient table.
* This is likely the result of a bad past migration, since a foreign key is in place. Cleaning it up now.
*/
object V181_ThreadTableForeignKeyCleanup : SignalDatabaseMigration {
val TAG = Log.tag(V181_ThreadTableForeignKeyCleanup::class.java)
override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
val stopwatch = Stopwatch("deletes")
try {
val threadDeleteCount = db.delete("thread", "recipient_id NOT IN (SELECT _id FROM recipient)", null)
Log.i(TAG, "Deleted $threadDeleteCount threads.")
stopwatch.split("threads")
if (threadDeleteCount == 0) {
Log.w(TAG, "No threads deleted. Finishing early.")
return
}
val messageDeleteCount = db.delete("message", "thread_id NOT IN (SELECT _id FROM thread)", null)
Log.i(TAG, "Deleted $messageDeleteCount messages.")
stopwatch.split("messages")
if (messageDeleteCount == 0) {
Log.w(TAG, "No messages deleted. Finishing early.")
return
}
val storySendDeleteCount = db.delete("story_sends", "message_id NOT IN (SELECT _id FROM message)", null)
Log.i(TAG, "Deleted $storySendDeleteCount story_sends.")
stopwatch.split("story_sends")
val reactionDeleteCount = db.delete("reaction", "message_id NOT IN (SELECT _id FROM message)", null)
Log.i(TAG, "Deleted $reactionDeleteCount reactions.")
stopwatch.split("reactions")
val callDeleteCount = db.delete("call", "message_id NOT IN (SELECT _id FROM message)", null)
Log.i(TAG, "Deleted $callDeleteCount calls.")
stopwatch.split("calls")
} finally {
stopwatch.stop(TAG)
}
}
}