Fix some UI sync issues due to NotifyingList bug

commet/lib/client/alert.dart

@@ -24,9 +24,9 @@ class Alert {
 class AlertManager {
   final NotifyingList<Alert> _alerts = NotifyingList.empty(growable: true);
 
-  Stream<int> get onAlertAdded => _alerts.onAdd;
+  Stream<Alert> get onAlertAdded => _alerts.onAdd;
 
-  Stream<int> get onAlertRemoved => _alerts.onRemove;
+  Stream<Alert> get onAlertRemoved => _alerts.onRemove;
 
   List<Alert> get alerts => _alerts;
 

commet/lib/client/client.dart

@@ -106,19 +106,19 @@ abstract class Client {
   List<Peer> get peers;
 
   /// When a room is added, this will be called with the index of the new room
-  Stream<int> get onRoomAdded;
+  Stream<Room> get onRoomAdded;
 
   /// When a space is added, this will be called with the index of the new space
-  Stream<int> get onSpaceAdded;
+  Stream<Space> get onSpaceAdded;
 
   /// When a room is removed, this will be called with the index of the room which was removed
-  Stream<int> get onRoomRemoved;
+  Stream<Room> get onRoomRemoved;
 
   /// When a space is removed, this will be called with the index of the space which was removed
-  Stream<int> get onSpaceRemoved;
+  Stream<Space> get onSpaceRemoved;
 
   /// When a new peer is found, this will be called with the index of the new peer
-  Stream<int> get onPeerAdded;
+  Stream<Peer> get onPeerAdded;
 
   /// When the client receives an update from the server, this will be called
   Stream<void> get onSync;

commet/lib/client/client_manager.dart

@@ -66,13 +66,13 @@ class ClientManager {
 
   late StreamController<void> onSync = StreamController.broadcast();
 
-  Stream<int> get onRoomAdded => _rooms.onAdd;
+  Stream<Room> get onRoomAdded => _rooms.onAdd;
 
-  Stream<int> get onRoomRemoved => _rooms.onRemove;
+  Stream<Room> get onRoomRemoved => _rooms.onRemove;
 
-  Stream<int> get onSpaceAdded => _spaces.onAdd;
+  Stream<Space> get onSpaceAdded => _spaces.onAdd;
 
-  Stream<int> get onSpaceRemoved => _spaces.onRemove;
+  Stream<Space> get onSpaceRemoved => _spaces.onRemove;
 
   late StreamController<int> onClientAdded = StreamController.broadcast();
 
@@ -108,22 +108,22 @@ class ClientManager {
 
       _clientsList.add(client);
 
-      for (int i = 0; i < client.rooms.length; i++) {
-        _onClientAddedRoom(client, i);
+      for (final e in client.rooms) {
+        _onClientAddedRoom(client, e);
       }
 
-      for (int i = 0; i < client.spaces.length; i++) {
-        _addSpace(client, i);
+      for (final e in client.spaces) {
+        _addSpace(client, e);
       }
 
       _clientSubscriptions[client] = [
         client.onSync.listen((_) => _synced()),
-        client.onRoomAdded.listen((index) => _onClientAddedRoom(client, index)),
+        client.onRoomAdded.listen((room) => _onClientAddedRoom(client, room)),
         client.onRoomRemoved
-            .listen((index) => _onClientRemovedRoom(client, index)),
-        client.onSpaceAdded.listen((index) => _addSpace(client, index)),
+            .listen((room) => _onClientRemovedRoom(client, room)),
+        client.onSpaceAdded.listen((space) => _addSpace(client, space)),
         client.onSpaceRemoved
-            .listen((index) => _onClientRemovedSpace(client, index)),
+            .listen((space) => _onClientRemovedSpace(client, space)),
         client.connectionStatusChanged.stream
             .listen((event) => _onClientConnectionStatusChanged(client, event)),
       ];
@@ -146,25 +146,22 @@ class ClientManager {
     }
   }
 
-  void _onClientAddedRoom(Client client, int index) {
-    rooms.add(client.rooms[index]);
+  void _onClientAddedRoom(Client client, Room room) {
+    rooms.add(room);
   }
 
-  void _onClientRemovedRoom(Client client, int index) {
-    var room = client.rooms[index];
+  void _onClientRemovedRoom(Client client, Room room) {
     _rooms.remove(room);
   }
 
-  void _onClientRemovedSpace(Client client, int index) {
-    var space = client.spaces[index];
+  void _onClientRemovedSpace(Client client, Space space) {
     _spaces.remove(space);
   }
 
-  void _addSpace(Client client, int index) {
-    var space = client.spaces[index];
+  void _addSpace(Client client, Space space) {
     space.onUpdate.listen((_) => spaceUpdated(space));
     space.onChildRoomUpdated.listen((_) => spaceChildUpdated(space));
-    spaces.add(client.spaces[index]);
+    spaces.add(space);
   }
 
   void spaceUpdated(Space space) {

commet/lib/client/components/photo_album_room/photo_album_timeline.dart

@@ -1,9 +1,9 @@
 import 'package:commet/client/components/photo_album_room/photo.dart';
 
 abstract class PhotoAlbumTimeline {
-  Stream<int> get onAdded;
-  Stream<int> get onChanged;
-  Stream<int> get onRemoved;
+  Stream<Photo> get onAdded;
+  Stream<Photo> get onChanged;
+  Stream<Photo> get onRemoved;
 
   List<Photo> get photos;
 

commet/lib/client/matrix/components/direct_messages/matrix_direct_messages_component.dart

@@ -81,8 +81,7 @@ class MatrixDirectMessagesComponent
     return client.getRoom(roomId);
   }
 
-  void onRoomAdded(int index) {
-    var room = client.rooms[index];
+  void onRoomAdded(Room room) {
     if (isRoomDirectMessage(room)) {
       updateRoomsList();
     }
@@ -107,8 +106,7 @@ class MatrixDirectMessagesComponent
     }
   }
 
-  void onRoomRemoved(int index) {
-    var room = client.rooms[index];
+  void onRoomRemoved(Room room) {
     directMessageRooms.remove(room);
     listUpdated.add(null);
   }

commet/lib/client/matrix/components/photo_album_room/matrix_photo_album_timeline.dart

@@ -19,13 +19,13 @@ class MatrixPhotoAlbumTimeline implements PhotoAlbumTimeline {
   MatrixPhotoAlbumTimeline(this.room);
 
   @override
-  Stream<int> get onAdded => _photos.onAdd;
+  Stream<Photo> get onAdded => _photos.onAdd;
 
   @override
-  Stream<int> get onChanged => _photos.onItemUpdated;
+  Stream<Photo> get onChanged => _photos.onItemUpdated;
 
   @override
-  Stream<int> get onRemoved => _photos.onRemove;
+  Stream<Photo> get onRemoved => _photos.onRemove;
 
   Future<void> initTimeline() async {
     matrixTimeline = await room.getTimeline();

commet/lib/client/matrix/matrix_client.dart

@@ -109,19 +109,19 @@ class MatrixClient extends Client {
   String get identifier => _id;
 
   @override
-  Stream<int> get onPeerAdded => _peers.onAdd;
+  Stream<Peer> get onPeerAdded => _peers.onAdd;
 
   @override
-  Stream<int> get onRoomAdded => _rooms.onAdd;
+  Stream<Room> get onRoomAdded => _rooms.onAdd;
 
   @override
-  Stream<int> get onSpaceAdded => _spaces.onAdd;
+  Stream<Space> get onSpaceAdded => _spaces.onAdd;
 
   @override
-  Stream<int> get onRoomRemoved => _rooms.onRemove;
+  Stream<Room> get onRoomRemoved => _rooms.onRemove;
 
   @override
-  Stream<int> get onSpaceRemoved => _spaces.onRemove;
+  Stream<Space> get onSpaceRemoved => _spaces.onRemove;
 
   @override
   Stream<void> get onSync => _onSync.stream;

commet/lib/client/matrix/matrix_space.dart

@@ -100,10 +100,10 @@ class MatrixSpace extends Space {
   String get identifier => _matrixRoom.id;
 
   @override
-  Stream<int> get onChildRoomPreviewAdded => _previews.onAdd;
+  Stream<RoomPreview> get onChildRoomPreviewAdded => _previews.onAdd;
 
   @override
-  Stream<int> get onChildRoomPreviewRemoved => _previews.onRemove;
+  Stream<RoomPreview> get onChildRoomPreviewRemoved => _previews.onRemove;
 
   @override
   Stream<void> get onChildRoomPreviewsUpdated => _previews.onListUpdated;
@@ -118,16 +118,16 @@ class MatrixSpace extends Space {
   List<Space> get subspaces => _subspaces;
 
   @override
-  Stream<int> get onChildSpaceAdded => _subspaces.onAdd;
+  Stream<Space> get onChildSpaceAdded => _subspaces.onAdd;
 
   @override
-  Stream<int> get onChildSpaceRemoved => _subspaces.onRemove;
+  Stream<Space> get onChildSpaceRemoved => _subspaces.onRemove;
 
   @override
-  Stream<int> get onRoomAdded => _rooms.onAdd;
+  Stream<Room> get onRoomAdded => _rooms.onAdd;
 
   @override
-  Stream<int> get onRoomRemoved => _rooms.onRemove;
+  Stream<Room> get onRoomRemoved => _rooms.onRemove;
 
   @override
   Stream<void> get onUpdate => _onUpdate.stream;
@@ -216,8 +216,7 @@ class MatrixSpace extends Space {
     _avatar = avatar;
   }
 
-  void onClientRoomRemoved(int index) {
-    var leftRoom = client.rooms[index];
+  void onClientRoomRemoved(Room leftRoom) {
     if (containsRoom(leftRoom.identifier)) {
       _rooms.remove(leftRoom);
     }
@@ -270,8 +269,7 @@ class MatrixSpace extends Space {
     });
   }
 
-  void _onRoomAdded(int index) {
-    var room = _rooms[index];
+  void _onRoomAdded(Room room) {
     _subscriptions.add(room.onUpdate.listen((event) {
       _onChildUpdated.add(room);
     }));

commet/lib/client/matrix_background/matrix_background_client.dart

@@ -51,19 +51,19 @@ class MatrixBackgroundClient implements Client {
   int? get maxFileSize => 0;
 
   @override
-  Stream<int> get onPeerAdded => Stream.empty();
+  Stream<Peer> get onPeerAdded => Stream.empty();
 
   @override
-  Stream<int> get onRoomAdded => Stream.empty();
+  Stream<Room> get onRoomAdded => Stream.empty();
 
   @override
-  Stream<int> get onRoomRemoved => Stream.empty();
+  Stream<Room> get onRoomRemoved => Stream.empty();
 
   @override
-  Stream<int> get onSpaceAdded => Stream.empty();
+  Stream<Space> get onSpaceAdded => Stream.empty();
 
   @override
-  Stream<int> get onSpaceRemoved => Stream.empty();
+  Stream<Space> get onSpaceRemoved => Stream.empty();
 
   @override
   Stream<void> get onSync => Stream.empty();

commet/lib/client/space.dart

@@ -62,19 +62,19 @@ abstract class Space {
 
   Stream<Room> get onChildRoomUpdated;
 
-  Stream<int> get onRoomAdded;
+  Stream<Room> get onRoomAdded;
 
-  Stream<int> get onRoomRemoved;
+  Stream<Room> get onRoomRemoved;
 
   Stream<void> get onChildRoomsUpdated;
 
-  Stream<int> get onChildRoomPreviewAdded;
+  Stream<RoomPreview> get onChildRoomPreviewAdded;
 
-  Stream<int> get onChildRoomPreviewRemoved;
+  Stream<RoomPreview> get onChildRoomPreviewRemoved;
 
-  Stream<int> get onChildSpaceAdded;
+  Stream<Space> get onChildSpaceAdded;
 
-  Stream<int> get onChildSpaceRemoved;
+  Stream<Space> get onChildSpaceRemoved;
 
   Stream<void> get onChildRoomPreviewsUpdated;
 

commet/lib/ui/organisms/photo_albums/photo_album_view.dart

@@ -43,7 +43,7 @@ class _PhotoAlbumViewState extends State<PhotoAlbumView> {
 
   late List<StreamSubscription> subs;
 
-  void onAdded(int event) {
+  void onAdded(Photo event) {
     setState(() {
       numItems = timeline!.photos.length;
     });
@@ -397,13 +397,13 @@ class _PhotoAlbumViewState extends State<PhotoAlbumView> {
         builder: (_) => PhotosAlbumUploadView(f, widget.component));
   }
 
-  void onChanged(int event) {
+  void onChanged(Photo event) {
     setState(() {
       numItems = timeline!.photos.length;
     });
   }
 
-  void onRemoved(int event) {
+  void onRemoved(Photo event) {
     setState(() {
       numItems = timeline!.photos.length;
     });

commet/lib/ui/organisms/sidebar_call_icon/sidebar_calls_list.dart

@@ -44,7 +44,7 @@ class _SidebarCallsListState extends State<SidebarCallsList> {
     });
 
     sessions.onRemove.listen((event) {
-      if (sessions[event] == selectedSession) {
+      if (event == selectedSession) {
         setState(() {
           selectedSession = null;
           link = null;

commet/lib/utils/background_tasks/background_task_manager.dart

@@ -6,9 +6,9 @@ import 'package:commet/utils/notifying_list.dart';
 class BackgroundTaskManager {
   NotifyingList<BackgroundTask> tasks = NotifyingList.empty(growable: true);
 
-  Stream<int> get onTaskAdded => tasks.onAdd;
+  Stream<BackgroundTask> get onTaskAdded => tasks.onAdd;
 
-  Stream<int> get onTaskRemoved => tasks.onRemove;
+  Stream<BackgroundTask> get onTaskRemoved => tasks.onRemove;
 
   Stream get onListUpdate => tasks.onListUpdated;