diff --git a/app/build.gradle b/app/build.gradle index c55ac5ec9..8a13cec79 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -237,7 +237,7 @@ dependencies { implementation(libs.json.path) implementation(libs.jsoupxpath) implementation(project(path: ':modules:book')) - implementation implementation(project(path: ':modules:rhino')) + implementation(project(path: ':modules:rhino')) //JS rhino diff --git a/app/src/main/java/io/legado/app/data/AppDatabase.kt b/app/src/main/java/io/legado/app/data/AppDatabase.kt index 0efa98b85..e655a12f2 100644 --- a/app/src/main/java/io/legado/app/data/AppDatabase.kt +++ b/app/src/main/java/io/legado/app/data/AppDatabase.kt @@ -57,7 +57,7 @@ import java.util.Locale val appDb by lazy { Room.databaseBuilder(appCtx, AppDatabase::class.java, AppDatabase.DATABASE_NAME) - .fallbackToDestructiveMigrationFrom(1, 2, 3, 4, 5, 6, 7, 8, 9) + .fallbackToDestructiveMigrationFrom(false, 1, 2, 3, 4, 5, 6, 7, 8, 9) .addMigrations(*DatabaseMigrations.migrations) .allowMainThreadQueries() .addCallback(AppDatabase.dbCallback) diff --git a/app/src/main/java/io/legado/app/utils/FlowExtensions.kt b/app/src/main/java/io/legado/app/utils/FlowExtensions.kt index 2195f570f..61c427b2b 100644 --- a/app/src/main/java/io/legado/app/utils/FlowExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/FlowExtensions.kt @@ -2,7 +2,6 @@ package io.legado.app.utils import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle -import androidx.room.invalidationTrackerFlow import io.legado.app.data.appDb import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.async @@ -215,7 +214,8 @@ fun Flow.flowWithLifecycleAndDatabaseChange( table: String ): Flow = callbackFlow { var update = 0 - val channel = appDb.invalidationTrackerFlow(table) + val channel = appDb.invalidationTracker + .createFlow(table) .conflate() .onEach { update++ } .produceIn(this) @@ -238,7 +238,8 @@ fun Flow.flowWithLifecycleAndDatabaseChangeFirst( ): Flow = callbackFlow { var update = 0 val isActive = lifecycle.currentState.isAtLeast(minActiveState) - val channel = appDb.invalidationTrackerFlow(table, emitInitialState = isActive) + val channel = appDb.invalidationTracker + .createFlow(table, emitInitialState = isActive) .conflate() .onEach { update++ } .produceIn(this)