Fixed: async gap error

webreinvent · Jun 14, 2024 · 3e72079 · 3e72079
1 parent 8912080
commit 3e72079
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 21 deletions.
diff --git a/lib/vaahextendflutter/services/storage/local/services/base_service.dart b/lib/vaahextendflutter/services/storage/local/services/base_service.dart
@@ -1,5 +1,5 @@
 abstract class LocalStorageService {
-  Future<void> add(String collectionName);
+  void add(String collectionName);
 
   Future<void> create({String collectionName, required String key, required String value});
 

diff --git a/lib/vaahextendflutter/services/storage/local/services/flutter_secure_storage.dart b/lib/vaahextendflutter/services/storage/local/services/flutter_secure_storage.dart
@@ -8,7 +8,7 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
   final _storage = const FlutterSecureStorage();
 
   @override
-  Future<void> add(String name) async {}
+  void add(String name) {}
 
   @override
   Future<void> create({

diff --git a/lib/vaahextendflutter/services/storage/local/services/hive.dart b/lib/vaahextendflutter/services/storage/local/services/hive.dart
@@ -4,13 +4,13 @@ import 'base_service.dart';
 
 /// A class implementing LocalStorageService interface using Hive as storage backend.
 class LocalStorageWithHive implements LocalStorageService {
-  final Map<String, Box> _collections = {};
+  final Map<String, Future<Box>> _collections = {};
 
   @override
-  Future<void> add(String collectionName) async {
+  void add(String collectionName) {
     assert(!_collections.containsKey(collectionName), 'The Box "$collectionName" already exists');
 
-    _collections[collectionName] = await Hive.openBox(collectionName);
+    _collections[collectionName] = Hive.openBox(collectionName);
   }
 
   @override
@@ -20,9 +20,11 @@ class LocalStorageWithHive implements LocalStorageService {
     required String value,
   }) async {
     assert(_collections.containsKey(collectionName), 'The Box "$collectionName" does not exists.');
-    assert(_collections[collectionName]!.containsKey(key), 'The key ($key) already exists.');
 
-    await _collections[collectionName]!.put(key, value);
+    Box box = await _collections[collectionName]!;
+    assert(!box.containsKey(key), 'The key "$key" already exists.');
+
+    await box.put(key, value);
   }
 
   @override
@@ -36,7 +38,8 @@ class LocalStorageWithHive implements LocalStorageService {
   Future<String?> read({String collectionName = '', required String key}) async {
     assert(_collections.containsKey(collectionName), 'The Box "$collectionName" does not exists.');
 
-    String? result = _collections[collectionName]!.get(key);
+    Box box = await _collections[collectionName]!;
+    String? result = box.get(key);
     return result;
   }
 
@@ -45,8 +48,6 @@ class LocalStorageWithHive implements LocalStorageService {
     String collectionName = '',
     required List<String> keys,
   }) async {
-    assert(_collections.containsKey(collectionName), 'The Box "$collectionName" does not exists.');
-
     if (keys.isNotEmpty) {
       Map<String, String?> result = {};
       for (String k in keys) {
@@ -62,9 +63,13 @@ class LocalStorageWithHive implements LocalStorageService {
   Future<Map<String, String?>> readAll({String collectionName = ''}) async {
     assert(_collections.containsKey(collectionName), 'The Box "$collectionName" does not exists.');
 
-    Map<String, String?> result = _collections[collectionName]!
-        .toMap()
-        .map((key, value) => MapEntry(key.toString(), value?.toString()));
+    Box box = await _collections[collectionName]!;
+    Map<String, String?> result = box.toMap().map(
+          (key, value) => MapEntry(
+            key.toString(),
+            value?.toString(),
+          ),
+        );
     return result;
   }
 
@@ -75,9 +80,11 @@ class LocalStorageWithHive implements LocalStorageService {
     required String value,
   }) async {
     assert(_collections.containsKey(collectionName), 'The Box "$collectionName" does not exists.');
-    assert(!_collections[collectionName]!.containsKey(key), 'The key ($key) does not exist.');
 
-    _collections[collectionName]!.put(key, value);
+    Box box = await _collections[collectionName]!;
+    assert(box.containsKey(key), 'The key "$key" does not exist.');
+
+    box.put(key, value);
   }
 
   @override
@@ -95,7 +102,8 @@ class LocalStorageWithHive implements LocalStorageService {
   }) async {
     assert(_collections.containsKey(collectionName), 'The Box "$collectionName" does not exists.');
 
-    _collections[collectionName]!.put(key, value);
+    Box box = await _collections[collectionName]!;
+    box.put(key, value);
   }
 
   @override
@@ -112,22 +120,25 @@ class LocalStorageWithHive implements LocalStorageService {
   Future<void> delete({String collectionName = '', dynamic key}) async {
     assert(_collections.containsKey(collectionName), 'The Box "$collectionName" does not exists.');
 
-    await _collections[collectionName]!.delete(key);
+    Box box = await _collections[collectionName]!;
+    await box.delete(key);
   }
 
   @override
   Future<void> deleteMany({String collectionName = '', List<String> keys = const []}) async {
     assert(_collections.containsKey(collectionName), 'The Box "$collectionName" does not exists.');
 
+    Box box = await _collections[collectionName]!;
     if (keys.isNotEmpty) {
-      _collections[collectionName]!.deleteAll(keys);
+      await box.deleteAll(keys);
     }
   }
 
   @override
   Future<void> deleteAll({String collectionName = ''}) async {
     assert(_collections.containsKey(collectionName), 'The Box "$collectionName" does not exists.');
 
-    await _collections[collectionName]!.clear();
+    Box box = await _collections[collectionName]!;
+    await box.clear();
   }
 }
diff --git a/lib/vaahextendflutter/services/storage/local/services/no_op_storage.dart b/lib/vaahextendflutter/services/storage/local/services/no_op_storage.dart
@@ -3,7 +3,7 @@ import 'base_service.dart';
 /// A placeholder storage class when [LocalStorageType.none] is selected in env.dart.
 class NoOpStorage implements LocalStorageService {
   @override
-  Future<void> add(String name) async {}
+  void add(String name) {}
 
   @override
   Future<void> create({

diff --git a/lib/vaahextendflutter/services/storage/local/storage.dart b/lib/vaahextendflutter/services/storage/local/storage.dart
@@ -31,7 +31,7 @@ abstract class LocalStorage {
   /// LocalStorage.add('posts');
   /// //used only with Hive
   /// ```
-  Future<void> add(String collectionName) {
+  void add(String collectionName) {
     return _instanceLocal.add(collectionName);
   }