fix: clear cache when clearing DB in MatrixSdkDatabase

famedly · Nov 26, 2024 · 673dc1e · 673dc1e
1 parent fd2f909
commit 673dc1e
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 9 deletions.
diff --git a/lib/src/database/indexeddb_box.dart b/lib/src/database/indexeddb_box.dart
@@ -213,20 +213,22 @@ class Box<V> {
     return;
   }
 
+  void clearCache() {
+    _cache.clear();
+    _cachedKeys = null;
+  }
+
   Future<void> clear([Transaction? txn]) async {
     if (boxCollection._txnCache != null) {
       boxCollection._txnCache!.add((txn) => clear(txn));
-      _cache.clear();
-      _cachedKeys = null;
+      clearCache();
       return;
     }
 
     txn ??= boxCollection._db.transaction(name, 'readwrite');
     final store = txn.objectStore(name);
     await store.clear();
-    _cache.clear();
-    _cachedKeys = null;
-    return;
+    clearCache();
   }
 
   V? _fromValue(Object? value) {

diff --git a/lib/src/database/matrix_sdk_database.dart b/lib/src/database/matrix_sdk_database.dart
@@ -338,7 +338,32 @@ class MatrixSdkDatabase extends DatabaseApi with DatabaseFileStorage {
   }
 
   @override
-  Future<void> clear() => _collection.clear();
+  Future<void> clear() async {
+    _clientBox.clearCache();
+    _accountDataBox.clearCache();
+    _roomsBox.clearCache();
+    _preloadRoomStateBox.clearCache();
+    _nonPreloadRoomStateBox.clearCache();
+    _roomMembersBox.clearCache();
+    _toDeviceQueueBox.clearCache();
+    _roomAccountDataBox.clearCache();
+    _inboundGroupSessionsBox.clearCache();
+    _inboundGroupSessionsUploadQueueBox.clearCache();
+    _outboundGroupSessionsBox.clearCache();
+    _olmSessionsBox.clearCache();
+    _userDeviceKeysBox.clearCache();
+    _userDeviceKeysOutdatedBox.clearCache();
+    _userCrossSigningKeysBox.clearCache();
+    _ssssCacheBox.clearCache();
+    _presencesBox.clearCache();
+    _timelineFragmentsBox.clearCache();
+    _eventsBox.clearCache();
+    _seenDeviceIdsBox.clearCache();
+    _seenDeviceKeysBox.clearCache();
+    _userProfilesBox.clearCache();
+
+    await _collection.clear();
+  }
 
   @override
   Future<void> clearCache() => transaction(() async {

diff --git a/lib/src/database/sqflite_box.dart b/lib/src/database/sqflite_box.dart
@@ -296,6 +296,11 @@ class Box<V> {
     return;
   }
 
+  void clearCache() {
+    _cache.clear();
+    _cachedKeys = null;
+  }
+
   Future<void> clear([Batch? txn]) async {
     txn ??= boxCollection._activeBatch;
 
@@ -305,8 +310,6 @@ class Box<V> {
       txn.delete(name);
     }
 
-    _cache.clear();
-    _cachedKeys = null;
-    return;
+    clearCache();
   }
 }