fixup! fixup! fixup! fixup! Fix clear DB when logout in web

linagora · Oct 2, 2023 · a69bb0b · a69bb0b
1 parent 18e4cb2
commit a69bb0b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/lib/src/client.dart b/lib/src/client.dart
@@ -109,7 +109,7 @@ class Client extends MatrixApi {
 
   final Duration sendTimelineEventTimeout;
 
-  bool _supportDeleteCache = false;
+  bool _supportDeleteCollections = false;
 
   Future<MatrixImageFileResizedResponse?> Function(
       MatrixImageFileResizeArguments)? customImageResizer;
@@ -1035,7 +1035,7 @@ class Client extends MatrixApi {
       await abortSync();
       await dispose(closeDatabase: false);
 
-      final export = await database!.exportDump(supportDeleteCache: _supportDeleteCache);
+      final export = await database!.exportDump(supportDeleteCollections: _supportDeleteCollections);
 
       await clear();
       return export;
@@ -1056,7 +1056,7 @@ class Client extends MatrixApi {
 
     _database ??= await databaseBuilder!.call(this);
 
-    final success = await database!.importDump(export, supportDeleteCache: _supportDeleteCache);
+    final success = await database!.importDump(export, supportDeleteCollections: _supportDeleteCollections);
 
     if (success) {
       // closing including DB
@@ -1590,7 +1590,7 @@ class Client extends MatrixApi {
     Logs().outputEvents.clear();
     try {
       await abortSync();
-      await database?.clear(supportDeleteCache: _supportDeleteCache);
+      await database?.clear(supportDeleteCollections: _supportDeleteCollections);
       _backgroundSync = true;
     } catch (e, s) {
       Logs().e('Unable to clear database', e, s);
@@ -3055,7 +3055,7 @@ class Client extends MatrixApi {
         Logs().e('Unable to migrate inbound group sessions!', e, s);
       }
 
-      await legacyDatabase.clear(supportDeleteCache: _supportDeleteCache);
+      await legacyDatabase.clear(supportDeleteCollections: _supportDeleteCollections);
     }
     await legacyDatabase?.close();
     _initLock = false;
@@ -3067,8 +3067,8 @@ class Client extends MatrixApi {
     }
   }
 
-  set isSupportDeleteCache(bool supportDeleteCache) {
-    _supportDeleteCache = supportDeleteCache;
+  set issupportDeleteCollections(bool supportDeleteCollections) {
+    _supportDeleteCollections = supportDeleteCollections;
   }
 }
 

diff --git a/lib/src/database/database_api.dart b/lib/src/database/database_api.dart
@@ -74,7 +74,7 @@ abstract class DatabaseApi {
   Future<void> clearCache();
 
   Future<void> clear({
-    bool supportDeleteCache = false,
+    bool supportDeleteCollections = false,
   });
 
   Future<User?> getUser(String userId, Room room);
@@ -311,10 +311,10 @@ abstract class DatabaseApi {
 
   Future<void> transaction(Future<void> Function() action);
 
-  Future<String> exportDump({bool supportDeleteCache = false});
+  Future<String> exportDump({bool supportDeleteCollections = false});
 
   Future<bool> importDump(
     String export, {
-    bool supportDeleteCache = false,
+    bool supportDeleteCollections = false,
   });
 }
diff --git a/lib/src/database/hive_collections_database.dart b/lib/src/database/hive_collections_database.dart
@@ -243,7 +243,7 @@ class HiveCollectionsDatabase extends DatabaseApi {
 
   @override
   Future<void> clear({
-    bool supportDeleteCache = false,
+    bool supportDeleteCollections = false,
   }) =>
       transaction(() async {
         await _clientBox.clear();
@@ -265,7 +265,7 @@ class HiveCollectionsDatabase extends DatabaseApi {
         await _eventsBox.clear();
         await _seenDeviceIdsBox.clear();
         await _seenDeviceKeysBox.clear();
-        if (!supportDeleteCache) {
+        if (supportDeleteCollections) {
           await _collection.deleteFromDisk();
         }
       });
@@ -1491,7 +1491,7 @@ class HiveCollectionsDatabase extends DatabaseApi {
   }
 
   @override
-  Future<String> exportDump({bool supportDeleteCache = false}) async {
+  Future<String> exportDump({bool supportDeleteCollections = false}) async {
     final dataMap = {
       _clientBoxName: await _clientBox.getAllValues(),
       _accountDataBoxName: await _accountDataBox.getAllValues(),
@@ -1518,17 +1518,17 @@ class HiveCollectionsDatabase extends DatabaseApi {
       _seenDeviceKeysBoxName: await _seenDeviceKeysBox.getAllValues(),
     };
     final json = jsonEncode(dataMap);
-    await clear(supportDeleteCache: supportDeleteCache);
+    await clear(supportDeleteCollections: supportDeleteCollections);
     return json;
   }
 
   @override
   Future<bool> importDump(
     String export, {
-    bool supportDeleteCache = false,
+    bool supportDeleteCollections = false,
   }) async {
     try {
-      await clear(supportDeleteCache: supportDeleteCache);
+      await clear(supportDeleteCollections: supportDeleteCollections);
       await open();
       final json = Map.from(jsonDecode(export)).cast<String, Map>();
       for (final key in json[_clientBoxName]!.keys) {

diff --git a/lib/src/database/hive_database.dart b/lib/src/database/hive_database.dart
@@ -268,7 +268,7 @@ class FamedlySdkHiveDatabase extends DatabaseApi {
 
   @override
   Future<void> clear({
-    bool supportDeleteCache = false,
+    bool supportDeleteCollections = false,
   }) async {
     Logs().i('Clear and close hive database...');
     await _actionOnAllBoxes((box) async {
@@ -1453,15 +1453,15 @@ class FamedlySdkHiveDatabase extends DatabaseApi {
   }
 
   @override
-  Future<String> exportDump({bool supportDeleteCache = false}) {
+  Future<String> exportDump({bool supportDeleteCollections = false}) {
     // see no need to implement this in a deprecated part
     throw UnimplementedError();
   }
 
   @override
   Future<bool> importDump(
     String export, {
-    bool supportDeleteCache = false,
+    bool supportDeleteCollections = false,
   }) {
     // see no need to implement this in a deprecated part
     throw UnimplementedError();