Update All chats screen with latest design #6407

- update after code review
matrix-org · Aug 1, 2022 · 9c80cbb · 9c80cbb
1 parent 54d4ccb
commit 9c80cbb
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 34 deletions.
diff --git a/MatrixSDK/Data/MXRoomSummary.m b/MatrixSDK/Data/MXRoomSummary.m
@@ -1098,10 +1098,6 @@ - (MXRoomSummaryDataTypes)calculateDataTypes
     {
         result |= MXRoomSummaryDataTypesDirect;
     }
-    else
-    {
-        result |= MXRoomSummaryDataTypesNotDirect;
-    }
     if (self.roomType == MXRoomTypeSpace)
     {
         result |= MXRoomSummaryDataTypesSpace;
@@ -1114,10 +1110,6 @@ - (MXRoomSummaryDataTypes)calculateDataTypes
     {
         result |= MXRoomSummaryDataTypesUnread;
     }
-    else
-    {
-        result |= MXRoomSummaryDataTypesRead;
-    }
 
     return result;
 }

diff --git a/MatrixSDK/Data/MXRoomSummaryDataTypes.h b/MatrixSDK/Data/MXRoomSummaryDataTypes.h
@@ -27,9 +27,7 @@ typedef NS_OPTIONS(NSInteger, MXRoomSummaryDataTypes)
     MXRoomSummaryDataTypesHidden = 1 << 5,
     MXRoomSummaryDataTypesSpace = 1 << 6,
     MXRoomSummaryDataTypesConferenceUser = 1 << 7,
-    MXRoomSummaryDataTypesNotDirect = 1 << 8,
-    MXRoomSummaryDataTypesUnread = 1 << 9,
-    MXRoomSummaryDataTypesRead = 1 << 10,
+    MXRoomSummaryDataTypesUnread = 1 << 8
 };
 
 #endif /* MXRoomSummaryDataTypes_h */
diff --git a/MatrixSDK/Data/RoomList/Common/MXRecentsRoomListDataFetcher.swift b/MatrixSDK/Data/RoomList/Common/MXRecentsRoomListDataFetcher.swift
@@ -79,22 +79,13 @@ internal class MXRecentsRoomListDataFetcher: NSObject, MXRoomListDataFetcher {
     // MARK: - Public
 
     func refresh() {
-        guard let events = session?.accountData.accountData["events"] as? [[AnyHashable: Any]] else {
-            MXLog.error("[MXRecentsRoomListDataFetcher] cannot retrieve events")
+        guard let breadcrumbs = session?.accountData?.accountData(forEventType: kMXAccountDataTypeBreadcrumbs) as? [AnyHashable: [String]] else {
+            MXLog.warning("[MXRecentsRoomListDataFetcher] cannot retrieve breadcrumbs")
             return
         }
 
-        var breadcrumbs: [AnyHashable: [String]]?
-        for event in events {
-            if let type = event["type"] as? String,
-                type == kMXAccountDataTypeBreadcrumbs,
-                let content = event["content"] as? [AnyHashable: [String]] {
-                breadcrumbs = content
-            }
-        }
-
-        guard var recentRoomIds = breadcrumbs?[kMXAccountDataTypeRecentRoomsKey] else {
-            MXLog.error("[MXRecentsRoomListDataFetcher] cannot retrieve recent rooms")
+        guard var recentRoomIds = breadcrumbs[kMXAccountDataTypeRecentRoomsKey] else {
+            MXLog.warning("[MXRecentsRoomListDataFetcher] cannot retrieve recent rooms")
             return
         }
 

diff --git a/MatrixSDK/Data/RoomList/MXRoomListDataFilterOptions.swift b/MatrixSDK/Data/RoomList/MXRoomListDataFilterOptions.swift
@@ -47,13 +47,15 @@ public struct MXRoomListDataFilterOptions: Equatable {
     /// Flag to show only rooms that matches all the provided `dataTypes`. This has no effect when `onlySuggested` is `true`
     public let strictMatches: Bool
 
+    ///Flag to fetch and order rooms according room IDs stored in the `im.vector.setting.breadcrumbs` event within the user account data.
     public let onlyBreadcrumbs: Bool
 
     /// Initializer
     /// - Parameters:
     ///   - dataTypes: data types to fetch. Pass `MXRoomListDataFilterOptions.emptyDataTypes` not to specify any.
     ///   - notDataTypes: data types not to fetch. Pass `MXRoomListDataFilterOptions.emptyDataTypes` not to specify any.
     ///   - onlySuggested: flag to filter only suggested rooms. Only `space` and `query` parameters are honored if true.
+    ///   - onlyBreadcrumbs: flag to fetch and order rooms according room IDs stored in the `im.vector.setting.breadcrumbs` event within the user account data.
     ///   - query: search query
     ///   - space: active space
     ///   - showAllRoomsInHomeSpace: flag to show all rooms in home space (when `space` is not provided)

diff --git a/MatrixSDK/Data/RoomList/MXRoomListDataSortOptions.swift b/MatrixSDK/Data/RoomList/MXRoomListDataSortOptions.swift
@@ -47,12 +47,17 @@ public struct MXRoomListDataSortOptions: Equatable {
     /// Related fetcher will be refreshed automatically when updated.
     public var unreadMessagesFirst: Bool
 
+    /// Flag to sort rooms alphabetically.
+    /// Related fetcher will be refreshed automatically when updated.
     public var alphabetical: Bool
 
     /// Initializer
     /// - Parameters:
     ///   - sentStatus: flag to sort by sent status
     ///   - lastEventDate: flag to sort by last event date
+    ///   - favoriteTag: Flag to sort by favorite tag order
+    ///   - suggested: Flag to sort by suggested room flag
+    ///   - alphabetical: Flag to sort rooms alphabetically
     ///   - missedNotificationsFirst: flag to sort by missed notification count
     ///   - unreadMessagesFirst: flag to sort by unread count
     public init(invitesFirst: Bool = true,

diff --git a/MatrixSDK/MXSession.m b/MatrixSDK/MXSession.m
@@ -4470,16 +4470,7 @@ - (void)updateBreadcrumbsWithRoomWithId:(NSString *)roomId
                                 success:(void (^)(void))success
                                 failure:(void (^)(NSError *error))failure
 {
-    NSArray<NSDictionary *> *events = self.accountData.accountData[@"events"];
-
-    NSDictionary<NSString *, NSArray *> *breadcrumbs;
-    for (NSDictionary * event in events)
-    {
-        if ([event[@"type"] isEqualToString:kMXAccountDataTypeBreadcrumbs])
-        {
-            breadcrumbs = event[@"content"];
-        }
-    }
+    NSDictionary<NSString *, NSArray *> *breadcrumbs = [self.accountData accountDataForEventType:kMXAccountDataTypeBreadcrumbs];
 
     NSMutableArray<NSString *> *recentRoomIds = breadcrumbs[kMXAccountDataTypeRecentRoomsKey] ? [NSMutableArray arrayWithArray:breadcrumbs[kMXAccountDataTypeRecentRoomsKey]] : [NSMutableArray array];