TW-1356: fix multiple accout with same homeserver can login

linagora · May 31, 2024 · e1bdf11 · e1bdf11
1 parent f1e032a
commit e1bdf11
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/pages/homeserver_picker/homeserver_picker.dart b/lib/pages/homeserver_picker/homeserver_picker.dart
@@ -4,6 +4,7 @@ import 'package:collection/collection.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:fluffychat/presentation/mixins/connect_page_mixin.dart';
 import 'package:fluffychat/pages/homeserver_picker/homeserver_state.dart';
+import 'package:fluffychat/utils/client_manager.dart';
 import 'package:fluffychat/utils/dialog/twake_dialog.dart';
 import 'package:fluffychat/utils/twake_snackbar.dart';
 import 'package:flutter/foundation.dart';
@@ -145,9 +146,12 @@ class HomeserverPickerController extends State<HomeserverPicker>
         homeserver = Uri.https(homeserverController.text, '');
       }
       final matrix = Matrix.of(context);
-
+      final allHomeserverLoggedIn = (await ClientManager.getClients())
+          .map((client) => client.homeserver.toString())
+          .toList();
+      Logs().i('All homeservers: $allHomeserverLoggedIn');
       final homeserverExists =
-          homeserver == matrix.client.homeserver && matrix.client.isLogged();
+          allHomeserverLoggedIn.contains(homeserver.toString());
 
       if (homeserverExists &&
           !AppConfig.supportMultipleAccountsInTheSameHomeserver) {