Fix #3137 (Epub Search: crash (code 14): Could not open database)

AndBible · Dec 28, 2023 · 9ae83e0 · 9ae83e0
1 parent dabc5ab
commit 9ae83e0
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/app/src/main/java/net/bible/service/sword/epub/EpubSearch.kt b/app/src/main/java/net/bible/service/sword/epub/EpubSearch.kt
@@ -18,6 +18,8 @@
 package net.bible.service.sword.epub
 
 import android.content.ContentValues
+import android.database.sqlite.SQLiteCantOpenDatabaseException
+import android.util.Log
 import io.requery.android.database.sqlite.SQLiteDatabase
 import io.requery.android.database.sqlite.SQLiteDatabase.CONFLICT_IGNORE
 import java.io.File
@@ -26,30 +28,35 @@ import java.io.File
 data class EpubSearchResult(val fragId: Long, val ordinal: Int, val text: String)
 
 class EpubSearch(val file: File) {
-    private val db = SQLiteDatabase.openDatabase(file.path, null, SQLiteDatabase.OPEN_READWRITE or SQLiteDatabase.CREATE_IF_NECESSARY)
-    val isIndexed: Boolean get() = db.run {
-        !query("SELECT name FROM sqlite_master WHERE type='table' AND name=?", arrayOf("SearchIndex")).isAfterLast
+    private val db = try {
+        SQLiteDatabase.openDatabase(file.path, null, SQLiteDatabase.OPEN_READWRITE or SQLiteDatabase.CREATE_IF_NECESSARY)
+    } catch (e: SQLiteCantOpenDatabaseException) {
+        Log.e("EpubSearch", "Could not open database ${file.path}")
+        null
     }
+    val isIndexed: Boolean get() = db?.run {
+        !query("SELECT name FROM sqlite_master WHERE type='table' AND name=?", arrayOf("SearchIndex")).isAfterLast
+    }?: false
 
-    fun deleteIndex() = db.run {
+    fun deleteIndex() = db?.run {
         execSQL("""DROP TABLE IF EXISTS SearchIndex""")
     }
 
-    fun createTable() = db.run {
+    fun createTable() = db?.run {
         execSQL("""
             CREATE VIRTUAL TABLE SearchIndex USING FTS5(contentText, frag_id UNINDEXED, ordinal UNINDEXED);
         """.trimIndent())
     }
 
-    fun addContent(content: String, fragId:Long, ordinal: Int) = db.run {
+    fun addContent(content: String, fragId:Long, ordinal: Int) = db?.run {
         insert("SearchIndex", CONFLICT_IGNORE, ContentValues().apply {
             put("contentText", content)
             put("frag_id", fragId)
             put("ordinal", ordinal)
         })
     }
 
-    fun search(text: String): List<EpubSearchResult> = db.run {
+    fun search(text: String): List<EpubSearchResult> = db?.run {
         query("SELECT frag_id, ordinal, highlight(SearchIndex, 0, '<b>', '</b>') FROM SearchIndex WHERE contentText MATCH ?", bindArgs = arrayOf(text)).let { c ->
             c.moveToFirst()
             val list = mutableListOf<EpubSearchResult>()
@@ -62,5 +69,5 @@ class EpubSearch(val file: File) {
             }
             list
         }
-    }
+    }?: emptyList()
 }