@capacitor-community/sqlite 5.0.5-2 → 5.0.6

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

@@ -6,11 +6,8 @@ import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
-import com.getcapacitor.PluginConfig;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
-import com.getcapacitor.community.database.sqlite.SQLite.Database;
-import com.getcapacitor.community.database.sqlite.SQLite.ImportExportJson.JsonSQLite;
 import com.getcapacitor.community.database.sqlite.SQLite.SqliteConfig;
 import java.util.Collections;
 import java.util.Dictionary;
@@ -24,11 +21,10 @@ import org.json.JSONObject;
 public class CapacitorSQLitePlugin extends Plugin {
 
     private static final String TAG = CapacitorSQLitePlugin.class.getName();
-    private Context context;
     private SqliteConfig config;
     private CapacitorSQLite implementation;
-    private Dictionary<String, Dictionary<Integer, JSONObject>> versionUpgrades = new Hashtable<>();
-    private RetHandler rHandler = new RetHandler();
+    private final Dictionary<String, Dictionary<Integer, JSONObject>> versionUpgrades = new Hashtable<>();
+    private final RetHandler rHandler = new RetHandler();
     private String passphrase = null;
     private String oldpassphrase = null;
     private String loadMessage = "";
@@ -38,15 +34,11 @@ public class CapacitorSQLitePlugin extends Plugin {
      * Load the context
      */
     public void load() {
-        context = getContext();
+        Context context = getContext();
         try {
             config = getSqliteConfig();
             AddObserversToNotificationCenter();
             implementation = new CapacitorSQLite(context, config);
-        } catch (JSONException e) {
-            implementation = null;
-            loadMessage = "CapacitorSQLitePlugin: " + e.getMessage();
-            Log.e(TAG, loadMessage);
         } catch (Exception e) {
             implementation = null;
             loadMessage = "CapacitorSQLitePlugin: " + e.getMessage();
@@ -58,7 +50,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * Echo Method
      * test the plugin
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void echo(PluginCall call) {
@@ -80,7 +72,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * IsSecretStored
      * Check if a secret has been stored
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void isSecretStored(PluginCall call) {
@@ -88,15 +80,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 Boolean res = implementation.isSecretStored();
                 rHandler.retResult(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "IsSecretStored: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -104,11 +93,11 @@ public class CapacitorSQLitePlugin extends Plugin {
      * SetEncryptionSecret
      * set a passphrase secret for a database
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void setEncryptionSecret(PluginCall call) {
-        String passphrase = null;
+        String passphrase;
         if (!call.getData().has("passphrase")) {
             String msg = "SetEncryptionSecret: Must provide a passphrase";
             rHandler.retResult(call, null, msg);
@@ -119,15 +108,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 implementation.setEncryptionSecret(passphrase);
                 rHandler.retResult(call, null, null);
-                return;
             } catch (Exception e) {
                 String msg = "SetEncryptionSecret: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -136,7 +122,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * change a passphrase secret for a database
      * with a new passphrase
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void changeEncryptionSecret(PluginCall call) {
@@ -156,24 +142,18 @@ public class CapacitorSQLitePlugin extends Plugin {
         if (implementation != null) {
             getActivity()
                 .runOnUiThread(
-                    new Runnable() {
-                        @Override
-                        public void run() {
-                            try {
-                                implementation.changeEncryptionSecret(call, passphrase, oldpassphrase);
-                                rHandler.retResult(call, null, null);
-                                return;
-                            } catch (Exception e) {
-                                String msg = "ChangeEncryptionSecret: " + e.getMessage();
-                                rHandler.retResult(call, null, msg);
-                                return;
-                            }
+                    () -> {
+                        try {
+                            implementation.changeEncryptionSecret(call, passphrase, oldpassphrase);
+                            rHandler.retResult(call, null, null);
+                        } catch (Exception e) {
+                            String msg = "ChangeEncryptionSecret: " + e.getMessage();
+                            rHandler.retResult(call, null, msg);
                         }
                     }
                 );
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -181,7 +161,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * ClearEncryptionSecret
      * clear the passphrase secret for a database
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void clearEncryptionSecret(PluginCall call) {
@@ -189,15 +169,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 implementation.clearEncryptionSecret();
                 rHandler.retResult(call, null, null);
-                return;
             } catch (Exception e) {
                 String msg = "ClearEncryptionSecret: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -205,11 +182,11 @@ public class CapacitorSQLitePlugin extends Plugin {
      * checkEncryptionSecret
      * check a passphrase secret against the stored passphrase
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void checkEncryptionSecret(PluginCall call) {
-        String passphrase = null;
+        String passphrase;
         if (!call.getData().has("passphrase")) {
             String msg = "checkEncryptionSecret: Must provide a passphrase";
             rHandler.retResult(call, null, msg);
@@ -220,22 +197,19 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 Boolean res = implementation.checkEncryptionSecret(passphrase);
                 rHandler.retResult(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "CheckEncryptionSecret: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
     @PluginMethod
     public void getNCDatabasePath(PluginCall call) {
-        String folderPath = null;
-        String dbName = null;
+        String folderPath;
+        String dbName;
         if (!call.getData().has("path")) {
             String msg = "getNCDatabasePath: Must provide a folder path";
             rHandler.retPath(call, null, msg);
@@ -252,15 +226,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 String databasePath = implementation.getNCDatabasePath(folderPath, dbName);
                 rHandler.retPath(call, databasePath, null);
-                return;
             } catch (Exception e) {
                 String msg = "getNCDatabasePath: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -268,32 +239,29 @@ public class CapacitorSQLitePlugin extends Plugin {
      * CreateNCConnection Method
      * Create a non-conformed connection to a database
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void createNCConnection(PluginCall call) {
-        String dbPath = null;
-        int dbVersion = Integer.valueOf(-1);
+        String dbPath;
+        int dbVersion;
         if (!call.getData().has("databasePath")) {
             String msg = "CreateNCConnection: Must provide a database path";
             rHandler.retResult(call, null, msg);
             return;
         }
-        dbPath = call.getString("databasePath");
-        dbVersion = call.getInt("version", 1);
         if (implementation != null) {
             try {
+                dbPath = call.getString("databasePath");
+                dbVersion = call.getInt("version", 1);
                 implementation.createNCConnection(dbPath, dbVersion);
                 rHandler.retResult(call, null, null);
-                return;
             } catch (Exception e) {
                 String msg = "CreateNCConnection: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -301,14 +269,13 @@ public class CapacitorSQLitePlugin extends Plugin {
      * CreateConnection Method
      * Create a connection to a database
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void createConnection(PluginCall call) {
-        String dbName = null;
-        int dbVersion = Integer.valueOf(-1);
-        String inMode = null;
-        JSObject ret = new JSObject();
+        String dbName;
+        int dbVersion;
+        String inMode;
         if (!call.getData().has("database")) {
             String msg = "CreateConnection: Must provide a database name";
             rHandler.retResult(call, null, msg);
@@ -338,15 +305,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 implementation.createConnection(dbName, encrypted, inMode, dbVersion, upgDict, readOnly);
                 rHandler.retResult(call, null, null);
-                return;
             } catch (Exception e) {
                 String msg = "CreateConnection: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -354,7 +318,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * Open Method
      * Open a database
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void open(PluginCall call) {
@@ -369,15 +333,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 implementation.open(dbName, readOnly);
                 rHandler.retResult(call, null, null);
-                return;
             } catch (Exception e) {
                 String msg = "Open: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -385,7 +346,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * Close Method
      * Close a Database
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void close(PluginCall call) {
@@ -400,15 +361,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 implementation.close(dbName, readOnly);
                 rHandler.retResult(call, null, null);
-                return;
             } catch (Exception e) {
                 String msg = "Close: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -416,7 +374,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * GetUrl Method
      * Get a database Url
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void getUrl(PluginCall call) {
@@ -431,15 +389,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 String res = implementation.getUrl(dbName, readOnly);
                 rHandler.retUrl(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "GetUrl: " + e.getMessage();
                 rHandler.retUrl(call, null, msg);
-                return;
             }
         } else {
             rHandler.retUrl(call, null, loadMessage);
-            return;
         }
     }
 
@@ -447,7 +402,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * GetVersion Method
      * Get a database Version
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void getVersion(PluginCall call) {
@@ -462,15 +417,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 Integer res = implementation.getVersion(dbName, readOnly);
                 rHandler.retVersion(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "GetVersion: " + e.getMessage();
                 rHandler.retVersion(call, null, msg);
-                return;
             }
         } else {
             rHandler.retVersion(call, null, loadMessage);
-            return;
         }
     }
 
@@ -478,7 +430,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * CloseNCConnection Method
      * Close a non-conformed database connection
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void closeNCConnection(PluginCall call) {
@@ -492,15 +444,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 implementation.closeNCConnection(dbPath);
                 rHandler.retResult(call, null, null);
-                return;
             } catch (Exception e) {
                 String msg = "CloseNCConnection: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -508,7 +457,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * CloseConnection Method
      * Close the connection to a database
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void closeConnection(PluginCall call) {
@@ -523,15 +472,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 implementation.closeConnection(dbName, readOnly);
                 rHandler.retResult(call, null, null);
-                return;
             } catch (Exception e) {
                 String msg = "CloseConnection: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -539,7 +485,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * CheckConnectionsConsistency Method
      * Check the connections consistency JS <=> Native
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void checkConnectionsConsistency(PluginCall call) {
@@ -564,15 +510,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 Boolean res = implementation.checkConnectionsConsistency(dbNames, openModes);
                 rHandler.retResult(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "CheckConnectionsConsistency: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -580,7 +523,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * IsDatabase Method
      * Check if the database file exists
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void isDatabase(PluginCall call) {
@@ -593,15 +536,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 Boolean res = implementation.isDatabase(dbName);
                 rHandler.retResult(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "isDatabase: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -609,7 +549,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * IsDatabaseEncrypted Method
      * Check if the database is encrypted
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void isDatabaseEncrypted(PluginCall call) {
@@ -622,15 +562,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 Boolean res = implementation.isDatabaseEncrypted(dbName);
                 rHandler.retResult(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "isDatabaseEncrypted: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -638,33 +575,31 @@ public class CapacitorSQLitePlugin extends Plugin {
      * isInConfigEncryption
      * Check if encryption is definrd in capacitor.config
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void isInConfigEncryption(PluginCall call) {
         Boolean res = this.config.getIsEncryption();
         rHandler.retResult(call, res, null);
-        return;
     }
 
     /**
      * isInConfigBiometricAuth
      * Check if biometric auth is definrd in capacitor.config
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void isInConfigBiometricAuth(PluginCall call) {
         Boolean res = this.config.getBiometricAuth();
         rHandler.retResult(call, res, null);
-        return;
     }
 
     /**
      * IsNCDatabase Method
      * Check if the database file exists
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void isNCDatabase(PluginCall call) {
@@ -677,15 +612,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 Boolean res = implementation.isNCDatabase(dbPath);
                 rHandler.retResult(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "isNCDatabase: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -693,7 +625,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * IsTableExists Method
      * Check if a table exists in a database
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void isTableExists(PluginCall call) {
@@ -712,15 +644,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 Boolean res = implementation.isTableExists(dbName, tableName, readOnly);
                 rHandler.retResult(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "isTableExists: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -734,15 +663,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 JSArray res = implementation.getDatabaseList();
                 rHandler.retValues(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "getDatabaseList: " + e.getMessage();
                 rHandler.retValues(call, new JSArray(), msg);
-                return;
             }
         } else {
             rHandler.retValues(call, new JSArray(), loadMessage);
-            return;
         }
     }
 
@@ -763,15 +689,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 JSArray res = implementation.getMigratableDbList(folderPath);
                 rHandler.retValues(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "getMigratableDbList: " + e.getMessage();
                 rHandler.retValues(call, new JSArray(), msg);
-                return;
             }
         } else {
             rHandler.retValues(call, new JSArray(), loadMessage);
-            return;
         }
     }
 
@@ -802,15 +725,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 implementation.addSQLiteSuffix(folderPath, dbList);
                 rHandler.retResult(call, null, null);
-                return;
             } catch (Exception e) {
                 String msg = "addSQLiteSuffix: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -841,15 +761,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 implementation.deleteOldDatabases(folderPath, dbList);
                 rHandler.retResult(call, null, null);
-                return;
             } catch (Exception e) {
                 String msg = "deleteOldDatabases: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -880,15 +797,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 implementation.moveDatabasesAndAddSuffix(folderPath, dbList);
                 rHandler.retResult(call, null, null);
-                return;
             } catch (Exception e) {
                 String msg = "moveDatabasesAndAddSuffix: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -896,7 +810,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * Execute Method
      * Execute SQL statements provided in a String
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void execute(PluginCall call) {
@@ -921,15 +835,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 JSObject res = implementation.execute(dbName, statements, transaction, readOnly);
                 rHandler.retChanges(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "Execute: " + e.getMessage();
                 rHandler.retChanges(call, retRes, msg);
-                return;
             }
         } else {
             rHandler.retChanges(call, retRes, loadMessage);
-            return;
         }
     }
 
@@ -937,8 +848,8 @@ public class CapacitorSQLitePlugin extends Plugin {
      * ExecuteSet Method
      * Execute a Set of raw sql statement
      *
-     * @param call
-     * @throws Exception
+     * @param call PluginCall
+     * @throws Exception message
      */
     @PluginMethod
     public void executeSet(PluginCall call) throws Exception {
@@ -980,19 +891,17 @@ public class CapacitorSQLitePlugin extends Plugin {
         }
         Boolean transaction = call.getBoolean("transaction", true);
         Boolean readOnly = call.getBoolean("readonly", false);
+        String returnMode = call.getString("returnMode", "no");
         if (implementation != null) {
             try {
-                JSObject res = implementation.executeSet(dbName, set, transaction, readOnly);
+                JSObject res = implementation.executeSet(dbName, set, transaction, readOnly, returnMode);
                 rHandler.retChanges(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "ExecuteSet: " + e.getMessage();
                 rHandler.retChanges(call, retRes, msg);
-                return;
             }
         } else {
             rHandler.retChanges(call, retRes, loadMessage);
-            return;
         }
     }
 
@@ -1000,7 +909,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * Run method
      * Execute a raw sql statement
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void run(PluginCall call) {
@@ -1031,19 +940,17 @@ public class CapacitorSQLitePlugin extends Plugin {
         }
         Boolean transaction = call.getBoolean("transaction", true);
         Boolean readOnly = call.getBoolean("readonly", false);
+        String returnMode = call.getString("returnMode", "no");
         if (implementation != null) {
             try {
-                JSObject res = implementation.run(dbName, statement, values, transaction, readOnly);
+                JSObject res = implementation.run(dbName, statement, values, transaction, readOnly, returnMode);
                 rHandler.retChanges(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "Run: " + e.getMessage();
                 rHandler.retChanges(call, retRes, msg);
-                return;
             }
         } else {
             rHandler.retChanges(call, retRes, loadMessage);
-            return;
         }
     }
 
@@ -1051,7 +958,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * Query Method
      * Execute an sql query
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void query(PluginCall call) {
@@ -1083,15 +990,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 JSArray res = implementation.query(dbName, statement, values, readOnly);
                 rHandler.retValues(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "Query: " + e.getMessage();
                 rHandler.retValues(call, new JSArray(), msg);
-                return;
             }
         } else {
             rHandler.retValues(call, new JSArray(), loadMessage);
-            return;
         }
     }
 
@@ -1108,15 +1012,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 JSArray res = implementation.getTableList(dbName, readOnly);
                 rHandler.retValues(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "GetTableList: " + e.getMessage();
                 rHandler.retValues(call, new JSArray(), msg);
-                return;
             }
         } else {
             rHandler.retValues(call, new JSArray(), loadMessage);
-            return;
         }
     }
 
@@ -1124,7 +1025,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * IsDBExists Method
      * check if the database exists on the database folder
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void isDBExists(PluginCall call) {
@@ -1140,15 +1041,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 Boolean res = implementation.isDBExists(dbName, readOnly);
                 rHandler.retResult(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "isDBExists: " + e.getMessage();
                 rHandler.retResult(call, false, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -1156,7 +1054,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * IsDBOpen Method
      * check if the database is opened
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void isDBOpen(PluginCall call) {
@@ -1171,15 +1069,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 Boolean res = implementation.isDBOpen(dbName, readOnly);
                 rHandler.retResult(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "isDBOpen: " + e.getMessage();
                 rHandler.retResult(call, false, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -1187,7 +1082,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * DeleteDatabase Method
      * delete a database from the database folder
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void deleteDatabase(PluginCall call) {
@@ -1202,15 +1097,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 implementation.deleteDatabase(dbName, readOnly);
                 rHandler.retResult(call, null, null);
-                return;
             } catch (Exception e) {
                 String msg = "deleteDatabase: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -1218,7 +1110,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * CreateSyncTable Method
      * Create the synchronization table
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void createSyncTable(PluginCall call) {
@@ -1235,15 +1127,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 JSObject res = implementation.createSyncTable(dbName, readOnly);
                 rHandler.retChanges(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "CreateSyncTable: " + e.getMessage();
                 rHandler.retChanges(call, retRes, msg);
-                return;
             }
         } else {
             rHandler.retChanges(call, retRes, loadMessage);
-            return;
         }
     }
 
@@ -1251,7 +1140,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * SetSyncDate Method
      * set the synchronization date
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void setSyncDate(PluginCall call) {
@@ -1273,15 +1162,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 implementation.setSyncDate(dbName, syncDate, readOnly);
                 rHandler.retResult(call, null, null);
-                return;
             } catch (Exception e) {
                 String msg = "SetSyncDate: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -1289,7 +1175,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * GetSyncDate Method
      * Get the synchronization date
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void getSyncDate(PluginCall call) {
@@ -1297,7 +1183,7 @@ public class CapacitorSQLitePlugin extends Plugin {
         if (!call.getData().has("database")) {
             String msg = "GetSyncDate : Must provide a database name";
             retRes.put("changes", Integer.valueOf(-1));
-            rHandler.retSyncDate(call, Long.valueOf(0), msg);
+            rHandler.retSyncDate(call, 0L, msg);
             return;
         }
         String dbName = call.getString("database");
@@ -1306,15 +1192,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 long syncDate = implementation.getSyncDate(dbName, readOnly);
                 rHandler.retSyncDate(call, syncDate, null);
-                return;
             } catch (Exception e) {
                 String msg = "GetSyncDate: " + e.getMessage();
-                rHandler.retSyncDate(call, Long.valueOf(0), msg);
-                return;
+                rHandler.retSyncDate(call, 0L, msg);
             }
         } else {
-            rHandler.retSyncDate(call, Long.valueOf(0), loadMessage);
-            return;
+            rHandler.retSyncDate(call, 0L, loadMessage);
         }
     }
 
@@ -1322,7 +1205,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * AddUpgradeStatement Method
      * Define an upgrade object when updating to a new version
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void addUpgradeStatement(PluginCall call) {
@@ -1360,15 +1243,12 @@ public class CapacitorSQLitePlugin extends Plugin {
                 }
 
                 rHandler.retResult(call, null, null);
-                return;
             } catch (Exception e) {
                 String msg = "AddUpgradeStatement: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -1376,7 +1256,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * IsJsonValid
      * Check the validity of a given Json object
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void isJsonValid(PluginCall call) {
@@ -1390,15 +1270,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 Boolean res = implementation.isJsonValid(parsingData);
                 rHandler.retResult(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "IsJsonValid: " + e.getMessage();
                 rHandler.retResult(call, false, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -1406,7 +1283,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * ImportFromJson Method
      * Import from a given Json object
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void importFromJson(PluginCall call) {
@@ -1422,15 +1299,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 JSObject res = implementation.importFromJson(parsingData);
                 rHandler.retChanges(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "ImportFromJson: " + e.getMessage();
                 rHandler.retChanges(call, retRes, msg);
-                return;
             }
         } else {
             rHandler.retChanges(call, retRes, loadMessage);
-            return;
         }
     }
 
@@ -1438,12 +1312,11 @@ public class CapacitorSQLitePlugin extends Plugin {
      * ExportToJson Method
      * Export the database to Json Object
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void exportToJson(PluginCall call) {
         JSObject retObj = new JSObject();
-        JsonSQLite retJson = new JsonSQLite();
         if (!call.getData().has("database")) {
             String msg = "ExportToJson: Must provide a database name";
             rHandler.retJSObject(call, retObj, msg);
@@ -1468,22 +1341,17 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 JSObject res = implementation.exportToJson(dbName, expMode, readOnly);
                 rHandler.retJSObject(call, res, null);
-                return;
             } catch (Exception e) {
                 String msg = "ExportToJson: " + e.getMessage();
                 rHandler.retJSObject(call, retObj, msg);
-                return;
             }
         } else {
             rHandler.retJSObject(call, retObj, loadMessage);
-            return;
         }
     }
 
     @PluginMethod
     public void deleteExportedRows(PluginCall call) {
-        JSObject retObj = new JSObject();
-        JsonSQLite retJson = new JsonSQLite();
         if (!call.getData().has("database")) {
             String msg = "DeleteExportedRows: Must provide a database name";
             rHandler.retResult(call, null, msg);
@@ -1495,15 +1363,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 implementation.deleteExportedRows(dbName, readOnly);
                 rHandler.retResult(call, null, null);
-                return;
             } catch (Exception e) {
                 String msg = "DeleteExportedRows: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -1511,7 +1376,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * CopyFromAssets
      * copy all databases from public/assets/databases to application folder
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void copyFromAssets(PluginCall call) {
@@ -1521,15 +1386,12 @@ public class CapacitorSQLitePlugin extends Plugin {
             try {
                 implementation.copyFromAssets(overwrite);
                 rHandler.retResult(call, null, null);
-                return;
             } catch (Exception e) {
                 String msg = "CopyFromAssets: " + e.getMessage();
                 rHandler.retResult(call, null, msg);
-                return;
             }
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -1537,7 +1399,7 @@ public class CapacitorSQLitePlugin extends Plugin {
      * GetFromHTTPRequest
      * get a database or a zipped database from HTTP Request
      *
-     * @param call
+     * @param call PluginCall
      */
     @PluginMethod
     public void getFromHTTPRequest(PluginCall call) {
@@ -1548,54 +1410,27 @@ public class CapacitorSQLitePlugin extends Plugin {
         }
         String url = call.getString("url");
         if (implementation != null) {
-            Runnable setHTTPRunnable = new Runnable() {
-                @Override
-                public void run() {
-                    android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);
-                    try {
-                        implementation.getFromHTTPRequest(url);
-                        getActivity()
-                            .runOnUiThread(
-                                new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        rHandler.retResult(call, null, null);
-                                        return;
-                                    }
-                                }
-                            );
-                    } catch (Exception e) {
-                        getActivity()
-                            .runOnUiThread(
-                                new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        String msg = "GetFromHTTPRequest: " + e.getMessage();
-                                        rHandler.retResult(call, null, msg);
-                                        return;
-                                    }
-                                }
-                            );
-                    }
+            Runnable setHTTPRunnable = () -> {
+                android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);
+                try {
+                    implementation.getFromHTTPRequest(url);
+                    getActivity().runOnUiThread(() -> rHandler.retResult(call, null, null));
+                } catch (Exception e) {
+                    getActivity()
+                        .runOnUiThread(
+                            () -> {
+                                String msg = "GetFromHTTPRequest: " + e.getMessage();
+                                rHandler.retResult(call, null, msg);
+                            }
+                        );
                 }
             };
             Thread myHttpThread = new Thread(setHTTPRunnable);
             myHttpThread.start();
             while (myHttpThread.isAlive());
             System.out.println("Thread Exiting!");
-            /*            try {
-                implementation.getFromHTTPRequest(url);
-                rHandler.retResult(call, null, null);
-                return;
-            } catch (Exception e) {
-                String msg = "GetFromHTTPRequest: " + e.getMessage();
-                rHandler.retResult(call, null, msg);
-                return;
-            }
-  */
         } else {
             rHandler.retResult(call, null, loadMessage);
-            return;
         }
     }
 
@@ -1610,7 +1445,6 @@ public class CapacitorSQLitePlugin extends Plugin {
                         JSObject data = new JSObject();
                         data.put("progress", this.getInfo().get("progress"));
                         notifyListeners("sqliteImportProgressEvent", data);
-                        return;
                     }
                 }
             );
@@ -1624,7 +1458,6 @@ public class CapacitorSQLitePlugin extends Plugin {
                         JSObject data = new JSObject();
                         data.put("progress", this.getInfo().get("progress"));
                         notifyListeners("sqliteExportProgressEvent", data);
-                        return;
                     }
                 }
             );
@@ -1639,7 +1472,6 @@ public class CapacitorSQLitePlugin extends Plugin {
                         data.put("result", this.getInfo().get("result"));
                         data.put("message", this.getInfo().get("message"));
                         notifyListeners("sqliteBiometricEvent", data);
-                        return;
                     }
                 }
             );
@@ -1648,11 +1480,11 @@ public class CapacitorSQLitePlugin extends Plugin {
     private SqliteConfig getSqliteConfig() throws JSONException {
         SqliteConfig config = new SqliteConfig();
         JSONObject pConfig = getConfig().getConfigJSON();
-        Boolean isEncryption = pConfig.has("androidIsEncryption") ? pConfig.getBoolean("androidIsEncryption") : config.getIsEncryption();
+        boolean isEncryption = pConfig.has("androidIsEncryption") ? pConfig.getBoolean("androidIsEncryption") : config.getIsEncryption();
         config.setIsEncryption(isEncryption);
         JSONObject androidBiometric = pConfig.has("androidBiometric") ? pConfig.getJSONObject("androidBiometric") : null;
         if (androidBiometric != null) {
-            Boolean biometricAuth = androidBiometric.has("biometricAuth") && isEncryption
+            boolean biometricAuth = androidBiometric.has("biometricAuth") && isEncryption
                 ? androidBiometric.getBoolean("biometricAuth")
                 : config.getBiometricAuth();
             config.setBiometricAuth(biometricAuth);