Respect storageJson option when creating client

Author: neelkanth-kaushik

packages/core/lib/client.dart

@@ -19,7 +19,10 @@ Analytics createClient(Configuration configuration) {
     configuration = setFlushPolicies(configuration, defaultFlushPolicies);
   }
 
-  final analytics = Analytics(configuration, storeFactory());
+  final analytics = Analytics(
+    configuration,
+    storeFactory(storageJson: configuration.storageJson ?? true),
+  );
 
   if (configuration.debug) {
     analytics.addPlugin(EventLogger());

packages/core/lib/state.dart

@@ -162,52 +162,39 @@ abstract class PersistedState<T> implements AsyncStateNotifier<T> {
   void init(ErrorHandler errorHandler, bool storageJson) {
     this._errorHandler = errorHandler;
     addListener((state) {
-      // Only persist state if storageJson is true
-      if (storageJson) {
-        if (_persistance != null) {
-          _hasUpdated = true;
-        } else {
-          _persistance = _store
-              .setPersisted(_key, toJson(state))
-              .whenComplete(_whenPersistenceComplete);
-        }
+      if (_persistance != null) {
+        _hasUpdated = true;
+      } else {
+        print("storageJson = $storageJson");
+        _persistance = storageJson
+            ? _store
+                .setPersisted(_key, toJson(state))
+                .whenComplete(_whenPersistenceComplete)
+            : null;
       }
     });
     _store.ready.then<void>((_) async {
-      // If storage is disabled, delete any existing files to prevent data leakage
-      if (!storageJson) {
-        try {
-          await _store.deletePersisted(_key);
-        } catch (e) {
-          // Ignore deletion errors, as the file might not exist
-        }
-      }
-      
       Map<String, dynamic>? rawV;
-      // Only read from storage if storageJson is true
-      if (storageJson) {
-        try {
-          rawV = await _store.getPersisted(_key);
-        } on FormatException catch (e) {
-          // Addressing https://github.com/segmentio/analytics_flutter/issues/74
-          // File corruption should be less likely with removal of async code in writes
-          // Existing corrupted files are cleaned up here without failing initialization
-          _store.setPersisted(_key, {});
-          log("Clean file $_key with format error", kind: LogFilterKind.warning);
-          final wrappedError = ErrorLoadingStorage(e);
-          errorHandler(wrappedError);
-        }
+      try {
+        rawV = await _store.getPersisted(_key);
+      } on FormatException catch (e) {
+        // Addressing https://github.com/segmentio/analytics_flutter/issues/74
+        // File corruption should be less likely with removal of async code in writes
+        // Existing corrupted files are cleaned up here without failing initialization
+        _store.setPersisted(_key, {});
+        log("Clean file $_key with format error", kind: LogFilterKind.warning);
+        final wrappedError = ErrorLoadingStorage(e);
+        errorHandler(wrappedError);
       }
       T v;
 
       if (rawV == null) {
         final init = await _initialiser();
-        // Only persist if storageJson is true
-        if (storageJson) {
-          _persistance = _store
-              .setPersisted(_key, toJson(init))
-              .whenComplete(_whenPersistenceComplete);
-        }
+        _persistance = storageJson
+            ? _store
+                .setPersisted(_key, toJson(init))
+                .whenComplete(_whenPersistenceComplete)
+            : null;
         _notifier.nonNullState = init;
         v = init;
       } else {

packages/core/lib/utils/store/io.dart

@@ -9,8 +9,11 @@ import 'package:segment_analytics/utils/store/store.dart';
 import 'package:path_provider/path_provider.dart';
 
 class StoreImpl with Store {
+  final bool storageJson;
+  StoreImpl({this.storageJson = true});
   @override
   Future<Map<String, dynamic>?> getPersisted(String key) {
+    if (!storageJson) return Future.value(null);
     return _readFile(key);
   }
 
@@ -19,11 +22,13 @@ class StoreImpl with Store {
 
   @override
   Future setPersisted(String key, Map<String, dynamic> value) {
+    if (!storageJson) return Future.value();
     return _writeFile(key, value);
   }
 
   @override
   Future deletePersisted(String key) async {
+    if (!storageJson) return;
     final file = File(await _fileName(key));
     if (await file.exists()) {
       await file.delete();

packages/core/lib/utils/store/store.dart

@@ -12,6 +12,6 @@ mixin Store {
   void dispose();
 }
 
-StoreImpl storeFactory() {
-  return StoreImpl();
+StoreImpl storeFactory({bool storageJson = true}) {
+  return StoreImpl(storageJson: storageJson);
 }

packages/core/lib/utils/store/web.dart

@@ -5,10 +5,13 @@ import 'package:segment_analytics/utils/store/store.dart';
 import 'package:web/web.dart' as web;
 
 class StoreImpl implements Store {
+  final bool storageJson;
+  StoreImpl({this.storageJson = true});
   web.Storage get localStorage => web.window.localStorage;
 
   @override
   Future<Map<String, dynamic>?> getPersisted(String key) {
+    if (!storageJson) return Future.value(null);
     return _readFromStorage(key);
   }
 
@@ -17,12 +20,14 @@ class StoreImpl implements Store {
 
   @override
   Future setPersisted(String key, Map<String, dynamic> value) {
+    if (!storageJson) return Future.value();
     _writeToStorage(key, value);
     return Future.value();
   }
 
   @override
   Future deletePersisted(String key) {
+    if (!storageJson) return Future.value();
     localStorage.removeItem(_getFileName(key));
     return Future.value();
   }