@capacitor-community/sqlite 7.0.0 → 7.0.1

package/README.md

@@ -10,7 +10,7 @@
 </p>
 <br>
 <p align="center">
-  <img src="https://img.shields.io/maintenance/yes/2024?style=flat-square" />
+  <img src="https://img.shields.io/maintenance/yes/2025?style=flat-square" />
   <a href="https://github.com/capacitor-community/sqlite/actions?query=workflow%3A%22CI%22"><img src="https://img.shields.io/github/actions/workflow/status/capacitor-community/sqlite/ci.yml?style=flat-square" /></a>
   <a href="https://www.npmjs.com/package/@capacitor-community/sqlite"><img src="https://img.shields.io/npm/l/@capacitor-community/sqlite?branch=master&style=flat-square" /></a>
 <br>
@@ -122,7 +122,7 @@ You'll need the usual capacitor/android/react npm script to build and copy the a
 
  - In case you get the following error when building your app in Android Studio:
   `x files found with path 'build-data.properties'.`
-  You can you add the following code to `app/build.gradle`:
+  You can add the following code to `app/build.gradle`:
   ```
       packagingOptions {
           exclude 'build-data.properties'
@@ -131,14 +131,14 @@ You'll need the usual capacitor/android/react npm script to build and copy the a
   See [#301](https://github.com/capacitor-community/sqlite/issues/301) and [SO question](https://stackoverflow.com/questions/63291529/how-to-fix-more-than-one-file-was-found-with-os-independent-path-build-data-pro) for more information.
 
  - Check/Add the following:
-    Gradle JDK version 17
-    Android Gradle Plugin Version 8.0.0
+    Gradle JDK version 21
+    Android Gradle Plugin Version 8.7.2
     In variables.gradle
 
       ```
-      minSdkVersion = 22
-      compileSdkVersion = 33
-      targetSdkVersion = 33
+      minSdkVersion = 23
+      compileSdkVersion = 35
+      targetSdkVersion = 35
       ```
     In AndroidManifest.xml
       ```
@@ -355,7 +355,7 @@ npm install --save-dev electron-builder@24.6.4
 ## Dependencies
 
 The iOS and Android codes are using `SQLCipher` allowing for database encryption.
-The iOS codes is using `ZIPFoundation` for unzipping assets files
+The iOS code is using `ZIPFoundation` for unzipping assets files
 The Electron code is using `better-sqlite3-multiple-ciphers` , `electron-json-storage` and `node-fetch`  from 5.0.4.
 The Web code is using the Stencil component `jeep-sqlite` based on `sql.js`, `localforage`. and `jszip`  
 

package/android/build.gradle

@@ -61,7 +61,7 @@ dependencies {
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
-    implementation 'net.zetetic:android-database-sqlcipher:4.5.3'
+    implementation 'net.zetetic:sqlcipher-android:4.6.1@aar'
     implementation "androidx.sqlite:sqlite:2.4.0"
     //security library
     implementation "androidx.security:security-crypto:1.1.0-alpha06"

package/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/Database.java

@@ -26,6 +26,7 @@ import com.getcapacitor.community.database.sqlite.SQLite.ImportExportJson.JsonSQ
 import com.getcapacitor.community.database.sqlite.SQLite.ImportExportJson.UtilsEncryption;
 import com.getcapacitor.community.database.sqlite.SQLite.ImportExportJson.UtilsJson;
 import java.io.File;
+import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -35,9 +36,8 @@ import java.util.List;
 import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import net.sqlcipher.Cursor;
-import net.sqlcipher.database.SQLiteDatabase;
-import net.sqlcipher.database.SQLiteException;
+import net.zetetic.database.sqlcipher.SQLiteCursor;
+import net.zetetic.database.sqlcipher.SQLiteDatabase;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -115,7 +115,7 @@ public class Database {
      * Initialize the SQLCipher Libraries
      */
     private void InitializeSQLCipher() {
-        SQLiteDatabase.loadLibs(_context);
+        System.loadLibrary("sqlcipher");
     }
 
     public SupportSQLiteDatabase getDb() {
@@ -247,7 +247,7 @@ public class Database {
         if (_mode.equals("encryption")) {
             if (_isEncryption) {
                 try {
-                    _uCipher.encrypt(_context, _file, SQLiteDatabase.getBytes(password.toCharArray()));
+                    _uCipher.encrypt(_context, _file, password.getBytes(StandardCharsets.UTF_8));
                 } catch (Exception e) {
                     String msg = "Failed in encryption " + e.getMessage();
                     Log.v(TAG, msg);
@@ -260,7 +260,7 @@ public class Database {
         if (_mode.equals("decryption")) {
             if (_isEncryption) {
                 try {
-                    _uCipher.decrypt(_context, _file, SQLiteDatabase.getBytes(password.toCharArray()));
+                    _uCipher.decrypt(_context, _file, password.getBytes());
                     password = "";
                 } catch (Exception e) {
                     String msg = "Failed in decryption " + e.getMessage();
@@ -273,9 +273,9 @@ public class Database {
         }
         try {
             if (!isNCDB() && !this._readOnly) {
-                _db = SQLiteDatabase.openOrCreateDatabase(_file, password, null);
+                _db = SQLiteDatabase.openOrCreateDatabase(_file, password, null, null);
             } else {
-                _db = SQLiteDatabase.openDatabase(String.valueOf(_file), password, null, SQLiteDatabase.OPEN_READONLY);
+                _db = SQLiteDatabase.openDatabase(String.valueOf(_file), password, null, SQLiteDatabase.OPEN_READONLY, null);
             }
             if (_db != null) {
                 if (_db.isOpen()) {
@@ -301,12 +301,6 @@ public class Database {
                         close();
                         _db = null;
                         throw new Exception(msg);
-                    } catch (SQLiteException e) {
-                        String msg = "Failed in setVersion " + e.getMessage();
-                        Log.v(TAG, msg);
-                        close();
-                        _db = null;
-                        throw new Exception(msg);
                     }
                     if (_version > curVersion && _vUpgObject != null && _vUpgObject.size() > 0) {
                         //                           if (_vUpgObject != null && _vUpgObject.size() > 0) {
@@ -973,12 +967,12 @@ public class Database {
      */
     public JSArray selectSQL(String statement, ArrayList<Object> values) throws Exception {
         JSArray retArray = new JSArray();
-        Cursor c = null;
+        SQLiteCursor c = null;
         if (_db == null) {
             return retArray;
         }
         try {
-            c = (Cursor) _db.query(statement, values.toArray(new Object[0]));
+            c = (SQLiteCursor) _db.query(statement, values.toArray(new Object[0]));
             while (c.moveToNext()) {
                 JSObject row = new JSObject();
                 for (int i = 0; i < c.getColumnCount(); i++) {

package/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/UtilsDrop.java

@@ -6,7 +6,7 @@ import java.util.ArrayList;
 import java.util.Dictionary;
 import java.util.Enumeration;
 import java.util.List;
-import net.sqlcipher.Cursor;
+import net.zetetic.database.sqlcipher.SQLiteCursor;
 
 public class UtilsDrop {
 
@@ -20,7 +20,7 @@ public class UtilsDrop {
 
     public List<String> getTablesNames(Database db) throws Exception {
         List<String> tables = new ArrayList<String>();
-        Cursor cursor = null;
+        SQLiteCursor cursor = null;
         String query = "SELECT name FROM sqlite_master WHERE ";
         query += "type='table' AND name NOT LIKE 'sync_table' ";
         query += "AND name NOT LIKE '_temp_%' ";
@@ -28,7 +28,7 @@ public class UtilsDrop {
         query += "AND name NOT LIKE 'android_%' ";
         query += "ORDER BY rootpage DESC;";
         try {
-            cursor = (Cursor) db.getDb().query(query);
+            cursor = (SQLiteCursor) db.getDb().query(query);
             cursor.moveToFirst();
             while (!cursor.isAfterLast()) {
                 String tableName = cursor.getString(0);
@@ -51,12 +51,12 @@ public class UtilsDrop {
 
     public List<String> getViewNames(Database db) throws Exception {
         List<String> views = new ArrayList<String>();
-        Cursor cursor = null;
+        SQLiteCursor cursor = null;
         String query = "SELECT name FROM sqlite_master WHERE ";
         query += "type='view' AND name NOT LIKE 'sqlite_%' ";
         query += "ORDER BY rootpage DESC;";
         try {
-            cursor = (Cursor) db.getDb().query(query);
+            cursor = (SQLiteCursor) db.getDb().query(query);
             cursor.moveToFirst();
             while (!cursor.isAfterLast()) {
                 String viewName = cursor.getString(0);
@@ -113,10 +113,10 @@ public class UtilsDrop {
 
     public List<String> getIndexesNames(Database db) {
         List<String> indexes = new ArrayList<String>();
-        Cursor cursor = null;
+        SQLiteCursor cursor = null;
         String query = "SELECT name FROM sqlite_master WHERE ";
         query += "type='index' AND name NOT LIKE 'sqlite_%';";
-        cursor = (Cursor) db.getDb().query(query);
+        cursor = (SQLiteCursor) db.getDb().query(query);
         cursor.moveToFirst();
         while (!cursor.isAfterLast()) {
             String indexName = cursor.getString(0);
@@ -152,10 +152,10 @@ public class UtilsDrop {
 
     public List<String> getTriggersNames(Database db) {
         List<String> triggers = new ArrayList<String>();
-        Cursor cursor = null;
+        SQLiteCursor cursor = null;
         String query = "SELECT name FROM sqlite_master WHERE ";
         query += "type='trigger';";
-        cursor = (Cursor) db.getDb().query(query);
+        cursor = (SQLiteCursor) db.getDb().query(query);
         cursor.moveToFirst();
         while (!cursor.isAfterLast()) {
             String triggerName = cursor.getString(0);

package/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/UtilsSQLCipher.java

@@ -5,9 +5,8 @@ import android.content.SharedPreferences;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import net.sqlcipher.database.SQLiteDatabase;
-import net.sqlcipher.database.SQLiteException;
-import net.sqlcipher.database.SQLiteStatement;
+import net.zetetic.database.sqlcipher.SQLiteDatabase;
+import net.zetetic.database.sqlcipher.SQLiteStatement;
 
 public class UtilsSQLCipher {
 
@@ -36,12 +35,12 @@ public class UtilsSQLCipher {
      * @return the detected state of the database
      */
     public State getDatabaseState(Context ctxt, File dbPath, SharedPreferences sharedPreferences, GlobalSQLite globVar) {
-        SQLiteDatabase.loadLibs(ctxt);
+        System.loadLibrary("sqlcipher");
         if (dbPath.exists()) {
             SQLiteDatabase db = null;
 
             try {
-                db = SQLiteDatabase.openDatabase(dbPath.getAbsolutePath(), "", null, SQLiteDatabase.OPEN_READONLY);
+                db = SQLiteDatabase.openDatabase(dbPath.getAbsolutePath(), "", null, SQLiteDatabase.OPEN_READONLY, null);
 
                 db.getVersion();
 
@@ -50,7 +49,7 @@ public class UtilsSQLCipher {
                 try {
                     String passphrase = sharedPreferences.getString("secret", "");
                     if (passphrase.length() > 0) {
-                        db = SQLiteDatabase.openDatabase(dbPath.getAbsolutePath(), passphrase, null, SQLiteDatabase.OPEN_READONLY);
+                        db = SQLiteDatabase.openDatabase(dbPath.getAbsolutePath(), passphrase, null, SQLiteDatabase.OPEN_READONLY, null);
                         db.getVersion();
                         return (State.ENCRYPTED_SECRET);
                     } else {
@@ -59,7 +58,13 @@ public class UtilsSQLCipher {
                 } catch (Exception e1) {
                     try {
                         if (globVar.secret.length() > 0) {
-                            db = SQLiteDatabase.openDatabase(dbPath.getAbsolutePath(), globVar.secret, null, SQLiteDatabase.OPEN_READONLY);
+                            db = SQLiteDatabase.openDatabase(
+                                dbPath.getAbsolutePath(),
+                                globVar.secret,
+                                null,
+                                SQLiteDatabase.OPEN_READONLY,
+                                null
+                            );
                             db.getVersion();
                             return (State.ENCRYPTED_GLOBAL_SECRET);
                         } else {
@@ -92,11 +97,11 @@ public class UtilsSQLCipher {
      * @throws IOException
      */
     public void encrypt(Context ctxt, File originalFile, byte[] passphrase) throws IOException {
-        SQLiteDatabase.loadLibs(ctxt);
+        System.loadLibrary("sqlcipher");
 
         if (originalFile.exists()) {
             File newFile = File.createTempFile("sqlcipherutils", "tmp", ctxt.getCacheDir());
-            SQLiteDatabase db = SQLiteDatabase.openDatabase(originalFile.getAbsolutePath(), "", null, SQLiteDatabase.OPEN_READWRITE);
+            SQLiteDatabase db = SQLiteDatabase.openDatabase(originalFile.getAbsolutePath(), "", null, SQLiteDatabase.OPEN_READWRITE, null);
             int version = db.getVersion();
 
             db.close();
@@ -135,7 +140,7 @@ public class UtilsSQLCipher {
     }
 
     public void decrypt(Context ctxt, File originalFile, byte[] passphrase) throws IOException {
-        SQLiteDatabase.loadLibs(ctxt);
+        System.loadLibrary("sqlcipher");
 
         if (originalFile.exists()) {
             // Create a temporary file for the decrypted database in the cache directory
@@ -146,7 +151,8 @@ public class UtilsSQLCipher {
                 decryptedFile.getAbsolutePath(),
                 "",
                 null,
-                SQLiteDatabase.OPEN_READWRITE
+                SQLiteDatabase.OPEN_READWRITE,
+                null
             );
 
             // Open the encrypted database with the provided passphrase
@@ -154,7 +160,8 @@ public class UtilsSQLCipher {
                 originalFile.getAbsolutePath(),
                 new String(passphrase),
                 null,
-                SQLiteDatabase.OPEN_READWRITE
+                SQLiteDatabase.OPEN_READWRITE,
+                null
             );
 
             int version = encryptedDb.getVersion();
@@ -196,14 +203,14 @@ public class UtilsSQLCipher {
         }
     }
 
-    public void changePassword(Context ctxt, File file, String password, String nwpassword) throws IOException {
-        SQLiteDatabase.loadLibs(ctxt);
+    public void changePassword(Context ctxt, File file, String password, String nwpassword) throws Exception {
+        System.loadLibrary("sqlcipher");
 
         if (file.exists()) {
-            SQLiteDatabase db = SQLiteDatabase.openDatabase(file.getAbsolutePath(), password, null, SQLiteDatabase.OPEN_READWRITE);
+            SQLiteDatabase db = SQLiteDatabase.openDatabase(file.getAbsolutePath(), password, null, SQLiteDatabase.OPEN_READWRITE, null);
 
             if (!db.isOpen()) {
-                throw new SQLiteException("database " + file.getAbsolutePath() + " open failed");
+                throw new Exception("database " + file.getAbsolutePath() + " open failed");
             }
             db.changePassword(nwpassword);
             db.close();

package/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/UtilsSQLite.java

@@ -6,7 +6,7 @@ import com.getcapacitor.JSArray;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import net.sqlcipher.Cursor;
+import net.zetetic.database.sqlcipher.SQLiteCursor;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -19,7 +19,7 @@ public class UtilsSQLite {
         String SELECT_CHANGE = "SELECT total_changes()";
         Boolean success = true;
         int ret = Integer.valueOf(-1);
-        Cursor cursor = (Cursor) db.query(SELECT_CHANGE, null);
+        SQLiteCursor cursor = (SQLiteCursor) db.query(SELECT_CHANGE, null);
         if (cursor != null) {
             if (cursor.moveToFirst()) {
                 ret = Integer.parseInt(cursor.getString(0));
@@ -33,7 +33,7 @@ public class UtilsSQLite {
         String SELECT_CHANGE = "SELECT last_insert_rowid()";
         Boolean success = true;
         long ret = (long) -1;
-        Cursor cursor = (Cursor) db.query(SELECT_CHANGE, null);
+        SQLiteCursor cursor = (SQLiteCursor) db.query(SELECT_CHANGE, null);
         if (cursor.moveToFirst()) {
             ret = Long.parseLong(cursor.getString(0));
         }

package/electron/dist/plugin.js

@@ -1259,13 +1259,6 @@ function requireUtilsSQLite () {
 	            });
 	        }
 	        if (mDB != null) {
-	            try {
-	                this.dbChanges(mDB);
-	            }
-	            catch (err) {
-	                const errmsg = err.message ? err.message : err;
-	                throw new Error(`${msg} ${errmsg}`);
-	            }
 	            try {
 	                // set the password
 	                if (password.length > 0) {
@@ -1278,6 +1271,13 @@ function requireUtilsSQLite () {
 	                const errmsg = err.message ? err.message : err;
 	                throw new Error(`${msg} ${errmsg}`);
 	            }
+	            try {
+	                this.dbChanges(mDB);
+	            }
+	            catch (err) {
+	                const errmsg = err.message ? err.message : err;
+	                throw new Error(`${msg} ${errmsg}`);
+	            }
 	            return mDB;
 	        }
 	        else {