strata-storage 2.3.0 → 2.4.1

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

@@ -3,42 +3,52 @@ package com.strata.storage;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
+import android.util.Log;
 import androidx.security.crypto.EncryptedSharedPreferences;
 import androidx.security.crypto.MasterKey;
+import java.security.GeneralSecurityException;
+import java.io.IOException;
 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;
     private SharedPreferences.Editor editor;
     private static final String DEFAULT_NAME = "StrataSecureStorage";
     
-    public EncryptedStorage(Context context) throws Exception {
+    public EncryptedStorage(Context context) throws GeneralSecurityException, IOException {
         this(context, DEFAULT_NAME);
     }
-    
-    public EncryptedStorage(Context context, String name) throws Exception {
+
+    public EncryptedStorage(Context context, String name) throws GeneralSecurityException, IOException {
         String fileName = name != null ? name : DEFAULT_NAME;
-        
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            MasterKey masterKey = new MasterKey.Builder(context)
-                .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
-                .build();
-                
-            encryptedPrefs = EncryptedSharedPreferences.create(
-                context,
-                fileName,
-                masterKey,
-                EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
-                EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
-            );
-            
-            editor = encryptedPrefs.edit();
+            try {
+                MasterKey masterKey = new MasterKey.Builder(context)
+                    .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
+                    .build();
+
+                encryptedPrefs = EncryptedSharedPreferences.create(
+                    context,
+                    fileName,
+                    masterKey,
+                    EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+                    EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+                );
+
+                editor = encryptedPrefs.edit();
+            } catch (GeneralSecurityException | IOException e) {
+                Log.e("StrataStorage", "Failed to initialize encrypted storage", e);
+                throw e;
+            }
         } else {
+            Log.w("StrataStorage", "API < 23, using unencrypted SharedPreferences");
             // Fallback to regular SharedPreferences for older devices
             encryptedPrefs = context.getSharedPreferences(fileName, Context.MODE_PRIVATE);
             editor = encryptedPrefs.edit();
@@ -52,14 +62,22 @@ public class EncryptedStorage {
                 stringValue = (String) value;
             } else {
                 // Convert complex objects to JSON
-                stringValue = value instanceof JSONObject ? 
-                    ((JSONObject) value).toString() : 
-                    new JSONObject(value).toString();
+                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();
+            Log.e("StrataStorage", "Failed to set value in encrypted storage", e);
             return false;
         }
     }
@@ -140,6 +158,51 @@ public class EncryptedStorage {
         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
      */

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

@@ -5,11 +5,13 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.content.ContentValues;
+import android.util.Log;
 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 {
@@ -62,13 +64,22 @@ public class SQLiteStorage extends SQLiteOpenHelper {
                 valueBytes = ((String) value).getBytes(StandardCharsets.UTF_8);
             } else {
                 // Convert complex objects to JSON then to bytes
-                String json = value instanceof JSONObject ? 
-                    ((JSONObject) value).toString() : 
-                    new JSONObject(value).toString();
+                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();
+            Log.e("StrataStorage", "Failed to set value in SQLite", e);
             return false;
         }
         SQLiteDatabase db = this.getWritableDatabase();
@@ -102,36 +113,41 @@ public class SQLiteStorage extends SQLiteOpenHelper {
     
     public Map<String, Object> get(String key) {
         SQLiteDatabase db = this.getReadableDatabase();
-        Cursor cursor = db.query(TABLE_NAME, null, KEY_ID + "=?",
-                new String[]{key}, null, null, null, null);
-                
-        Map<String, Object> result = null;
-        if (cursor != null && cursor.moveToFirst()) {
-            result = new HashMap<>();
-            result.put("key", key);
-            result.put("value", cursor.getBlob(cursor.getColumnIndex(KEY_VALUE)));
-            result.put("created", cursor.getLong(cursor.getColumnIndex(KEY_CREATED)));
-            result.put("updated", cursor.getLong(cursor.getColumnIndex(KEY_UPDATED)));
-            
-            int expiresIndex = cursor.getColumnIndex(KEY_EXPIRES);
-            if (!cursor.isNull(expiresIndex)) {
-                result.put("expires", cursor.getLong(expiresIndex));
-            }
-            
-            int tagsIndex = cursor.getColumnIndex(KEY_TAGS);
-            if (!cursor.isNull(tagsIndex)) {
-                result.put("tags", cursor.getString(tagsIndex));
+        Cursor cursor = null;
+        try {
+            cursor = db.query(TABLE_NAME, null, KEY_ID + "=?",
+                    new String[]{key}, null, null, null, null);
+
+            Map<String, Object> result = null;
+            if (cursor != null && cursor.moveToFirst()) {
+                result = new HashMap<>();
+                result.put("key", key);
+                result.put("value", cursor.getBlob(cursor.getColumnIndex(KEY_VALUE)));
+                result.put("created", cursor.getLong(cursor.getColumnIndex(KEY_CREATED)));
+                result.put("updated", cursor.getLong(cursor.getColumnIndex(KEY_UPDATED)));
+
+                int expiresIndex = cursor.getColumnIndex(KEY_EXPIRES);
+                if (!cursor.isNull(expiresIndex)) {
+                    result.put("expires", cursor.getLong(expiresIndex));
+                }
+
+                int tagsIndex = cursor.getColumnIndex(KEY_TAGS);
+                if (!cursor.isNull(tagsIndex)) {
+                    result.put("tags", cursor.getString(tagsIndex));
+                }
+
+                int metadataIndex = cursor.getColumnIndex(KEY_METADATA);
+                if (!cursor.isNull(metadataIndex)) {
+                    result.put("metadata", cursor.getString(metadataIndex));
+                }
             }
-            
-            int metadataIndex = cursor.getColumnIndex(KEY_METADATA);
-            if (!cursor.isNull(metadataIndex)) {
-                result.put("metadata", cursor.getString(metadataIndex));
+            return result;
+        } finally {
+            if (cursor != null) {
+                cursor.close();
             }
-            
-            cursor.close();
+            db.close();
         }
-        db.close();
-        return result;
     }
     
     public boolean remove(String key) {
@@ -169,52 +185,118 @@ public class SQLiteStorage extends SQLiteOpenHelper {
         List<String> keys = new ArrayList<>();
         String selectQuery;
         String[] selectionArgs = null;
-        
+
         if (pattern != null) {
             selectQuery = "SELECT " + KEY_ID + " FROM " + TABLE_NAME + " WHERE " + KEY_ID + " LIKE ?";
-            selectionArgs = new String[]{"% " + pattern + "%"};
+            selectionArgs = new String[]{"%" + pattern + "%"};
         } else {
             selectQuery = "SELECT " + KEY_ID + " FROM " + TABLE_NAME;
         }
-        
+
         SQLiteDatabase db = this.getReadableDatabase();
-        Cursor cursor = db.rawQuery(selectQuery, selectionArgs);
-        
-        if (cursor.moveToFirst()) {
-            do {
-                keys.add(cursor.getString(0));
-            } while (cursor.moveToNext());
+        Cursor cursor = null;
+        try {
+            cursor = db.rawQuery(selectQuery, selectionArgs);
+
+            if (cursor != null && cursor.moveToFirst()) {
+                do {
+                    keys.add(cursor.getString(0));
+                } while (cursor.moveToNext());
+            }
+            return keys;
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+            db.close();
         }
-        cursor.close();
-        db.close();
-        return keys;
     }
     
     public boolean has(String key) {
         SQLiteDatabase db = this.getReadableDatabase();
-        Cursor cursor = db.query(TABLE_NAME, new String[]{KEY_ID}, KEY_ID + "=?",
-                new String[]{key}, null, null, null, null);
-        boolean exists = cursor.getCount() > 0;
-        cursor.close();
-        db.close();
-        return exists;
+        Cursor cursor = null;
+        try {
+            cursor = db.query(TABLE_NAME, new String[]{KEY_ID}, KEY_ID + "=?",
+                    new String[]{key}, null, null, null, null);
+            boolean exists = cursor != null && cursor.getCount() > 0;
+            return exists;
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+            db.close();
+        }
     }
     
     public SizeInfo size() {
         SQLiteDatabase db = this.getReadableDatabase();
-        Cursor cursor = db.rawQuery("SELECT COUNT(*), SUM(LENGTH(" + KEY_VALUE + ")) FROM " + TABLE_NAME, null);
+        Cursor cursor = null;
+        try {
+            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);
+                // Check for NULL values from SQL SUM function
+                if (!cursor.isNull(1)) {
+                    totalSize = cursor.getLong(1);
+                }
+            }
+
+            return new SizeInfo(totalSize, count);
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+            db.close();
+        }
+    }
+    
+    /**
+     * 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();
+        }
         
-        long totalSize = 0;
-        int count = 0;
+        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 (cursor != null && cursor.moveToFirst()) {
-            count = cursor.getInt(0);
-            totalSize = cursor.getLong(1);
-            cursor.close();
+        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();
         }
         
-        db.close();
-        return new SizeInfo(totalSize, count);
+        // 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();
     }
     
     /**

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

@@ -2,6 +2,7 @@ package com.strata.storage;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.util.Log;
 import java.util.Map;
 import java.util.Set;
 import java.util.HashSet;
@@ -37,17 +38,32 @@ public class SharedPreferencesStorage {
             } else if (value instanceof Boolean) {
                 editor.putBoolean(key, (Boolean) value);
             } else if (value instanceof Set) {
-                editor.putStringSet(key, (Set<String>) value);
+                // Safely convert to Set<String>
+                Set<?> rawSet = (Set<?>) value;
+                Set<String> stringSet = new HashSet<>();
+                for (Object item : rawSet) {
+                    stringSet.add(item != null ? item.toString() : "null");
+                }
+                editor.putStringSet(key, stringSet);
             } 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();
         } catch (Exception e) {
-            e.printStackTrace();
+            Log.e("StrataStorage", "Failed to set value in SharedPreferences", e);
             return false;
         }
     }
@@ -133,6 +149,51 @@ public class SharedPreferencesStorage {
         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
      */