@capacitor-community/sqlite 5.0.2 → 5.0.3-2.test1

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

@@ -30,6 +30,7 @@ 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;

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

@@ -797,12 +797,15 @@ public class Database {
                             row.put(colName, c.getDouble(index));
                             break;
                         case FIELD_TYPE_BLOB:
-//                            row.put(colName, c.getBlob(index));
-                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                            byte[] blobVal = c.getBlob(index);
+                            JSArray arr = this._uSqlite.ByteArrayToJSArray(blobVal);
+                            row.put(colName, arr);
+                            /*                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                                 row.put(colName, Base64.getEncoder().encodeToString(c.getBlob(index)));
                             } else {
                                 row.put(colName, JSONObject.NULL);
                             }
+*/
                             break;
                         case FIELD_TYPE_NULL:
                             row.put(colName, JSONObject.NULL);

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

@@ -558,13 +558,12 @@ public class ImportFromJson {
                     // Delete
                     isUpdate = false;
                     Object key = tColNames.get(0);
-                    StringBuilder sbQuery =
-                        new StringBuilder("DELETE FROM ")
-                            .append(tableName)
-                            .append(" WHERE ")
-                            .append(tColNames.get(0))
-                            .append(" = ");
-                    
+                    StringBuilder sbQuery = new StringBuilder("DELETE FROM ")
+                        .append(tableName)
+                        .append(" WHERE ")
+                        .append(tColNames.get(0))
+                        .append(" = ");
+
                     if (key instanceof Integer) sbQuery.append(row.get(0)).append(";");
                     if (key instanceof String) sbQuery.append("'").append(row.get(0)).append("';");
                     stmt = sbQuery.toString();

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

@@ -9,7 +9,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -39,12 +38,12 @@ public class UtilsJson {
                 JSObject namesTypes = getTableColumnNamesTypes(db, tableName);
                 ArrayList<String> colNames = new ArrayList<>();
                 if (namesTypes.has("names")) {
-                  colNames = getColumnNames(namesTypes.get("names"));
+                    colNames = getColumnNames(namesTypes.get("names"));
                 } else {
-                  throw new Exception("isLastModified: Table " + tableName + " no names");
+                    throw new Exception("isLastModified: Table " + tableName + " no names");
                 }
 
-                if (colNames.size() > 0  &&  colNames.contains("last_modified")) {
+                if (colNames.size() > 0 && colNames.contains("last_modified")) {
                     ret = true;
                     break;
                 }
@@ -55,18 +54,18 @@ public class UtilsJson {
         }
     }
 
-  /**
-   * Get Column name's list
-   * @param obj
-   * @return
-   */
+    /**
+     * Get Column name's list
+     * @param obj
+     * @return
+     */
     public ArrayList<String> getColumnNames(Object obj) {
+        ArrayList<String> colNames = new ArrayList<>();
+        if (obj instanceof ArrayList) colNames = (ArrayList<String>) obj;
 
-      ArrayList<String> colNames = new ArrayList<>();
-      if (obj instanceof ArrayList) colNames = (ArrayList<String>) obj;
-
-      return colNames;
+        return colNames;
     }
+
     /**
      * Check existence of sql_deleted column
      * @param db
@@ -84,7 +83,7 @@ public class UtilsJson {
                 JSObject namesTypes = getTableColumnNamesTypes(db, tableName);
                 ArrayList<String> colNames = new ArrayList<>();
                 if (namesTypes.has("names")) {
-                  colNames = getColumnNames(namesTypes.get("names"));
+                    colNames = getColumnNames(namesTypes.get("names"));
                 } else {
                     throw new Exception("isSqlDeleted: Table " + tableName + " no names");
                 }

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

@@ -3,12 +3,15 @@ package com.getcapacitor.community.database.sqlite.SQLite;
 import android.util.Log;
 import androidx.sqlite.db.SupportSQLiteDatabase;
 import com.getcapacitor.JSArray;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import net.sqlcipher.Cursor;
 import org.json.JSONArray;
 import org.json.JSONException;
+import org.json.JSONObject;
 
 public class UtilsSQLite {
 
@@ -90,7 +93,7 @@ public class UtilsSQLite {
         Object[] objectList = listArray.toArray();
         String[] retArray = Arrays.copyOf(objectList, objectList.length, String[].class);
 
-//        String[] retArray =  listArray.toArray(new String[listArray.size()]);
+        //        String[] retArray =  listArray.toArray(new String[listArray.size()]);
         return retArray;
     }
 
@@ -108,7 +111,7 @@ public class UtilsSQLite {
 
     private List<String> trimArray(List<String> listArray) {
         List<String> trimmedStrings = new ArrayList<String>();
-        for(String s : listArray) {
+        for (String s : listArray) {
             trimmedStrings.add(s.trim());
         }
         return trimmedStrings;
@@ -120,7 +123,17 @@ public class UtilsSQLite {
             if (jsArray.isNull(i)) {
                 list.add(null);
             } else {
-                list.add(jsArray.get(i));
+                Object obj = jsArray.get(i);
+                if (obj.getClass() == JSONObject.class) {
+                    if (((JSONObject) obj).getString("type").equals("Buffer")) {
+                        byte[] bArr = JSONArrayToByteArray(((JSONObject) obj).getJSONArray("data"));
+                        list.add(bArr);
+                    } else {
+                        throw new JSONException("Object not implemented");
+                    }
+                } else {
+                    list.add(obj);
+                }
             }
         }
         return list;
@@ -139,6 +152,14 @@ public class UtilsSQLite {
         return list;
     }
 
+    public byte[] JSONArrayToByteArray(JSONArray arr) throws JSONException {
+        byte[] bArr = new byte[arr.length()];
+        for (int i = 0; i < arr.length(); i++) {
+            bArr[i] = (byte) (((int) arr.get(i)) & 0xFF);
+        }
+        return bArr;
+    }
+
     public Boolean parse(Object mVar) {
         boolean ret = false;
         if (mVar instanceof JSONArray) {
@@ -146,4 +167,25 @@ public class UtilsSQLite {
         }
         return ret;
     }
+
+    public int ByteToInt(byte BVal) {
+        String comb;
+        int out = 0;
+        comb = BVal + "";
+        out = Integer.parseInt(comb);
+        // Get Unsigned Int
+        if (out < 0) {
+            out += 256;
+        }
+        return out;
+    }
+
+    public JSArray ByteArrayToJSArray(byte[] BArr) {
+        JSArray arr = new JSArray();
+
+        for (int i = 0; i < BArr.length; i++) {
+            arr.put(ByteToInt(BArr[i]));
+        }
+        return arr;
+    }
 }