@capacitor-community/sqlite 3.4.1-1 → 3.4.1-4

package/README.md

@@ -28,10 +28,33 @@
 
 ## CAPACITOR 3 (Master)
 
+🚨 Since release 3.4.1-4 ->> 🚨
+  MacOS only, databases location for Electron can be set in `the config.config.ts` as followed:
+  plugins: {
+    CapacitorSQLite: {
+      electronMacLocation: "/YOUR_DATABASES_PATH"
+    }
+  }
+  For existing databases, YOU MUST COPY old databases to the new location
+  You MUST remove the Electron folder and add it again with
+  ``` 
+  npx cap add @capacitor-community/electron
+  npm run build 
+  cd electron
+  npm i --save sqlite3
+  npm i --save @types:sqlite3
+  npm run rebuild
+  cd ..
+  npx cap sync @capacitor-community/electron
+  npm run build
+  npx cap copy @capacitor-community/electron
+  npx cap open @capacitor-community/electron
+🚨 Since release 3.4.1-4 <<- 🚨
+
 🚨 Since release 3.4.1-1 ->> 🚨
 
   - add iosIsEncryption, androidIsEncryption in capacitor.config.ts
-    When your application use only `non-encrypted dzatabases` set those parameter to false then iOS KeyChain & Android MasterKey are not defined.
+    When your application use only `non-encrypted databases` set those parameter to false then iOS KeyChain & Android MasterKey are not defined.
     
 🚨 Since release 3.4.1-1 <<- 🚨
 

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

@@ -29,6 +29,7 @@ import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
+import java.security.KeyStore;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -63,7 +64,7 @@ public class CapacitorSQLite {
     private Boolean biometricAuth = false;
     private String biometricTitle;
     private String biometricSubTitle;
-    private int VALIDITY_DURATION = 1;
+    private int VALIDITY_DURATION = 5;
     private RetHandler rHandler = new RetHandler();
     private PluginCall call;
 
@@ -86,11 +87,18 @@ public class CapacitorSQLite {
                         @Override
                         public void onSuccess(BiometricPrompt.AuthenticationResult result) {
                             try {
-                                masterKeyAlias =
-                                    new MasterKey.Builder(context)
-                                        .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
-                                        .setUserAuthenticationRequired(true, VALIDITY_DURATION)
-                                        .build();
+                                KeyStore ks = KeyStore.getInstance("AndroidKeyStore");
+                                ks.load(null);
+                                Enumeration<String> aliases = ks.aliases();
+                                if (aliases.hasMoreElements()) {
+                                    masterKeyAlias =
+                                        new MasterKey.Builder(context)
+                                            .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
+                                            .setUserAuthenticationRequired(true, VALIDITY_DURATION)
+                                            .build();
+                                } else {
+                                    masterKeyAlias = new MasterKey.Builder(context).setKeyScheme(MasterKey.KeyScheme.AES256_GCM).build();
+                                }
                                 setSharedPreferences();
                                 notifyBiometricEvent(true, null);
                                 return;

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

@@ -569,17 +569,22 @@ public class Database {
         // check if the table has already been created
         boolean isExists = _uJson.isTableExists(this, "sync_table");
         if (!isExists) {
-            Date date = new Date();
-            long syncTime = date.getTime() / 1000L;
-            String[] statements = {
-                "CREATE TABLE IF NOT EXISTS sync_table (" + "id INTEGER PRIMARY KEY NOT NULL," + "sync_date INTEGER);",
-                "INSERT INTO sync_table (sync_date) VALUES ('" + syncTime + "');"
-            };
-            try {
-                retObj = execute(statements);
-                return retObj;
-            } catch (Exception e) {
-                throw new Exception(e.getMessage());
+            boolean isLastModified = _uJson.isLastModified(this);
+            if (isLastModified) {
+                Date date = new Date();
+                long syncTime = date.getTime() / 1000L;
+                String[] statements = {
+                    "CREATE TABLE IF NOT EXISTS sync_table (" + "id INTEGER PRIMARY KEY NOT NULL," + "sync_date INTEGER);",
+                    "INSERT INTO sync_table (sync_date) VALUES ('" + syncTime + "');"
+                };
+                try {
+                    retObj = execute(statements);
+                    return retObj;
+                } catch (Exception e) {
+                    throw new Exception(e.getMessage());
+                }
+            } else {
+                throw new Exception("No last_modified column in tables");
             }
         } else {
             retObj.put("changes", Integer.valueOf(0));
@@ -596,6 +601,10 @@ public class Database {
     public void setSyncDate(String syncDate) throws Exception {
         JSObject retObj = new JSObject();
         try {
+            boolean isSyncTable = _uJson.isTableExists(this, "sync_table");
+            if (!isSyncTable) {
+                throw new Exception("No sync_table available");
+            }
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
             Date date = formatter.parse(syncDate.replaceAll("Z$", "+0000"));
             long syncTime = date.getTime() / 1000L;
@@ -614,6 +623,10 @@ public class Database {
     public Long getSyncDate() throws Exception {
         long syncDate = 0;
         try {
+            boolean isSyncTable = _uJson.isTableExists(this, "sync_table");
+            if (!isSyncTable) {
+                throw new Exception("No sync_table available");
+            }
             syncDate = toJson.getSyncDate(this);
             return syncDate;
         } catch (Exception e) {

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

@@ -68,6 +68,11 @@ public class ExportToJson {
             if (resTables.length() == 0) {
                 throw new Exception("CreateExportObject: table's names failed");
             } else {
+                boolean isSyncTable = uJson.isTableExists(db, "sync_table");
+                if (!isSyncTable && sqlObj.getMode().equals("partial")) {
+                    throw new Exception("No sync_table available");
+                }
+
                 switch (sqlObj.getMode()) {
                     case "partial":
                         tables = getTablesPartial(db, resTables);

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

@@ -167,11 +167,15 @@ public class ImportFromJson {
     private ArrayList<String> createTableSchema(ArrayList<JsonColumn> mSchema, String tableName) {
         ArrayList<String> statements = new ArrayList<>();
         String stmt = new StringBuilder("CREATE TABLE IF NOT EXISTS ").append(tableName).append(" (").toString();
+        Boolean isLastModified = false;
         for (int j = 0; j < mSchema.size(); j++) {
             if (j == mSchema.size() - 1) {
                 if (mSchema.get(j).getColumn() != null) {
                     stmt =
                         new StringBuilder(stmt).append(mSchema.get(j).getColumn()).append(" ").append(mSchema.get(j).getValue()).toString();
+                    if (mSchema.get(j).getColumn().equals("last_modified")) {
+                        isLastModified = true;
+                    }
                 } else if (mSchema.get(j).getForeignkey() != null) {
                     stmt =
                         new StringBuilder(stmt)
@@ -198,6 +202,9 @@ public class ImportFromJson {
                             .append(mSchema.get(j).getValue())
                             .append(",")
                             .toString();
+                    if (mSchema.get(j).getColumn().equals("last_modified")) {
+                        isLastModified = true;
+                    }
                 } else if (mSchema.get(j).getForeignkey() != null) {
                     stmt =
                         new StringBuilder(stmt)
@@ -221,21 +228,23 @@ public class ImportFromJson {
         }
         stmt = new StringBuilder(stmt).append(");").toString();
         statements.add(stmt);
-        // create trigger last_modified associated with the table
-        String stmtTrigger = new StringBuilder("CREATE TRIGGER IF NOT EXISTS ")
-            .append(tableName)
-            .append("_trigger_last_modified")
-            .append(" AFTER UPDATE ON ")
-            .append(tableName)
-            .append(" FOR EACH ROW ")
-            .append("WHEN NEW.last_modified <= " + "OLD.last_modified BEGIN ")
-            .append("UPDATE ")
-            .append(tableName)
-            .append(" SET last_modified = (strftime('%s','now')) ")
-            .append("WHERE id=OLD.id; ")
-            .append("END;")
-            .toString();
-        statements.add(stmtTrigger);
+        if (isLastModified) {
+            // create trigger last_modified associated with the table
+            String stmtTrigger = new StringBuilder("CREATE TRIGGER IF NOT EXISTS ")
+                .append(tableName)
+                .append("_trigger_last_modified")
+                .append(" AFTER UPDATE ON ")
+                .append(tableName)
+                .append(" FOR EACH ROW ")
+                .append("WHEN NEW.last_modified <= " + "OLD.last_modified BEGIN ")
+                .append("UPDATE ")
+                .append(tableName)
+                .append(" SET last_modified = (strftime('%s','now')) ")
+                .append("WHERE id=OLD.id; ")
+                .append("END;")
+                .toString();
+            statements.add(stmtTrigger);
+        }
         return statements;
     }
 

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

@@ -3,6 +3,7 @@ package com.getcapacitor.community.database.sqlite.SQLite.ImportExportJson;
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.community.database.sqlite.SQLite.Database;
+import com.getcapacitor.community.database.sqlite.SQLite.UtilsDrop;
 import java.sql.Blob;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -16,6 +17,28 @@ public class UtilsJson {
     private JsonIndex uJIdx = new JsonIndex();
     private JsonTrigger uJTrg = new JsonTrigger();
     private JsonView uJView = new JsonView();
+    private UtilsDrop _uDrop = new UtilsDrop();
+
+    public boolean isLastModified(Database db) throws Exception {
+        if (!db.isOpen()) {
+            throw new Exception("isLastModified: Database not opened");
+        }
+        boolean ret = false;
+        try {
+            List<String> tables = _uDrop.getTablesNames(db);
+            for (String tableName : tables) {
+                JSObject namesTypes = getTableColumnNamesTypes(db, tableName);
+                ArrayList<String> colNames = (ArrayList<String>) namesTypes.get("names");
+                if (colNames.contains("last_modified")) {
+                    ret = true;
+                    break;
+                }
+            }
+            return ret;
+        } catch (Exception e) {
+            throw new Exception("isLastModified: " + e.getMessage());
+        }
+    }
 
     /**
      * Check if a table exists