working rework

Author: Lama-Thematique

commet/lib/client/call_manager.dart

@@ -37,17 +37,14 @@ class CallManager {
       NotifyingList.empty(growable: true);
 
   CallManager(this.clientManager) {
-    clientManager.onClientAdded.stream.listen(_onClientAdded);
-    clientManager.onClientRemoved.stream.listen(_onClientRemoved);
+    clientManager.onClientAdded.listen(_onClientAdded);
   }
 
   Player? player;
   Player? muteSoundPlayer;
   Player? unmuteSoundPlayer;
 
-  void _onClientAdded(int index) {
-    var client = clientManager.clients[index];
-
+  void _onClientAdded(Client client) {
     var voip = client.getComponent<VoipComponent>();
     if (voip == null) {
       return;
@@ -57,8 +54,6 @@ class CallManager {
     voip.onSessionEnded.listen(onSessionEnded);
   }
 
-  void _onClientRemoved(StalePeerInfo event) {}
-
   void onClientSessionStarted(VoipSession event) {
     var room = event.client.getRoom(event.roomId);
     currentSessions.add(event);

commet/lib/client/client.dart

@@ -97,13 +97,13 @@ abstract class Client {
   List<Room> get singleRooms;
 
   /// Gets list of all rooms
-  List<Room> get rooms;
+  Iterable<Room> get rooms;
 
   /// Gets list of all spaces
-  List<Space> get spaces;
+  Iterable<Space> get spaces;
 
   /// Gets list of all currently known users
-  List<Peer> get peers;
+  Iterable<Peer> get peers;
 
   /// When a room is added, this will be called with the index of the new room
   Stream<Room> get onRoomAdded;

commet/lib/client/client_manager.dart

@@ -9,28 +9,34 @@ import 'package:commet/client/matrix/matrix_client.dart';
 import 'package:commet/client/stale_info.dart';
 import 'package:commet/client/tasks/client_connection_status_task.dart';
 import 'package:commet/main.dart';
-import 'package:commet/utils/notifying_list.dart';
+import 'package:commet/utils/notifying_map.dart';
+import 'package:commet/utils/notifying_sub_map.dart';
 
 class ClientManager {
-  final Map<String, Client> _clients = {};
+  final NotifyingMap<String, BaseRoom> _all_rooms = NotifyingMap();
 
-  final NotifyingList<Room> _rooms = NotifyingList.empty(growable: true);
+  final NotifyingMap<String, Client> _clients = NotifyingMap();
 
-  final NotifyingList<Space> _spaces = NotifyingList.empty(growable: true);
+  late final NotifyingMap<String, Room> _rooms = NotifyingSubMap(_all_rooms, null);
+
+  late final NotifyingMap<String, Space> _spaces = NotifyingSubMap(_all_rooms, null);
+
+  NotifyingMap<String, Room> get motifyingMapRoom => _rooms;
+  NotifyingMap<String, Space> get motifyingMapSpace => _spaces;
 
   final AlertManager alertManager = AlertManager();
   late CallManager callManager;
 
   late final DirectMessagesAggregator directMessages;
 
-  static ClientManager instance = ClientManager._();
+  static final ClientManager instance = ClientManager._();
 
   ClientManager._() {
     directMessages = DirectMessagesAggregator(this);
     callManager = CallManager(this);
   }
 
-  List<Room> get rooms => _rooms;
+  Iterable<Room> get rooms => _rooms.values;
 
   List<Room> singleRooms({Client? filterClient}) {
     var result = List<Room>.empty(growable: true);
@@ -59,7 +65,7 @@ class ClientManager {
     return result;
   }
 
-  List<Space> get spaces => _spaces;
+  Iterable<Space> get spaces => _spaces.values;
 
   final List<Client> _clientsList = List.empty(growable: true);
   final Map<Client, List<StreamSubscription>> _clientSubscriptions = {};
@@ -68,18 +74,17 @@ class ClientManager {
 
   late StreamController<void> onSync = StreamController.broadcast();
 
-  Stream<Room> get onRoomAdded => _rooms.onAdd;
+  Stream<Room> get onRoomAdded => _rooms.onAdd.map((e) => e.value);
 
-  Stream<Room> get onRoomRemoved => _rooms.onRemove;
+  Stream<Room> get onRoomRemoved => _rooms.onRemove.map((e) => e.value);
 
-  Stream<Space> get onSpaceAdded => _spaces.onAdd;
+  Stream<Space> get onSpaceAdded => _spaces.onAdd.map((e) => e.value);
 
-  Stream<Space> get onSpaceRemoved => _spaces.onRemove;
+  Stream<Space> get onSpaceRemoved => _spaces.onRemove.map((e) => e.value);
 
-  late StreamController<int> onClientAdded = StreamController.broadcast();
+  Stream<Client> get onClientAdded => _clients.onAdd.map((e) => e.value);
 
-  late StreamController<StalePeerInfo> onClientRemoved =
-      StreamController.broadcast();
+  Stream<Client> get onClientRemoved => _clients.onRemove.map((e) => e.value);
 
   late StreamController<Space> onSpaceUpdated = StreamController.broadcast();
   late StreamController<Space> onSpaceChildUpdated =
@@ -94,8 +99,6 @@ class ClientManager {
   //         previousValue + element.displayNotificationCount);
 
   static Future<ClientManager> init({bool isBackgroundService = false}) async {
-    instance = ClientManager._();
-
     await Future.wait([
       MatrixClient.loadFromDB(instance,
           isBackgroundService: isBackgroundService),
@@ -110,27 +113,16 @@ class ClientManager {
 
       _clientsList.add(client);
 
-      for (final e in client.rooms) {
-        _onClientAddedRoom(client, e);
-      }
-
       for (final e in client.spaces) {
         _addSpace(client, e);
       }
 
       _clientSubscriptions[client] = [
         client.onSync.listen((_) => _synced()),
-        client.onRoomAdded.listen((room) => _onClientAddedRoom(client, room)),
-        client.onRoomRemoved
-            .listen((room) => _onClientRemovedRoom(client, room)),
         client.onSpaceAdded.listen((space) => _addSpace(client, space)),
-        client.onSpaceRemoved
-            .listen((space) => _onClientRemovedSpace(client, space)),
         client.connectionStatusChanged.stream
             .listen((event) => _onClientConnectionStatusChanged(client, event)),
       ];
-
-      onClientAdded.add(_clients.length - 1);
     } catch (error) {}
   }
 
@@ -148,22 +140,9 @@ class ClientManager {
     }
   }
 
-  void _onClientAddedRoom(Client client, Room room) {
-    rooms.add(room);
-  }
-
-  void _onClientRemovedRoom(Client client, Room room) {
-    _rooms.remove(room);
-  }
-
-  void _onClientRemovedSpace(Client client, Space space) {
-    _spaces.remove(space);
-  }
-
   void _addSpace(Client client, Space space) {
     space.onUpdate.listen((_) => spaceUpdated(space));
     space.onChildRoomUpdated.listen((_) => spaceChildUpdated(space));
-    spaces.add(space);
   }
 
   void spaceUpdated(Space space) {
@@ -195,20 +174,19 @@ class ClientManager {
         identifier: client.self!.identifier,
         avatar: client.self!.avatar);
 
-    for (int i = rooms.length - 1; i >= 0; i--) {
-      if (rooms[i].client == client) {
-        rooms.removeAt(i);
+    for (final room in rooms) {
+      if (room.client == client) {
+        _rooms.remove(room.localId);
       }
     }
 
-    for (int i = spaces.length - 1; i >= 0; i--) {
-      if (spaces[i].client == client) {
-        spaces.removeAt(i);
+    for (final space in spaces) {
+      if (space.client == client) {
+        _spaces.remove(space.localId);
       }
     }
 
     await client.logout();
-    onClientRemoved.add(clientInfo);
     _clients.remove(client.identifier);
     _clientsList.removeAt(clientIndex);
   }

commet/lib/client/components/direct_messages/direct_message_aggregator.dart

@@ -1,9 +1,8 @@
 import 'dart:async';
 
+import 'package:commet/client/client.dart';
 import 'package:commet/client/client_manager.dart';
 import 'package:commet/client/components/direct_messages/direct_message_component.dart';
-import 'package:commet/client/room.dart';
-import 'package:commet/client/stale_info.dart';
 
 class DirectMessagesAggregator implements DirectMessagesInterface {
   ClientManager clientManager;
@@ -34,8 +33,8 @@ class DirectMessagesAggregator implements DirectMessagesInterface {
       comp?.onHighlightedRoomsListUpdated.listen(onHighlightedListUpdated);
     }
 
-    clientManager.onClientAdded.stream.listen(onClientAdded);
-    clientManager.onClientRemoved.stream.listen(onClientRemoved);
+    clientManager.onClientAdded.listen(onClientAdded);
+    clientManager.onClientRemoved.listen(onClientRemoved);
   }
 
   void updateDirectMessageRooms() {
@@ -61,8 +60,7 @@ class DirectMessagesAggregator implements DirectMessagesInterface {
     updateDirectMessageRooms();
   }
 
-  void onClientAdded(int index) {
-    var client = clientManager.clients[index];
+  void onClientAdded(Client client) {
     final comp = client.getComponent<DirectMessagesComponent>();
     if (comp != null) {
       comp.onRoomsListUpdated.listen(onClientUpdatedList);
@@ -71,7 +69,7 @@ class DirectMessagesAggregator implements DirectMessagesInterface {
     }
   }
 
-  void onClientRemoved(StalePeerInfo event) {
+  void onClientRemoved(Client client) {
     updateDirectMessageRooms();
   }
 

commet/lib/client/matrix/database/matrix_database_io.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:commet/config/app_config.dart';
 import 'package:commet/diagnostic/diagnostics.dart';
 import 'package:commet/utils/database/multiple_database_server.dart';
+import 'package:flutter/material.dart';
 import 'package:matrix/matrix.dart';
 import 'package:matrix_dart_sdk_drift_db/matrix_dart_sdk_drift_db.dart';
 import 'package:path/path.dart' as p;