RMET-3602 ::: Update sqlcipher for 16KB page alignment (#14)

* fix: Update sqlcypher to new location and latest version

References:

- https://outsystemsrd.atlassian.net/browse/RMET-3602
- https://outsystemsrd.atlassian.net/wiki/spaces/RDME/pages/4426137659/iOS+18+Android+15+Assessment

* fix: Add missing sqlite DB version

References:

- https://outsystemsrd.atlassian.net/browse/RMET-3602
- https://outsystemsrd.atlassian.net/wiki/spaces/RDME/pages/4426137659/iOS+18+Android+15+Assessment

* Revert "fix: Add missing sqlite DB version"

This reverts commit 849e78d.

* fix: Changes related to migrating sqlcipher library

References:

- https://www.zetetic.net/sqlcipher/sqlcipher-for-android-migration/
- https://outsystemsrd.atlassian.net/browse/RMET-3602
- https://outsystemsrd.atlassian.net/wiki/spaces/RDME/pages/4426137659/iOS+18+Android+15+Assessment

* chore: Remove unused custom aar

References:

- https://www.zetetic.net/sqlcipher/sqlcipher-for-android-migration/
- https://outsystemsrd.atlassian.net/browse/RMET-3602
- https://outsystemsrd.atlassian.net/wiki/spaces/RDME/pages/4426137659/iOS+18+Android+15+Assessment

* chore: Update CHANGES.md

References:

- https://outsystemsrd.atlassian.net/browse/RMET-3602
- https://outsystemsrd.atlassian.net/wiki/spaces/RDME/pages/4426137659/iOS+18+Android+15+Assessment

* fix: Add missing mavencentral repo for sqlcipher dependency

References:

- https://outsystemsrd.atlassian.net/browse/RMET-3602
- https://outsystemsrd.atlassian.net/wiki/spaces/RDME/pages/4426137659/iOS+18+Android+15+Assessment

* chore(release): raise to version 0.1.7-OS9

References: https://outsystemsrd.atlassian.net/browse/RMET-3844

---------

Co-authored-by: Alexandre Jacinto <alexandre.jacinto@outsystems.com>

Author: OS-pedrogustavobilro

CHANGES.md

@@ -1,6 +1,10 @@
 # Changes
 
-## unreleased
+## cordova-sqlcipher-adapter 0.1.7-OS9
+
+- Update SQLCipher to 4.6.1, with support for 16KB page size devices (https://outsystemsrd.atlassian.net/browse/RMET-3602)
+
+## cordova-sqlcipher-adapter 0.1.7-OS8
 
 - Update for SQLCipher 4.4.2 and SQLite 3.33.0
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-sqlcipher-adapter",
-  "version": "0.1.7-OS8",
+  "version": "0.1.7-OS9",
   "description": "SQLCipher database adapter for PhoneGap/Cordova, based on cordova-sqlite-storage",
   "cordova": {
     "id": "cordova-sqlcipher-adapter",

plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="cordova-sqlcipher-adapter"
-    version="0.1.7-OS8">
+    version="0.1.7-OS9">
 
     <name>Cordova sqlcipher adapter</name>
 
@@ -37,7 +37,7 @@
         <source-file src="src/android/io/sqlc/SQLitePlugin.java" target-dir="src/io/sqlc"/>
         <source-file src="src/android/io/sqlc/SQLiteAndroidDatabase.java" target-dir="src/io/sqlc"/>
 
-        <lib-file src="src/android/libs/android-database-sqlcipher-4.5.4-custom.aar" />
+        <framework src="net.zetetic:sqlcipher-android:4.6.1" />
         <!-- androidx.sqlite now required -->
         <framework src="androidx.sqlite:sqlite:2.1.0" />
         <framework src="src/android/build.gradle" custom="true" type="gradleReference" />

src/android/build.gradle

@@ -1,3 +1,7 @@
+repositories {
+    mavenCentral()
+}
+
 dependencies{
-    implementation files("libs/android-database-sqlcipher-4.5.4-custom.aar")
+    implementation "net.zetetic:sqlcipher-android:4.6.1@aar"
 }

src/android/io/sqlc/SQLiteAndroidDatabase.java

@@ -7,8 +7,7 @@
 package io.sqlc;
 
 // SQLCipher version of database classes:
-import net.sqlcipher.*;
-import net.sqlcipher.database.*;
+import net.zetetic.database.sqlcipher.*;
 
 /* ** NOT USED in this plugin version:
 import android.database.Cursor;
@@ -20,6 +19,7 @@
 import android.database.sqlite.SQLiteStatement;
 // */
 
+import android.database.Cursor;
 import android.database.sqlite.SQLiteConstraintException;
 import android.database.sqlite.SQLiteException;
 import android.util.Log;
@@ -70,10 +70,9 @@ class SQLiteAndroidDatabase
     /**
      * to load native lib(s)
      */
-    //@Override
     static
-    public void initialize(CordovaInterface cordova) {
-        SQLiteDatabase.loadLibs(cordova.getActivity());
+    public void initialize() {
+        System.loadLibrary("sqlcipher");
     }
 
     /**
@@ -87,9 +86,9 @@ void open(File dbfile, String key, boolean migrateCipher) throws Exception {
         SQLiteDatabaseHook hook = null;
         if(migrateCipher) {
             hook = new SQLiteDatabaseHook() {
-                public void preKey(SQLiteDatabase database) {}
-                public void postKey(SQLiteDatabase database) {
-                    database.rawExecSQL("PRAGMA cipher_migrate");
+                public void preKey(SQLiteConnection connection) {}
+                public void postKey(SQLiteConnection connection) {
+                    connection.executeRaw("PRAGMA cipher_migrate", null, null);
                 }
             };
         }

src/android/io/sqlc/SQLitePlugin.java

@@ -76,7 +76,7 @@ public void initialize(CordovaInterface cordova, CordovaWebView webView) {
         super.initialize(cordova, webView);
         logger = OSLogger.getInstance();
         selfHealingEnabled = preferences.getBoolean("EnableSQLCipherSelfHealing", false);
-        SQLiteAndroidDatabase.initialize(cordova);
+        SQLiteAndroidDatabase.initialize();
     }