admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Potentially fix 'database is locked' crash

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/tachiyomi/di/AppModule.kt
This commit is contained in:
AntsyLich
2026-03-23 20:13:39 +06:00
committed by Jobobby04
parent 4552221020
commit 925fb118af
2 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle.kts
-1
View File
@@ -204,7 +204,6 @@ dependencies {
implementation(sylibs.sqlcipher)
// SY <--
implementation(libs.kotlin.reflect)
implementation(libs.kotlinx.collections.immutable)
app/src/main/java/eu/kanade/tachiyomi/di/AppModule.kt
+32 -23
View File
@@ -53,40 +53,49 @@ import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.InjektRegistrar
import uy.kohesive.injekt.api.get
import uy.kohesive.injekt.injectLazy
import java.lang.ref.WeakReference
private val lock = Any()
class AppModule(val app: Application) : InjektModule {
// SY -->
private val securityPreferences: SecurityPreferences by injectLazy()
// SY <--
private var sqlDriverRef: WeakReference<SqlDriver>? = null
override fun InjektRegistrar.registerInjectables() {
addSingleton(app)
addSingletonFactory<SqlDriver> {
// SY -->
if (securityPreferences.encryptDatabase.get()) {
System.loadLibrary("sqlcipher")
synchronized(lock) {
sqlDriverRef?.get()?.let { return@synchronized it }
return@addSingletonFactory AndroidSqliteDriver(
schema = Database.Schema,
context = app,
name = CbzCrypto.DATABASE_NAME,
factory = SupportOpenHelperFactory(CbzCrypto.getDecryptedPasswordSql(), null, false, 25),
callback = object : AndroidSqliteDriver.Callback(Database.Schema) {
override fun onOpen(db: SupportSQLiteDatabase) {
super.onOpen(db)
setPragma(db, "foreign_keys = ON")
setPragma(db, "journal_mode = WAL")
setPragma(db, "synchronous = NORMAL")
}
// SY -->
if (securityPreferences.encryptDatabase.get()) {
System.loadLibrary("sqlcipher")
private fun setPragma(db: SupportSQLiteDatabase, pragma: String) {
val cursor = db.query("PRAGMA $pragma")
cursor.moveToFirst()
cursor.close()
}
},
)
return@synchronized AndroidSqliteDriver(
schema = Database.Schema,
context = app,
name = CbzCrypto.DATABASE_NAME,
factory = SupportOpenHelperFactory(CbzCrypto.getDecryptedPasswordSql(), null, false, 25),
callback = object : AndroidSqliteDriver.Callback(Database.Schema) {
override fun onOpen(db: SupportSQLiteDatabase) {
super.onOpen(db)
setPragma(db, "foreign_keys = ON")
setPragma(db, "journal_mode = WAL")
setPragma(db, "synchronous = NORMAL")
}
private fun setPragma(db: SupportSQLiteDatabase, pragma: String) {
val cursor = db.query("PRAGMA $pragma")
cursor.moveToFirst()
cursor.close()
}
},
).also { sqlDriverRef = WeakReference(it) }
}
}
// SY <--
@@ -97,7 +106,7 @@ class AppModule(val app: Application) : InjektModule {
configuration = AndroidxSqliteConfiguration(
isForeignKeyConstraintsEnabled = true,
),
)
).also { sqlDriverRef = WeakReference(it) }
}
addSingletonFactory {
Database(