strata-storage 2.2.0 → 2.4.0

package/android/src/main/java/com/strata/storage/EncryptedStorage.java

@@ -8,6 +8,10 @@ import androidx.security.crypto.MasterKey;
 import java.util.Set;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.List;
+import java.util.ArrayList;
+import org.json.JSONObject;
+import org.json.JSONArray;
 
 public class EncryptedStorage {
     private SharedPreferences encryptedPrefs;
@@ -42,9 +46,31 @@ public class EncryptedStorage {
         }
     }
     
-    public boolean set(String key, String value) {
-        editor.putString(key, value);
-        return editor.commit();
+    public boolean set(String key, Object value) {
+        try {
+            String stringValue;
+            if (value instanceof String) {
+                stringValue = (String) value;
+            } else {
+                // Convert complex objects to JSON
+                if (value instanceof JSONObject) {
+                    stringValue = ((JSONObject) value).toString();
+                } else {
+                    // Use helper method to convert object to JSON string
+                    try {
+                        stringValue = objectToJsonString(value);
+                    } catch (Exception e) {
+                        // Fallback to string representation
+                        stringValue = value.toString();
+                    }
+                }
+            }
+            editor.putString(key, stringValue);
+            return editor.commit();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
     }
     
     public String get(String key) {
@@ -79,19 +105,19 @@ public class EncryptedStorage {
         return editor.commit();
     }
     
-    public Set<String> keys() {
+    public List<String> keys() {
         return keys(null);
     }
     
-    public Set<String> keys(String pattern) {
+    public List<String> keys(String pattern) {
         Set<String> allKeys = encryptedPrefs.getAll().keySet();
         
         if (pattern == null) {
-            return allKeys;
+            return new ArrayList<>(allKeys);
         }
         
         // Filter keys by pattern
-        Set<String> filteredKeys = new HashSet<>();
+        List<String> filteredKeys = new ArrayList<>();
         for (String key : allKeys) {
             if (key.startsWith(pattern) || key.contains(pattern)) {
                 filteredKeys.add(key);
@@ -103,4 +129,81 @@ public class EncryptedStorage {
     public boolean has(String key) {
         return encryptedPrefs.contains(key);
     }
+    
+    public SizeInfo size() {
+        Map<String, ?> all = encryptedPrefs.getAll();
+        long totalSize = 0;
+        int count = all.size();
+        
+        for (Map.Entry<String, ?> entry : all.entrySet()) {
+            String key = entry.getKey();
+            Object value = entry.getValue();
+            
+            // Estimate size (key + value in bytes)
+            totalSize += key.getBytes().length;
+            if (value != null) {
+                totalSize += value.toString().getBytes().length;
+            }
+        }
+        
+        return new SizeInfo(totalSize, count);
+    }
+    
+    /**
+     * Convert an object to JSON string using reflection
+     */
+    private String objectToJsonString(Object obj) throws Exception {
+        if (obj == null) {
+            return "null";
+        }
+        
+        if (obj instanceof String || obj instanceof Number || obj instanceof Boolean) {
+            return obj.toString();
+        }
+        
+        if (obj instanceof Map) {
+            JSONObject jsonObj = new JSONObject();
+            Map<?, ?> map = (Map<?, ?>) obj;
+            for (Map.Entry<?, ?> entry : map.entrySet()) {
+                String key = entry.getKey().toString();
+                jsonObj.put(key, entry.getValue());
+            }
+            return jsonObj.toString();
+        }
+        
+        if (obj instanceof List || obj.getClass().isArray()) {
+            JSONArray jsonArray = new JSONArray();
+            if (obj instanceof List) {
+                List<?> list = (List<?>) obj;
+                for (Object item : list) {
+                    jsonArray.put(item);
+                }
+            } else {
+                Object[] array = (Object[]) obj;
+                for (Object item : array) {
+                    jsonArray.put(item);
+                }
+            }
+            return jsonArray.toString();
+        }
+        
+        // For other objects, create a simple JSON object with their string representation
+        JSONObject jsonObj = new JSONObject();
+        jsonObj.put("value", obj.toString());
+        jsonObj.put("type", obj.getClass().getSimpleName());
+        return jsonObj.toString();
+    }
+    
+    /**
+     * Size information class
+     */
+    public static class SizeInfo {
+        public final long total;
+        public final int count;
+        
+        public SizeInfo(long total, int count) {
+            this.total = total;
+            this.count = count;
+        }
+    }
 }

package/android/src/main/java/com/strata/storage/SQLiteStorage.java

@@ -9,6 +9,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.HashMap;
 import java.util.Map;
+import org.json.JSONObject;
+import org.json.JSONArray;
+import java.nio.charset.StandardCharsets;
 
 public class SQLiteStorage extends SQLiteOpenHelper {
     private static final int DATABASE_VERSION = 1;
@@ -50,13 +53,40 @@ public class SQLiteStorage extends SQLiteOpenHelper {
         onCreate(db);
     }
     
-    public boolean set(String key, byte[] value, Long expires, String tags, String metadata) {
+    public boolean set(String key, Object value, Long expires, String tags, String metadata) {
+        byte[] valueBytes;
+        
+        try {
+            if (value instanceof byte[]) {
+                valueBytes = (byte[]) value;
+            } else if (value instanceof String) {
+                valueBytes = ((String) value).getBytes(StandardCharsets.UTF_8);
+            } else {
+                // Convert complex objects to JSON then to bytes
+                String json;
+                if (value instanceof JSONObject) {
+                    json = ((JSONObject) value).toString();
+                } else {
+                    // Use helper method to convert object to JSON string
+                    try {
+                        json = objectToJsonString(value);
+                    } catch (Exception jsonEx) {
+                        // Fallback to string representation
+                        json = value.toString();
+                    }
+                }
+                valueBytes = json.getBytes(StandardCharsets.UTF_8);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
         SQLiteDatabase db = this.getWritableDatabase();
         ContentValues values = new ContentValues();
         
         long now = System.currentTimeMillis();
         values.put(KEY_ID, key);
-        values.put(KEY_VALUE, value);
+        values.put(KEY_VALUE, valueBytes);
         values.put(KEY_CREATED, now);
         values.put(KEY_UPDATED, now);
         
@@ -75,6 +105,11 @@ public class SQLiteStorage extends SQLiteOpenHelper {
         return result != -1;
     }
     
+    // Convenience method for simple Object values
+    public boolean set(String key, Object value) {
+        return set(key, value, null, null, null);
+    }
+    
     public Map<String, Object> get(String key) {
         SQLiteDatabase db = this.getReadableDatabase();
         Cursor cursor = db.query(TABLE_NAME, null, KEY_ID + "=?",
@@ -174,4 +209,79 @@ public class SQLiteStorage extends SQLiteOpenHelper {
         db.close();
         return exists;
     }
+    
+    public SizeInfo size() {
+        SQLiteDatabase db = this.getReadableDatabase();
+        Cursor cursor = db.rawQuery("SELECT COUNT(*), SUM(LENGTH(" + KEY_VALUE + ")) FROM " + TABLE_NAME, null);
+        
+        long totalSize = 0;
+        int count = 0;
+        
+        if (cursor != null && cursor.moveToFirst()) {
+            count = cursor.getInt(0);
+            totalSize = cursor.getLong(1);
+            cursor.close();
+        }
+        
+        db.close();
+        return new SizeInfo(totalSize, count);
+    }
+    
+    /**
+     * Convert an object to JSON string using reflection
+     */
+    private String objectToJsonString(Object obj) throws Exception {
+        if (obj == null) {
+            return "null";
+        }
+        
+        if (obj instanceof String || obj instanceof Number || obj instanceof Boolean) {
+            return obj.toString();
+        }
+        
+        if (obj instanceof Map) {
+            JSONObject jsonObj = new JSONObject();
+            Map<?, ?> map = (Map<?, ?>) obj;
+            for (Map.Entry<?, ?> entry : map.entrySet()) {
+                String key = entry.getKey().toString();
+                jsonObj.put(key, entry.getValue());
+            }
+            return jsonObj.toString();
+        }
+        
+        if (obj instanceof List || obj.getClass().isArray()) {
+            JSONArray jsonArray = new JSONArray();
+            if (obj instanceof List) {
+                List<?> list = (List<?>) obj;
+                for (Object item : list) {
+                    jsonArray.put(item);
+                }
+            } else {
+                Object[] array = (Object[]) obj;
+                for (Object item : array) {
+                    jsonArray.put(item);
+                }
+            }
+            return jsonArray.toString();
+        }
+        
+        // For other objects, create a simple JSON object with their string representation
+        JSONObject jsonObj = new JSONObject();
+        jsonObj.put("value", obj.toString());
+        jsonObj.put("type", obj.getClass().getSimpleName());
+        return jsonObj.toString();
+    }
+    
+    /**
+     * Size information class
+     */
+    public static class SizeInfo {
+        public final long total;
+        public final int count;
+        
+        public SizeInfo(long total, int count) {
+            this.total = total;
+            this.count = count;
+        }
+    }
 }

package/android/src/main/java/com/strata/storage/SharedPreferencesStorage.java

@@ -5,6 +5,8 @@ import android.content.SharedPreferences;
 import java.util.Map;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.List;
+import java.util.ArrayList;
 import org.json.JSONObject;
 import org.json.JSONArray;
 
@@ -38,9 +40,18 @@ public class SharedPreferencesStorage {
                 editor.putStringSet(key, (Set<String>) value);
             } else {
                 // Convert complex objects to JSON
-                String json = value instanceof JSONObject ? 
-                    ((JSONObject) value).toString() : 
-                    new JSONObject(value).toString();
+                String json;
+                if (value instanceof JSONObject) {
+                    json = ((JSONObject) value).toString();
+                } else {
+                    // Use reflection to convert object to JSON string
+                    try {
+                        json = objectToJsonString(value);
+                    } catch (Exception e) {
+                        // Fallback to string representation
+                        json = value.toString();
+                    }
+                }
                 editor.putString(key, json);
             }
             return editor.commit();
@@ -83,19 +94,19 @@ public class SharedPreferencesStorage {
         return editor.commit();
     }
     
-    public Set<String> keys() {
+    public List<String> keys() {
         return keys(null);
     }
     
-    public Set<String> keys(String pattern) {
+    public List<String> keys(String pattern) {
         Set<String> allKeys = prefs.getAll().keySet();
         
         if (pattern == null) {
-            return allKeys;
+            return new ArrayList<>(allKeys);
         }
         
         // Filter keys by pattern
-        Set<String> filteredKeys = new HashSet<>();
+        List<String> filteredKeys = new ArrayList<>();
         for (String key : allKeys) {
             if (key.startsWith(pattern) || key.contains(pattern)) {
                 filteredKeys.add(key);
@@ -111,4 +122,81 @@ public class SharedPreferencesStorage {
     public Map<String, ?> getAll() {
         return prefs.getAll();
     }
+    
+    public SizeInfo size() {
+        Map<String, ?> all = prefs.getAll();
+        long totalSize = 0;
+        int count = all.size();
+        
+        for (Map.Entry<String, ?> entry : all.entrySet()) {
+            String key = entry.getKey();
+            Object value = entry.getValue();
+            
+            // Estimate size (key + value in bytes)
+            totalSize += key.getBytes().length;
+            if (value != null) {
+                totalSize += value.toString().getBytes().length;
+            }
+        }
+        
+        return new SizeInfo(totalSize, count);
+    }
+    
+    /**
+     * Convert an object to JSON string using reflection
+     */
+    private String objectToJsonString(Object obj) throws Exception {
+        if (obj == null) {
+            return "null";
+        }
+        
+        if (obj instanceof String || obj instanceof Number || obj instanceof Boolean) {
+            return obj.toString();
+        }
+        
+        if (obj instanceof Map) {
+            JSONObject jsonObj = new JSONObject();
+            Map<?, ?> map = (Map<?, ?>) obj;
+            for (Map.Entry<?, ?> entry : map.entrySet()) {
+                String key = entry.getKey().toString();
+                jsonObj.put(key, entry.getValue());
+            }
+            return jsonObj.toString();
+        }
+        
+        if (obj instanceof List || obj.getClass().isArray()) {
+            JSONArray jsonArray = new JSONArray();
+            if (obj instanceof List) {
+                List<?> list = (List<?>) obj;
+                for (Object item : list) {
+                    jsonArray.put(item);
+                }
+            } else {
+                Object[] array = (Object[]) obj;
+                for (Object item : array) {
+                    jsonArray.put(item);
+                }
+            }
+            return jsonArray.toString();
+        }
+        
+        // For other objects, create a simple JSON object with their string representation
+        JSONObject jsonObj = new JSONObject();
+        jsonObj.put("value", obj.toString());
+        jsonObj.put("type", obj.getClass().getSimpleName());
+        return jsonObj.toString();
+    }
+    
+    /**
+     * Size information class
+     */
+    public static class SizeInfo {
+        public final long total;
+        public final int count;
+        
+        public SizeInfo(long total, int count) {
+            this.total = total;
+            this.count = count;
+        }
+    }
 }

package/android/src/main/java/com/stratastorage/StrataStoragePlugin.java

@@ -11,7 +11,6 @@ import com.strata.storage.SQLiteStorage;
 import org.json.JSONArray;
 import org.json.JSONException;
 import java.util.List;
-import java.util.Set;
 
 /**
  * Main Capacitor plugin for Strata Storage
@@ -226,40 +225,31 @@ public class StrataStoragePlugin extends Plugin {
         String storage = call.getString("storage", "preferences");
         
         try {
-            SizeInfo sizeInfo = null;
+            JSObject result = new JSObject();
             
             switch (storage) {
                 case "secure":
-                    sizeInfo = encryptedStorage.size();
+                    EncryptedStorage.SizeInfo encryptedSizeInfo = encryptedStorage.size();
+                    result.put("total", encryptedSizeInfo.total);
+                    result.put("count", encryptedSizeInfo.count);
                     break;
                 case "sqlite":
-                    sizeInfo = sqliteStorage.size();
+                    SQLiteStorage.SizeInfo sqliteSizeInfo = sqliteStorage.size();
+                    result.put("total", sqliteSizeInfo.total);
+                    result.put("count", sqliteSizeInfo.count);
                     break;
                 case "preferences":
                 default:
-                    sizeInfo = sharedPrefsStorage.size();
+                    SharedPreferencesStorage.SizeInfo prefsSizeInfo = sharedPrefsStorage.size();
+                    result.put("total", prefsSizeInfo.total);
+                    result.put("count", prefsSizeInfo.count);
                     break;
             }
             
-            JSObject result = new JSObject();
-            result.put("total", sizeInfo.total);
-            result.put("count", sizeInfo.count);
             call.resolve(result);
         } catch (Exception e) {
             call.reject("Failed to get size", e);
         }
     }
     
-    /**
-     * Size information class
-     */
-    static class SizeInfo {
-        public final long total;
-        public final int count;
-        
-        public SizeInfo(long total, int count) {
-            this.total = total;
-            this.count = count;
-        }
-    }
 }

package/dist/android/src/main/java/com/strata/storage/EncryptedStorage.java

@@ -8,6 +8,10 @@ import androidx.security.crypto.MasterKey;
 import java.util.Set;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.List;
+import java.util.ArrayList;
+import org.json.JSONObject;
+import org.json.JSONArray;
 
 public class EncryptedStorage {
     private SharedPreferences encryptedPrefs;
@@ -42,9 +46,31 @@ public class EncryptedStorage {
         }
     }
     
-    public boolean set(String key, String value) {
-        editor.putString(key, value);
-        return editor.commit();
+    public boolean set(String key, Object value) {
+        try {
+            String stringValue;
+            if (value instanceof String) {
+                stringValue = (String) value;
+            } else {
+                // Convert complex objects to JSON
+                if (value instanceof JSONObject) {
+                    stringValue = ((JSONObject) value).toString();
+                } else {
+                    // Use helper method to convert object to JSON string
+                    try {
+                        stringValue = objectToJsonString(value);
+                    } catch (Exception e) {
+                        // Fallback to string representation
+                        stringValue = value.toString();
+                    }
+                }
+            }
+            editor.putString(key, stringValue);
+            return editor.commit();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
     }
     
     public String get(String key) {
@@ -79,19 +105,19 @@ public class EncryptedStorage {
         return editor.commit();
     }
     
-    public Set<String> keys() {
+    public List<String> keys() {
         return keys(null);
     }
     
-    public Set<String> keys(String pattern) {
+    public List<String> keys(String pattern) {
         Set<String> allKeys = encryptedPrefs.getAll().keySet();
         
         if (pattern == null) {
-            return allKeys;
+            return new ArrayList<>(allKeys);
         }
         
         // Filter keys by pattern
-        Set<String> filteredKeys = new HashSet<>();
+        List<String> filteredKeys = new ArrayList<>();
         for (String key : allKeys) {
             if (key.startsWith(pattern) || key.contains(pattern)) {
                 filteredKeys.add(key);
@@ -103,4 +129,81 @@ public class EncryptedStorage {
     public boolean has(String key) {
         return encryptedPrefs.contains(key);
     }
+    
+    public SizeInfo size() {
+        Map<String, ?> all = encryptedPrefs.getAll();
+        long totalSize = 0;
+        int count = all.size();
+        
+        for (Map.Entry<String, ?> entry : all.entrySet()) {
+            String key = entry.getKey();
+            Object value = entry.getValue();
+            
+            // Estimate size (key + value in bytes)
+            totalSize += key.getBytes().length;
+            if (value != null) {
+                totalSize += value.toString().getBytes().length;
+            }
+        }
+        
+        return new SizeInfo(totalSize, count);
+    }
+    
+    /**
+     * Convert an object to JSON string using reflection
+     */
+    private String objectToJsonString(Object obj) throws Exception {
+        if (obj == null) {
+            return "null";
+        }
+        
+        if (obj instanceof String || obj instanceof Number || obj instanceof Boolean) {
+            return obj.toString();
+        }
+        
+        if (obj instanceof Map) {
+            JSONObject jsonObj = new JSONObject();
+            Map<?, ?> map = (Map<?, ?>) obj;
+            for (Map.Entry<?, ?> entry : map.entrySet()) {
+                String key = entry.getKey().toString();
+                jsonObj.put(key, entry.getValue());
+            }
+            return jsonObj.toString();
+        }
+        
+        if (obj instanceof List || obj.getClass().isArray()) {
+            JSONArray jsonArray = new JSONArray();
+            if (obj instanceof List) {
+                List<?> list = (List<?>) obj;
+                for (Object item : list) {
+                    jsonArray.put(item);
+                }
+            } else {
+                Object[] array = (Object[]) obj;
+                for (Object item : array) {
+                    jsonArray.put(item);
+                }
+            }
+            return jsonArray.toString();
+        }
+        
+        // For other objects, create a simple JSON object with their string representation
+        JSONObject jsonObj = new JSONObject();
+        jsonObj.put("value", obj.toString());
+        jsonObj.put("type", obj.getClass().getSimpleName());
+        return jsonObj.toString();
+    }
+    
+    /**
+     * Size information class
+     */
+    public static class SizeInfo {
+        public final long total;
+        public final int count;
+        
+        public SizeInfo(long total, int count) {
+            this.total = total;
+            this.count = count;
+        }
+    }
 }