@capacitor-community/sqlite 5.0.5-2 → 5.0.6

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

@@ -19,6 +19,7 @@ import com.getcapacitor.community.database.sqlite.SQLite.BiometricListener;
 import com.getcapacitor.community.database.sqlite.SQLite.Database;
 import com.getcapacitor.community.database.sqlite.SQLite.GlobalSQLite;
 import com.getcapacitor.community.database.sqlite.SQLite.ImportExportJson.JsonSQLite;
+import com.getcapacitor.community.database.sqlite.SQLite.ImportExportJson.UtilsEncryption;
 import com.getcapacitor.community.database.sqlite.SQLite.ImportExportJson.UtilsJson;
 import com.getcapacitor.community.database.sqlite.SQLite.SqliteConfig;
 import com.getcapacitor.community.database.sqlite.SQLite.UtilsBiometric;
@@ -30,7 +31,6 @@ import com.getcapacitor.community.database.sqlite.SQLite.UtilsSQLCipher;
 import com.getcapacitor.community.database.sqlite.SQLite.UtilsSQLite;
 import com.getcapacitor.community.database.sqlite.SQLite.UtilsSecret;
 import java.io.File;
-import java.nio.ByteBuffer;
 import java.security.KeyStore;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -40,8 +40,8 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
-import org.json.JSONException;
 import org.json.JSONObject;
 
 public class CapacitorSQLite {
@@ -61,9 +61,8 @@ public class CapacitorSQLite {
     private SharedPreferences sharedPreferences = null;
     private MasterKey masterKeyAlias;
     private BiometricManager biometricManager;
-    private final SqliteConfig config;
-    private Boolean isEncryption = true;
-    private Boolean biometricAuth = false;
+    private final Boolean isEncryption;
+    private final Boolean biometricAuth;
     private final String biometricTitle;
     private final String biometricSubTitle;
     private final int VALIDITY_DURATION = 5;
@@ -74,11 +73,10 @@ public class CapacitorSQLite {
     public CapacitorSQLite(Context context, SqliteConfig config) throws Exception {
         this.context = context;
         this.call = call;
-        this.config = config;
-        this.isEncryption = this.config.getIsEncryption();
-        this.biometricAuth = this.config.getBiometricAuth();
-        this.biometricTitle = this.config.getBiometricTitle();
-        this.biometricSubTitle = this.config.getBiometricSubTitle();
+        this.isEncryption = config.getIsEncryption();
+        this.biometricAuth = config.getBiometricAuth();
+        this.biometricTitle = config.getBiometricTitle();
+        this.biometricSubTitle = config.getBiometricSubTitle();
         try {
             if (isEncryption) {
                 // create or retrieve masterkey from Android keystore
@@ -104,7 +102,6 @@ public class CapacitorSQLite {
                                 }
                                 setSharedPreferences();
                                 notifyBiometricEvent(true, null);
-                                return;
                             } catch (Exception e) {
                                 String input = e.getMessage();
                                 Log.e("MY_APP_TAG", input);
@@ -139,7 +136,7 @@ public class CapacitorSQLite {
     }
 
     private void notifyBiometricEvent(Boolean ret, String msg) {
-        Map<String, Object> info = new HashMap<String, Object>() {
+        Map<String, Object> info = new HashMap<>() {
             {
                 put("result", ret);
                 put("message", msg);
@@ -169,15 +166,15 @@ public class CapacitorSQLite {
     /**
      * Echo
      *
-     * @param value
-     * @return
+     * @param value string to echo
+     * @return string to echo
      */
     public String echo(String value) {
         return value;
     }
 
     public Boolean isSecretStored() throws Exception {
-        Boolean ret = false;
+        boolean ret = false;
         if (isEncryption) {
             try {
                 String secret = uSecret.getPassphrase();
@@ -194,8 +191,8 @@ public class CapacitorSQLite {
     /**
      * SetEncryptionSecret
      *
-     * @param passphrase
-     * @throws Exception
+     * @param passphrase passphrase
+     * @throws Exception message
      */
     public void setEncryptionSecret(String passphrase) throws Exception {
         if (isEncryption) {
@@ -215,9 +212,9 @@ public class CapacitorSQLite {
     /**
      * ChangeEncryptionSecret
      *
-     * @param passphrase
-     * @param oldPassphrase
-     * @throws Exception
+     * @param passphrase new passphrase
+     * @param oldPassphrase old passphrase
+     * @throws Exception message
      */
     public void changeEncryptionSecret(PluginCall call, String passphrase, String oldPassphrase) throws Exception {
         this.call = call;
@@ -233,7 +230,6 @@ public class CapacitorSQLite {
                                 // change encryption secret
                                 uSecret.changeEncryptionSecret(passphrase, oldPassphrase);
                                 rHandler.retResult(call, null, null);
-                                return;
                             } catch (Exception e) {
                                 String input = e.getMessage();
                                 Log.e("MY_APP_TAG", input);
@@ -271,7 +267,7 @@ public class CapacitorSQLite {
 
     /**
      * ClearEncryptionSecret
-     * @throws Exception
+     * @throws Exception message
      */
     public void clearEncryptionSecret() throws Exception {
         if (isEncryption) {
@@ -291,8 +287,8 @@ public class CapacitorSQLite {
     /**
      * CheckEncryptionSecret
      *
-     * @param passphrase
-     * @throws Exception
+     * @param passphrase secret phrase for encryption
+     * @throws Exception message
      */
     public Boolean checkEncryptionSecret(String passphrase) throws Exception {
         if (isEncryption) {
@@ -300,8 +296,7 @@ public class CapacitorSQLite {
                 // close all connections
                 closeAllConnections();
                 // set encryption secret
-                Boolean res = uSecret.checkEncryptionSecret(passphrase);
-                return res;
+                return uSecret.checkEncryptionSecret(passphrase);
             } catch (Exception e) {
                 throw new Exception(e.getMessage());
             }
@@ -312,8 +307,7 @@ public class CapacitorSQLite {
 
     public String getNCDatabasePath(String folderPath, String database) throws Exception {
         try {
-            String databasePath = uNCDatabase.getNCDatabasePath(context, folderPath, database);
-            return databasePath;
+            return uNCDatabase.getNCDatabasePath(context, folderPath, database);
         } catch (Exception e) {
             throw new Exception(e.getMessage());
         }
@@ -322,12 +316,12 @@ public class CapacitorSQLite {
     /**
      * CreateConnection
      *
-     * @param dbName
-     * @param encrypted
-     * @param mode
-     * @param version
-     * @param vUpgObject
-     * @throws Exception
+     * @param dbName database name
+     * @param encrypted boolean
+     * @param mode  "no-encryption", "secret", "encryption"
+     * @param version database version
+     * @param vUpgObject upgrade Object
+     * @throws Exception message
      */
     public void createConnection(
         String dbName,
@@ -360,13 +354,7 @@ public class CapacitorSQLite {
                 sharedPreferences,
                 readonly
             );
-            if (db != null) {
-                dbDict.put(connName, db);
-                return;
-            } else {
-                String msg = "db is null";
-                throw new Exception(msg);
-            }
+            dbDict.put(connName, db);
         } catch (Exception e) {
             throw new Exception(e.getMessage());
         }
@@ -375,9 +363,9 @@ public class CapacitorSQLite {
     /**
      * CreateNCConnection
      *
-     * @param dbPath
-     * @param version
-     * @throws Exception
+     * @param dbPath database path
+     * @param version database version
+     * @throws Exception message
      */
     public void createNCConnection(String dbPath, int version) throws Exception {
         // check if connection already exists
@@ -404,13 +392,7 @@ public class CapacitorSQLite {
                 sharedPreferences,
                 true
             );
-            if (db != null) {
-                dbDict.put(connName, db);
-                return;
-            } else {
-                String msg = "db is null";
-                throw new Exception(msg);
-            }
+            dbDict.put(connName, db);
         } catch (Exception e) {
             throw new Exception(e.getMessage());
         }
@@ -419,8 +401,8 @@ public class CapacitorSQLite {
     /**
      * Open
      *
-     * @param dbName
-     * @throws Exception
+     * @param dbName database name
+     * @throws Exception message
      */
     public void open(String dbName, Boolean readonly) throws Exception {
         dbName = getDatabaseName(dbName);
@@ -429,7 +411,6 @@ public class CapacitorSQLite {
         if (db != null) {
             try {
                 db.open();
-                return;
             } catch (Exception e) {
                 throw new Exception(e.getMessage());
             }
@@ -442,8 +423,8 @@ public class CapacitorSQLite {
     /**
      * Close
      *
-     * @param dbName
-     * @throws Exception
+     * @param dbName database name
+     * @throws Exception message
      */
     public void close(String dbName, Boolean readonly) throws Exception {
         dbName = getDatabaseName(dbName);
@@ -454,7 +435,6 @@ public class CapacitorSQLite {
                 if (!db.inTransaction()) {
                     try {
                         db.close();
-                        return;
                     } catch (Exception e) {
                         throw new Exception(e.getMessage());
                     }
@@ -475,9 +455,9 @@ public class CapacitorSQLite {
     /**
      * GetUrl
      *
-     * @param dbName
+     * @param dbName database name
      * @return String
-     * @throws Exception
+     * @throws Exception message
      */
     public String getUrl(String dbName, Boolean readonly) throws Exception {
         dbName = getDatabaseName(dbName);
@@ -485,8 +465,7 @@ public class CapacitorSQLite {
         Database db = dbDict.get(connName);
         if (db != null) {
             try {
-                String url = db.getUrl();
-                return url;
+                return db.getUrl();
             } catch (Exception e) {
                 throw new Exception(e.getMessage());
             }
@@ -499,9 +478,9 @@ public class CapacitorSQLite {
     /**
      * GetVersion
      *
-     * @param dbName
+     * @param dbName database name
      * @return Integer
-     * @throws Exception
+     * @throws Exception message
      */
     public Integer getVersion(String dbName, Boolean readonly) throws Exception {
         dbName = getDatabaseName(dbName);
@@ -509,8 +488,7 @@ public class CapacitorSQLite {
         Database db = dbDict.get(connName);
         if (db != null) {
             try {
-                Integer version = db.getVersion();
-                return version;
+                return db.getVersion();
             } catch (Exception e) {
                 throw new Exception(e.getMessage());
             }
@@ -523,8 +501,8 @@ public class CapacitorSQLite {
     /**
      * CloseNCConnection
      *
-     * @param dbPath
-     * @throws Exception
+     * @param dbPath database path
+     * @throws Exception message
      */
     public void closeNCConnection(String dbPath) throws Exception {
         String connName = "RO_" + dbPath;
@@ -538,7 +516,6 @@ public class CapacitorSQLite {
                 }
             }
             dbDict.remove(connName);
-            return;
         } else {
             String msg = "No available connection for database " + dbPath;
             throw new Exception(msg);
@@ -548,8 +525,8 @@ public class CapacitorSQLite {
     /**
      * CloseConnection
      *
-     * @param dbName
-     * @throws Exception
+     * @param dbName database name
+     * @throws Exception message
      */
     public void closeConnection(String dbName, Boolean readonly) throws Exception {
         dbName = getDatabaseName(dbName);
@@ -564,7 +541,6 @@ public class CapacitorSQLite {
                 }
             }
             dbDict.remove(connName);
-            return;
         } else {
             String msg = "No available connection for database " + dbName;
             throw new Exception(msg);
@@ -580,14 +556,13 @@ public class CapacitorSQLite {
     }
 
     public Boolean checkConnectionsConsistency(JSArray dbNames, JSArray openModes) throws Exception {
-        Set<String> keys = new HashSet<String>(Collections.list(dbDict.keys()));
-        String msg = "All Native Connections released";
+        Set<String> keys = new HashSet<>(Collections.list(dbDict.keys()));
         JSArray nameDBs = new JSArray();
-        for (Integer i = 0; i < dbNames.length(); i++) {
+        for (int i = 0; i < dbNames.length(); i++) {
             String name = openModes.getString(i) + "_" + dbNames.getString(i);
             nameDBs.put(name);
         }
-        Set<String> conns = new HashSet<String>(uSqlite.stringJSArrayToArrayList(nameDBs));
+        Set<String> conns = new HashSet<>(uSqlite.stringJSArrayToArrayList(nameDBs));
         try {
             if (conns.size() == 0) {
                 closeAllConnections();
@@ -605,11 +580,11 @@ public class CapacitorSQLite {
                     }
                 }
             }
-            keys = new HashSet<String>(Collections.list(dbDict.keys()));
+            keys = new HashSet<>(Collections.list(dbDict.keys()));
             if (keys.size() == conns.size()) {
-                Set<String> symmetricDiff = new HashSet<String>(keys);
+                Set<String> symmetricDiff = new HashSet<>(keys);
                 symmetricDiff.addAll(conns);
-                Set<String> tmp = new HashSet<String>(keys);
+                Set<String> tmp = new HashSet<>(keys);
                 tmp.retainAll(conns);
                 symmetricDiff.removeAll(tmp);
                 if (symmetricDiff.size() == 0) {
@@ -631,9 +606,8 @@ public class CapacitorSQLite {
     /**
      * IsDatabase
      *
-     * @param dbName
+     * @param dbName database name
      * @return Boolean
-     * @throws Exception
      */
     public Boolean isDatabase(String dbName) {
         dbName = getDatabaseName(dbName);
@@ -643,9 +617,9 @@ public class CapacitorSQLite {
     /**
      * IsDatabaseEncrypted
      *
-     * @param dbName
+     * @param dbName database name
      * @return Boolean
-     * @throws Exception
+     * @throws Exception message
      */
     public Boolean isDatabaseEncrypted(String dbName) throws Exception {
         dbName = getDatabaseName(dbName);
@@ -667,9 +641,8 @@ public class CapacitorSQLite {
     /**
      * IsNCDatabase
      *
-     * @param dbPath
+     * @param dbPath database path
      * @return Boolean
-     * @throws Exception
      */
     public Boolean isNCDatabase(String dbPath) {
         return uFile.isPathExists(dbPath);
@@ -678,17 +651,16 @@ public class CapacitorSQLite {
     /**
      * IsTableExists
      *
-     * @param dbName
-     * @param tableName
-     * @throws Exception
+     * @param dbName database name
+     * @param tableName table name
+     * @throws Exception message
      */
     public Boolean isTableExists(String dbName, String tableName, Boolean readonly) throws Exception {
         dbName = getDatabaseName(dbName);
         String connName = readonly ? "RO_" + dbName : "RW_" + dbName;
         Database db = dbDict.get(connName);
         if (db != null) {
-            boolean res = uJson.isTableExists(db, tableName);
-            return res;
+            return uJson.isTableExists(db, tableName);
         } else {
             String msg = "No available connection for database " + dbName;
             throw new Exception(msg);
@@ -698,8 +670,8 @@ public class CapacitorSQLite {
     /**
      * GetDatabaseList
      *
-     * @return JSArray
-     * @throws Exception
+     * @return JSArray database list
+     * @throws Exception message
      */
     public JSArray getDatabaseList() throws Exception {
         String[] listFiles = uFile.getListOfFiles(context);
@@ -718,8 +690,8 @@ public class CapacitorSQLite {
     /**
      * GetMigratableDbList
      *
-     * @return JSArray
-     * @throws Exception
+     * @return JSArray database list
+     * @throws Exception message
      */
     public JSArray getMigratableDbList(String folderPath) throws Exception {
         String[] listFiles = uMigrate.getMigratableList(context, folderPath);
@@ -738,28 +710,26 @@ public class CapacitorSQLite {
     /**
      * AddSQLiteSuffix
      *
-     * @param folderPath
-     * @throws Exception
+     * @param folderPath folder path
+     * @throws Exception message
      */
     public void addSQLiteSuffix(String folderPath, JSArray dbList) throws Exception {
         try {
             ArrayList<String> mDbList = uSqlite.stringJSArrayToArrayList(dbList);
             uMigrate.addSQLiteSuffix(context, folderPath, mDbList);
-            return;
         } catch (Exception e) {
             throw new Exception(e.getMessage());
         }
     }
 
     /**
-     * @param folderPath
-     * @throws Exception
+     * @param folderPath folder path
+     * @throws Exception message
      */
     public void deleteOldDatabases(String folderPath, JSArray dbList) throws Exception {
         try {
             ArrayList<String> mDbList = uSqlite.stringJSArrayToArrayList(dbList);
             uMigrate.deleteOldDatabases(context, folderPath, mDbList);
-            return;
         } catch (Exception e) {
             throw new Exception(e.getMessage());
         }
@@ -767,14 +737,13 @@ public class CapacitorSQLite {
 
     /**
      *
-     * @param folderPath
-     * @throws Exception
+     * @param folderPath folder path
+     * @throws Exception message
      */
     public void moveDatabasesAndAddSuffix(String folderPath, JSArray dbList) throws Exception {
         try {
             ArrayList<String> mDbList = uSqlite.stringJSArrayToArrayList(dbList);
             uMigrate.moveDatabasesAndAddSuffix(context, folderPath, mDbList);
-            return;
         } catch (Exception e) {
             throw new Exception(e.getMessage());
         }
@@ -783,10 +752,10 @@ public class CapacitorSQLite {
     /**
      * Execute
      *
-     * @param dbName
-     * @param statements
-     * @return
-     * @throws Exception
+     * @param dbName Database name
+     * @param statements a bench of statement
+     * @return JSObject changes
+     * @throws Exception message
      */
     public JSObject execute(String dbName, String statements, Boolean transaction, Boolean readonly) throws Exception {
         dbName = getDatabaseName(dbName);
@@ -800,8 +769,7 @@ public class CapacitorSQLite {
                 // convert string in string[]
                 String[] sqlCmdArray = uSqlite.getStatementsArray(statements);
                 try {
-                    JSObject res = db.execute(sqlCmdArray, transaction);
-                    return res;
+                    return db.execute(sqlCmdArray, transaction);
                 } catch (Exception e) {
                     throw new Exception(e.getMessage());
                 }
@@ -818,12 +786,12 @@ public class CapacitorSQLite {
     /**
      * ExecuteSet
      *
-     * @param dbName
-     * @param set
-     * @return
-     * @throws Exception
+     * @param dbName database name
+     * @param set Set containing statements and values
+     * @return JSObject changes, lastId, values when RETURNING
+     * @throws Exception message
      */
-    public JSObject executeSet(String dbName, JSArray set, Boolean transaction, Boolean readonly) throws Exception {
+    public JSObject executeSet(String dbName, JSArray set, Boolean transaction, Boolean readonly, String returnMode) throws Exception {
         dbName = getDatabaseName(dbName);
         String connName = "RW_" + dbName;
         Database db = dbDict.get(connName);
@@ -833,8 +801,7 @@ public class CapacitorSQLite {
             }
             if (!db.isNCDB() && db.isOpen()) {
                 try {
-                    JSObject res = db.executeSet(set, transaction);
-                    return res;
+                    return db.executeSet(set, transaction, returnMode);
                 } catch (Exception e) {
                     throw new Exception(e.getMessage());
                 }
@@ -851,13 +818,14 @@ public class CapacitorSQLite {
     /**
      * Run
      *
-     * @param dbName
-     * @param statement
-     * @param values
-     * @return
-     * @throws Exception
+     * @param dbName Database name
+     * @param statement SQLite statement
+     * @param values SQLite values if any
+     * @return JSObject changes, lastId, values when RETURNING
+     * @throws Exception message
      */
-    public JSObject run(String dbName, String statement, JSArray values, Boolean transaction, Boolean readonly) throws Exception {
+    public JSObject run(String dbName, String statement, JSArray values, Boolean transaction, Boolean readonly, String returnMode)
+        throws Exception {
         JSObject res;
         dbName = getDatabaseName(dbName);
         String connName = "RW_" + dbName;
@@ -869,17 +837,16 @@ public class CapacitorSQLite {
             if (!db.isNCDB() && db.isOpen()) {
                 if (values.length() > 0) {
                     try {
+                        //                        returnMode = "no";
                         ArrayList<Object> arrValues = uSqlite.objectJSArrayToArrayList(values);
-                        res = db.runSQL(statement, arrValues, transaction);
+                        res = db.runSQL(statement, arrValues, transaction, returnMode);
                         return res;
-                    } catch (JSONException e) {
-                        throw new Exception(e.getMessage());
                     } catch (Exception e) {
                         throw new Exception(e.getMessage());
                     }
                 } else {
                     try {
-                        res = db.runSQL(statement, null, transaction);
+                        res = db.runSQL(statement, null, transaction, returnMode);
                         return res;
                     } catch (Exception e) {
                         throw new Exception(e.getMessage());
@@ -898,11 +865,11 @@ public class CapacitorSQLite {
     /**
      * Query
      *
-     * @param dbName
-     * @param statement
-     * @param values
-     * @return
-     * @throws Exception
+     * @param dbName Database name
+     * @param statement SQLite statement
+     * @param values SQLite values if any
+     * @return JSArray
+     * @throws Exception message
      */
     public JSArray query(String dbName, String statement, JSArray values, Boolean readonly) throws Exception {
         JSArray res;
@@ -916,14 +883,12 @@ public class CapacitorSQLite {
                         ArrayList<Object> arrValues = uSqlite.objectJSArrayToArrayList(values);
                         res = db.selectSQL(statement, arrValues);
                         return res;
-                    } catch (JSONException e) {
-                        throw new Exception(e.getMessage());
                     } catch (Exception e) {
                         throw new Exception(e.getMessage());
                     }
                 } else {
                     try {
-                        res = db.selectSQL(statement, new ArrayList<Object>());
+                        res = db.selectSQL(statement, new ArrayList<>());
                         return res;
                     } catch (Exception e) {
                         throw new Exception(e.getMessage());
@@ -975,8 +940,7 @@ public class CapacitorSQLite {
         String connName = readonly ? "RO_" + dbName : "RW_" + dbName;
         Database db = dbDict.get(connName);
         if (db != null) {
-            Boolean isOpen = db.isOpen();
-            return isOpen;
+            return db.isOpen();
         } else {
             String msg = "No available connection for database " + dbName;
             throw new Exception(msg);
@@ -993,7 +957,6 @@ public class CapacitorSQLite {
             }
             try {
                 db.deleteDB(dbName + "SQLite.db");
-                return;
             } catch (Exception e) {
                 throw new Exception(e.getMessage());
             }
@@ -1016,8 +979,7 @@ public class CapacitorSQLite {
                     String msg = "CreateSyncTable: db not opened";
                     throw new Exception(msg);
                 }
-                JSObject res = db.createSyncTable();
-                return res;
+                return db.createSyncTable();
             } catch (Exception e) {
                 throw new Exception(e.getMessage());
             }
@@ -1041,7 +1003,6 @@ public class CapacitorSQLite {
                     throw new Exception(msg);
                 }
                 db.setSyncDate(syncDate);
-                return;
             } catch (Exception e) {
                 throw new Exception(e.getMessage());
             }
@@ -1061,8 +1022,7 @@ public class CapacitorSQLite {
                     String msg = "GetSyncDate: db not opened";
                     throw new Exception(msg);
                 }
-                long syncDate = db.getSyncDate();
-                return syncDate;
+                return db.getSyncDate();
             } catch (Exception e) {
                 throw new Exception(e.getMessage());
             }
@@ -1076,7 +1036,7 @@ public class CapacitorSQLite {
         Dictionary<Integer, JSONObject> upgDict = new Hashtable<>();
 
         for (int i = 0; i < upgrade.length(); i++) {
-            JSONObject upgObj = null;
+            JSONObject upgObj;
             try {
                 upgObj = (JSONObject) upgrade.get(i);
                 if (upgObj == null || !upgObj.has("toVersion") || !upgObj.has("statements")) {
@@ -1103,8 +1063,7 @@ public class CapacitorSQLite {
         try {
             JSObject jsonObject = new JSObject(parsingData);
             JsonSQLite jsonSQL = new JsonSQLite();
-            Boolean isValid = jsonSQL.isJsonSQLite(jsonObject, isEncryption);
-            return isValid;
+            return jsonSQL.isJsonSQLite(jsonObject, isEncryption);
         } catch (Exception e) {
             throw new Exception(e.getMessage());
         }
@@ -1113,14 +1072,20 @@ public class CapacitorSQLite {
     public JSObject importFromJson(String parsingData) throws Exception {
         try {
             JSObject jsonObject = new JSObject(parsingData);
+            if (jsonObject.has("expData")) {
+                // Decrypt the data
+                // test decrypt to be removed
+                JSObject decryptJson = UtilsEncryption.decryptJSONObject(this.context, jsonObject.getString("expData"));
+                jsonObject = decryptJson;
+            }
             JsonSQLite jsonSQL = new JsonSQLite();
-            Boolean isValid = jsonSQL.isJsonSQLite(jsonObject, isEncryption);
+            boolean isValid = jsonSQL.isJsonSQLite(jsonObject, isEncryption);
             if (!isValid) {
                 String msg = "Stringify Json Object not Valid";
                 throw new Exception(msg);
             }
             String dbName = getDatabaseName(jsonSQL.getDatabase());
-            dbName = new StringBuilder(dbName).append("SQLite.db").toString();
+            dbName = dbName + "SQLite.db";
             Integer dbVersion = jsonSQL.getVersion();
             String mode = jsonSQL.getMode();
             Boolean overwrite = jsonSQL.getOverwrite();
@@ -1161,7 +1126,7 @@ public class CapacitorSQLite {
                         msg += "version lower than" + curVersion;
                         throw new Exception(msg);
                     }
-                    if (curVersion == dbVersion) {
+                    if (curVersion.equals(dbVersion)) {
                         JSObject result = new JSObject();
                         result.put("changes", Integer.valueOf(0));
                         return result;
@@ -1169,11 +1134,11 @@ public class CapacitorSQLite {
                 }
                 JSObject res = db.importFromJson(jsonSQL);
                 db.close();
-                if (res.getInteger("changes") == Integer.valueOf(-1)) {
+                if (!Objects.equals(res.getInteger("changes"), -1)) {
+                    return res;
+                } else {
                     String msg = "importFromJson: import JsonObject not successful";
                     throw new Exception(msg);
-                } else {
-                    return res;
                 }
             }
         } catch (Exception e) {
@@ -1196,6 +1161,8 @@ public class CapacitorSQLite {
                 if (ret.length() == 0) {
                     String msg = "ExportToJson: : return Object is empty " + "No data to synchronize";
                     throw new Exception(msg);
+                } else if (ret.length() == 1 && ret.has("expData")) {
+                    return ret;
                 } else if (ret.length() == 5 || ret.length() == 6 || ret.length() == 7) {
                     return ret;
                 } else {
@@ -1226,7 +1193,6 @@ public class CapacitorSQLite {
                     throw new Exception(msg);
                 }
                 db.deleteExportedRows();
-                return;
             } catch (Exception e) {
                 String msg = "DeleteExportedRows " + e.getMessage();
                 throw new Exception(msg);
@@ -1241,7 +1207,6 @@ public class CapacitorSQLite {
         String msg = "copy failed : ";
         try {
             uFile.copyFromAssetsToDatabase(context, overwrite);
-            return;
         } catch (Exception e) {
             msg += e.getMessage();
             throw new Exception(msg);
@@ -1264,10 +1229,7 @@ public class CapacitorSQLite {
             Enumeration<String> connections = dbDict.keys();
             while (connections.hasMoreElements()) {
                 String dbName = connections.nextElement();
-                Boolean readonly = false;
-                if (dbName.substring(0, 3).equals("RO_")) {
-                    readonly = true;
-                }
+                boolean readonly = dbName.startsWith("RO_");
                 dbName = dbName.substring(3);
                 closeConnection(dbName, readonly);
             }