feat: Conversations sorting

[Ivansss]

iOS 26+	iOS 26+ (active filter)	iPads or prior iOS versions	iPads or prior iOS versions (active filter)

[SystemKeeper]

Missing database bump

[SystemKeeper]

I have a suggestion to do it a little different:

In NCRoom.swift:

extension Array where Element == NCRoom {

    mutating func sortRooms(withGroupMode groupMode: NCRoomGroupMode, withSortOrder sortOrder: NCRoomSortOrder) {
        self.sort { (first: NCRoom, second: NCRoom) in
            // 1. Favorites
            if first.isFavorite != second.isFavorite {
                return first.isFavorite
            }

            // 2. Group mode
            if groupMode == .groupFirst || groupMode == .privateFirst {
                let firstIsOneToOne = (first.type == .oneToOne || first.type == .formerOneToOne)
                let secondIsOneToOne = (second.type == .oneToOne || second.type == .formerOneToOne)

                if firstIsOneToOne != secondIsOneToOne {
                    let oneToOneFirst = groupMode == .privateFirst
                    return firstIsOneToOne == oneToOneFirst
                }
            }

            // 3. Sort order
            if sortOrder == .alphabetical {
                return first.displayName.localizedCaseInsensitiveCompare(second.displayName) == .orderedAscending
            }

            // Default: Recent activity
            return first.lastActivity > second.lastActivity
        }
    }

}

In NCDatabaseManager.swift:

        // Sort rooms
        let capabilities = NCDatabaseManager.sharedInstance().serverCapabilities(forAccountId: accountId)
        var groupMode: NCRoomGroupMode = .none
        var sortOrder: NCRoomSortOrder = .activity

        if let capabilities {
            groupMode = NCRoomGroupMode(rawValue: capabilities.roomsGroupMode) ?? groupMode
            sortOrder = NCRoomSortOrder(rawValue: capabilities.roomsSortOrder) ?? sortOrder
        }

        unmanagedRooms.sortRooms(withGroupMode: groupMode, withSortOrder: sortOrder)

        return unmanagedRooms

Then we could also test the sorting:

    private func createRoom(withDisplayName displayName: String, withType type: NCRoomType, isFavorite favorite: Bool, withLastActivity lastActivity: Int) -> NCRoom {
        let room = NCRoom()
        room.displayName = displayName
        room.type = type
        room.isFavorite = favorite
        room.lastActivity = lastActivity

        return room
    }

    func testRoomSort() throws {
        let favOneToOne = self.createRoom(withDisplayName: "FavRoom1 1-1", withType: .oneToOne, isFavorite: true, withLastActivity: 0)
        let favGroup = self.createRoom(withDisplayName: "FavRoom1 Group", withType: .group, isFavorite: true, withLastActivity: 0)
        let room1 = self.createRoom(withDisplayName: "Room1", withType: .group, isFavorite: false, withLastActivity: 1)
        let room2 = self.createRoom(withDisplayName: "Room2", withType: .group, isFavorite: false, withLastActivity: 2)
        let activity1 = self.createRoom(withDisplayName: "Activity1", withType: .oneToOne, isFavorite: false, withLastActivity: 123)
        let activity2 = self.createRoom(withDisplayName: "Activity2", withType: .oneToOne, isFavorite: false, withLastActivity: 456)

        let startArray = [
            activity2, activity1,
            favGroup, favOneToOne,
            room2, room1
        ]

        var test1Begin = startArray
        test1Begin.sortRooms(withGroupMode: .privateFirst, withSortOrder: .activity)

        let test1Expected = [
            favOneToOne, favGroup, activity2, activity1, room2, room1
        ]

        XCTAssertEqual(test1Begin, test1Expected)
    }

It seems to work fine, although from a gut feeling something is missing in the sort method.

[jancborchardt]

UI-wise it’s good, but it’s making the menu very complex. Do we really need all these sortings/filters? cc @nimishavijay

• Alphabetical sorting: Is not present in other platforms like Teams, Discord, Signal. It is also quite arbitrary
• No grouping / Private first / Group first: If we move to split private and groups, why don’t we fully commit to it?
• The filters are quite common and useful, but there we could also cut the "No filter" entry. If none of the 3 is set, that is kind of understood.

Of course this would need to be the same across Android and web too. If there has been discussion around this, let me know for context. :)