From a11c34d1f6966e66ed1b80937d087e44f5eb6570 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Mon, 24 Apr 2023 10:14:43 -0400 Subject: [PATCH] Fix migration crash for unregistered users. --- .../V185_MessageRecipientsAndEditMessageMigration.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V185_MessageRecipientsAndEditMessageMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V185_MessageRecipientsAndEditMessageMigration.kt index f421ec202c..f422df73f1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V185_MessageRecipientsAndEditMessageMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V185_MessageRecipientsAndEditMessageMigration.kt @@ -43,8 +43,8 @@ object V185_MessageRecipientsAndEditMessageMigration : SignalDatabaseMigration { val selfId: RecipientId? = getSelfId(db) if (selfId == null) { - val messageCount = db.rawQuery("SELECT COUNT(*) FROM message").readToSingleInt() - if (messageCount == 0) { + val outgoingMessageCount = db.rawQuery("SELECT COUNT(*) FROM message WHERE $outgoingClause").readToSingleInt() + if (outgoingMessageCount == 0) { Log.i(TAG, "Could not find ourselves in the DB! Assuming this is an install that hasn't been registered yet.") } else { throw IllegalStateException("Could not find ourselves in the recipient table, but messages exist in the message table!")