fix android Database class

muhamad-rizki · Apr 19, 2020 · 5af04e7 · 5af04e7
1 parent 1ff290e
commit 5af04e7
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/native/android/src/main/java/com/nozbe/watermelondb/Database.kt b/native/android/src/main/java/com/nozbe/watermelondb/Database.kt
@@ -5,9 +5,10 @@ import android.database.Cursor
 import net.sqlcipher.database.SQLiteDatabase
 import java.io.File
 
-class Database(private val name: String, private val password: String, private val context: Context) {
+class Database(private val name: String, private val password: String?, private val context: Context) {
 
     private val db: SQLiteDatabase by lazy {
+        SQLiteDatabase.loadLibs(context)
         SQLiteDatabase.openOrCreateDatabase(
                 // TODO: This SUCKS. Seems like Android doesn't like sqlite `?mode=memory&cache=shared` mode. To avoid random breakages, save the file to /tmp, but this is slow.
                 if (name == ":memory:" || name.contains("mode=memory")) {
@@ -16,6 +17,7 @@ class Database(private val name: String, private val password: String, private v
                 } else
                     // On some systems there is some kind of lock on `/databases` folder ¯\_(ツ)_/¯
                     context.getDatabasePath("$name.db").path.replace("/databases", ""),
+                password,
                 null)
     }
 
@@ -75,12 +77,14 @@ class Database(private val name: String, private val password: String, private v
     private fun getAllTables(): ArrayList<String> {
         val allTables: ArrayList<String> = arrayListOf()
         rawQuery(Queries.select_tables).use {
-            it.moveToFirst()
-            val index = it.getColumnIndex("name")
-            if (index > -1) {
-                do {
-                    allTables.add(it.getString(index))
-                } while (it.moveToNext())
+            if (it.count > 0) {
+                it.moveToFirst()
+                val index = it.getColumnIndex("name")
+                if (index > -1) {
+                    do {
+                        allTables.add(it.getString(index))
+                    } while (it.moveToNext())
+                }
             }
         }
         return allTables