Merge branch 'dev' into feature/standardised-message-deletion

app/src/main/java/org/thoughtcrime/securesms/database/ConfigDatabase.kt

@@ -44,10 +44,14 @@ class ConfigDatabase(context: Context, helper: SQLCipherOpenHelper): Database(co
     }
 
     fun retrieveConfigLastUpdateTimestamp(variant: String, publicKey: String): Long {
-        val db = readableDatabase
+        return readableDatabase
-        val cursor = db.query(TABLE_NAME, arrayOf(TIMESTAMP), VARIANT_AND_PUBKEY_WHERE, arrayOf(variant, publicKey),null, null, null)
+            .query(TABLE_NAME, arrayOf(TIMESTAMP), VARIANT_AND_PUBKEY_WHERE, arrayOf(variant, publicKey), null, null, null)
-        if (cursor == null) return 0
+            ?.use { cursor ->
-        if (!cursor.moveToFirst()) return 0
+                if (cursor.moveToFirst()) {
-        return (cursor.getLongOrNull(cursor.getColumnIndex(TIMESTAMP)) ?: 0)
+                    cursor.getLongOrNull(cursor.getColumnIndex(TIMESTAMP))
+                } else {
+                    null
+                }
+            } ?: 0L
     }
 }