From 342f249fab161a9e2847d68be706ba3beed82e79 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 14 Sep 2023 16:58:22 -0400 Subject: [PATCH] Fix possible crash during JobDatabase upgrade. This seems to be a SQLite/SQLCipher caching issue. Fixes #13172 --- .../securesms/database/JobDatabase.kt | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.kt index ea4263d12b..a5405222ce 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.kt @@ -178,8 +178,23 @@ class JobDatabase( @Synchronized fun getAllJobSpecs(): List { + val columns = arrayOf( + Jobs.ID, + Jobs.JOB_SPEC_ID, + Jobs.FACTORY_KEY, + Jobs.QUEUE_KEY, + Jobs.CREATE_TIME, + Jobs.LAST_RUN_ATTEMPT_TIME, + Jobs.NEXT_BACKOFF_INTERVAL, + Jobs.RUN_ATTEMPT, + Jobs.MAX_ATTEMPTS, + Jobs.LIFESPAN, + Jobs.SERIALIZED_DATA, + Jobs.SERIALIZED_INPUT_DATA, + Jobs.IS_RUNNING + ) return readableDatabase - .query(Jobs.TABLE_NAME, null, null, null, null, null, "${Jobs.CREATE_TIME}, ${Jobs.ID} ASC") + .query(Jobs.TABLE_NAME, columns, null, null, null, null, "${Jobs.CREATE_TIME}, ${Jobs.ID} ASC") .readToList { cursor -> jobSpecFromCursor(cursor) }