fix: clean tom db on logout

linagora · Sep 7, 2023 · 696bfd4 · 696bfd4
1 parent 93b616f
commit 696bfd4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/lib/data/hive/hive_collection_tom_database.dart b/lib/data/hive/hive_collection_tom_database.dart
@@ -72,11 +72,8 @@ class HiveCollectionToMDatabase {
     try {
       await db.open();
     } catch (e, s) {
-      Logs().w('Unable to open Hive. Delete database and storage key...', e, s);
-      const FlutterSecureStorage()
-          .delete(key: FlutterHiveCollectionsDatabase.cipherStorageKey);
+      Logs().w('Unable to open Hive.', e, s);
       await db.clear().catchError((_) {});
-      await Hive.deleteFromDisk();
       rethrow;
     }
     Logs().d('Hive for ToM is ready');
@@ -123,6 +120,10 @@ class HiveCollectionToMDatabase {
   }
 
   Future<void> clear() async {
+    Logs().w('Delete database and storage key...');
+    await const FlutterSecureStorage()
+        .delete(key: FlutterHiveCollectionsDatabase.cipherStorageKey);
     await tomConfigurationsBox.clear();
+    await Hive.deleteFromDisk();
   }
 }
diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart
@@ -5,6 +5,7 @@ import 'dart:io';
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:collection/collection.dart';
 import 'package:desktop_notifications/desktop_notifications.dart';
+import 'package:fluffychat/data/hive/hive_collection_tom_database.dart';
 import 'package:fluffychat/data/network/interceptor/authorization_interceptor.dart';
 import 'package:fluffychat/data/network/interceptor/dynamic_url_interceptor.dart';
 import 'package:fluffychat/di/global/get_it_initializer.dart';
@@ -341,7 +342,8 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
       hidPopup = true;
       await KeyVerificationDialog(request: request).show(navigatorContext!);
     });
-    onLoginStateChanged[name] ??= c.onLoginStateChanged.stream.listen((state) {
+    onLoginStateChanged[name] ??=
+        c.onLoginStateChanged.stream.listen((state) async {
       final loggedInWithMultipleClients = widget.clients.length > 1;
       if (loggedInWithMultipleClients && state != LoginState.loggedIn) {
         _cancelSubs(c.clientName);
@@ -353,13 +355,13 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
           ),
         );
 
-        if (state != LoginState.loggedIn) {
-          navigatorContext?.go('/rooms');
-        }
+        navigatorContext?.go('/rooms');
       } else {
         setUpToMServicesInLogin(c);
         if (state == LoginState.loggedIn) {
           navigatorContext?.go('/rooms');
+        } else {
+          await getIt.get<HiveCollectionToMDatabase>().clear();
         }
       }
     });