diff --git a/app/build.gradle b/app/build.gradle index e3189e555..0805c292d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { defaultConfig { applicationId "org.oxycblt.auxio" - versionName "1.4.0" - versionCode 6 + versionName "1.3.3" + versionCode 5 minSdkVersion 21 targetSdkVersion 30 diff --git a/app/src/main/java/org/oxycblt/auxio/database/BlacklistDatabase.kt b/app/src/main/java/org/oxycblt/auxio/database/BlacklistDatabase.kt index 219a7ee44..ac20d0c13 100644 --- a/app/src/main/java/org/oxycblt/auxio/database/BlacklistDatabase.kt +++ b/app/src/main/java/org/oxycblt/auxio/database/BlacklistDatabase.kt @@ -24,8 +24,7 @@ class BlacklistDatabase(context: Context) : SQLiteOpenHelper(context, DB_NAME, n } override fun onDowngrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { - db.execSQL("DROP TABLE IF EXISTS $TABLE_NAME") - onCreate(db) + onUpgrade(db, newVersion, oldVersion) } /** diff --git a/app/src/main/java/org/oxycblt/auxio/database/DatabaseUtils.kt b/app/src/main/java/org/oxycblt/auxio/database/DatabaseUtils.kt index dc85de2cd..dbfe504e0 100644 --- a/app/src/main/java/org/oxycblt/auxio/database/DatabaseUtils.kt +++ b/app/src/main/java/org/oxycblt/auxio/database/DatabaseUtils.kt @@ -2,6 +2,7 @@ package org.oxycblt.auxio.database import android.database.Cursor import android.database.sqlite.SQLiteDatabase +import android.database.sqlite.SQLiteOpenHelper import android.os.Looper /** @@ -14,8 +15,8 @@ fun SQLiteDatabase.queryAll(tableName: String, block: (Cursor) -> R) = /** * Assert that we are on a background thread. */ -fun assertBackgroundThread() { - if (Looper.myLooper() == Looper.getMainLooper()) { - error("Not on a background thread.") +fun SQLiteOpenHelper.assertBackgroundThread() { + check(Looper.myLooper() != Looper.getMainLooper()) { + "Database operations must be ran on a background thread." } } diff --git a/app/src/main/java/org/oxycblt/auxio/database/PlaybackStateDatabase.kt b/app/src/main/java/org/oxycblt/auxio/database/PlaybackStateDatabase.kt index 122cbd001..8e854680b 100644 --- a/app/src/main/java/org/oxycblt/auxio/database/PlaybackStateDatabase.kt +++ b/app/src/main/java/org/oxycblt/auxio/database/PlaybackStateDatabase.kt @@ -30,6 +30,10 @@ class PlaybackStateDatabase(context: Context) : } } + override fun onDowngrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { + onUpgrade(db, newVersion, oldVersion) + } + // --- DATABASE CONSTRUCTION FUNCTIONS --- /**