revert: The blocked user no longer appears in the conversation list - WPB-24403 🍒 (#4915)

Co-authored-by: François Benaiteau <netbe@users.noreply.github.com>
Co-authored-by: François Benaiteau <francois.benaiteau@wire.com>

Author: github-actions[bot]

WireDomain/Sources/WireDomain/Repositories/Connections/ConnectionsLocalStore.swift

@@ -48,20 +48,7 @@ final class ConnectionsLocalStore: ConnectionsLocalStoreProtocol {
             conversation.lastModifiedDate = connectionInfo.lastUpdate
             conversation.addParticipantAndUpdateConversationState(user: connection.to, role: nil)
 
-            // `ConnectionValidator` cleans up stale connections between users, so we normally (re)set this link here.
-            // But when the two users already have an established MLS conversation, we keep it: overwriting it with the
-            // Proteus connection conversation would break the link and hide the conversation from the list.
-            //
-            // `migratedToMLS` is only set on the proteus→MLS migration path, so it misses MLS one-on-ones that were
-            // established directly. Relying on it alone lets the proteus connection conversation overwrite the MLS
-            // link, which surfaces the proteus (read-only) conversation instead of the MLS one — including on the
-            // side of a user who was blocked, since that side is never notified and should keep messaging. [WPB-24403]
-            let existing = connection.to.oneOnOneConversation
-            let isEstablishedMLS = existing?.messageProtocol == .mls
-                && (existing?.mlsStatus == .ready || existing?.migratedToMLS == true)
-            if !isEstablishedMLS {
-                connection.to.oneOnOneConversation = conversation
-            }
+            connection.to.oneOnOneConversation = conversation
             connection.status = connectionInfo.status
             connection.lastUpdateDateInGMT = connectionInfo.lastUpdate
 

WireDomain/Sources/WireDomain/Repositories/Conversations/LocalStore/ConversationLocalStore+Group.swift

@@ -102,18 +102,9 @@ extension ConversationLocalStore {
         }
 
         guard let otherUser = localConversation.localParticipantsExcludingSelf.first else {
-            // The other participant is absent from the synced member list. This is exactly what the
-            // backend returns to the party that was *blocked*: the blocker is omitted from the 1:1
-            // member list. That side is never notified of the block and must keep its conversation
-            // usable, so we must not tear down an established 1:1 — forcing it read-only and marking
-            // the MLS group invalid (which wipes it and drops the user back to the read-only Proteus
-            // conversation). Only do so when there is genuinely no user behind the conversation
-            // (e.g. a malformed/empty 1:1 that was never linked). [WPB-24403]
-            if localConversation.oneOnOneUser == nil {
-                localConversation.isForcedReadOnly = true
-                if localConversation.messageProtocol.isOne(of: .mls, .mixed) {
-                    localConversation.mlsStatus = .invalid
-                }
+            localConversation.isForcedReadOnly = true
+            if localConversation.messageProtocol.isOne(of: .mls, .mixed) {
+                localConversation.mlsStatus = .invalid
             }
             return
         }

WireDomain/Sources/WireDomain/Repositories/Conversations/Protocols/ConversationRepositoryProtocol.swift

@@ -90,17 +90,6 @@ public protocol ConversationRepositoryProtocol: Sendable {
         groupID: String
     ) async -> ZMConversation?
 
-    /// Whether a conversation stored locally is a group.
-    /// - Parameters:
-    ///     - id: The ID of the conversation.
-    ///     - domain: The domain of the conversation if any.
-    /// - returns: `true` if a local conversation with this id exists and is of type `.group`.
-
-    func isGroupConversation(
-        id: UUID,
-        domain: String?
-    ) async -> Bool
-
     /// Deletes a conversation locally.
     /// - Parameters:
     ///     - id: The ID of the conversation.

WireDomain/Sources/WireDomain/Repositories/Conversations/Repository/ConversationRepository.swift

@@ -218,13 +218,6 @@ public final class ConversationRepository: ConversationRepositoryProtocol {
 
     }
 
-    public func isGroupConversation(id: UUID, domain: String?) async -> Bool {
-        guard let conversation = await fetchConversation(id: id, domain: domain) else {
-            return false
-        }
-        return await conversationsLocalStore.isGroupConversation(conversation)
-    }
-
     public func deleteConversation(
         id: UUID,
         domain: String?

WireDomain/Sources/WireDomain/WorkAgent/WorkItem/UpdateConversationItem.swift

@@ -63,15 +63,7 @@ struct UpdateConversationItem: WorkItem {
                 attributes: [.conversationId: conversationID.id.uuidString],
                 .init(self)
             )
-            // Only group conversations should be removed locally when the backend reports them
-            // missing. A 1:1 whose connection has just transitioned to `.blocked` (and similarly
-            // `.cancelled` / `.ignored`) still returns 404 from GET /conversations/{id} because
-            // the backend only exposes the underlying connection, not a conversation resource.
-            // Marking such conversations as `isDeletedRemotely` would hide them from the list
-            // and prevent the user from unblocking from the cell long-press menu.
-            if await repository.isGroupConversation(id: conversationID.id, domain: conversationID.domain) {
-                try await repository.deleteConversation(id: conversationID.id, domain: conversationID.domain)
-            }
+            try await repository.deleteConversation(id: conversationID.id, domain: conversationID.domain)
 
         } catch {
             // giving more context to the error

WireDomain/Sources/WireDomainSupport/Sourcery/generated/AutoMockable.generated.swift

@@ -169,46 +169,6 @@ final class ConnectionsLocalStoreTests: XCTestCase {
         }
     }
 
-    func testStoreConnection_GivenLinkedToEstablishedMLSOneOnOne_ItPreservesTheMLSLink() async throws {
-        // Given a stored connection whose user is linked to an established MLS one-on-one.
-        // The conversation is created directly as MLS, so `migratedToMLS` stays `false` — the
-        // case the previous `migratedToMLS`-only guard failed to protect.
-        try await sut.storeConnection(Scaffolding.connection)
-
-        let mlsConversationID = UUID()
-        try await context.perform { [context, modelHelper] in
-            let storedConnection = try XCTUnwrap(ZMConnection.fetch(
-                userID: Scaffolding.member2ID.uuid,
-                domain: Scaffolding.member2ID.domain,
-                in: context
-            ))
-            let mlsConversation = modelHelper!.createMLSConversation(
-                id: mlsConversationID,
-                mlsStatus: .ready,
-                conversationType: .oneOnOne,
-                in: context
-            )
-            storedConnection.to.oneOnOneConversation = mlsConversation
-            try context.save()
-        }
-
-        // When the backend reports the proteus connection conversation again (e.g. on a connection
-        // update such as a block, which the blocked side is never notified about).
-        try await sut.storeConnection(Scaffolding.connection)
-
-        // Then the MLS link is preserved instead of being overwritten by the proteus conversation.
-        try await context.perform { [context] in
-            let storedConnection = try XCTUnwrap(ZMConnection.fetch(
-                userID: Scaffolding.member2ID.uuid,
-                domain: Scaffolding.member2ID.domain,
-                in: context
-            ))
-            let relatedConversation = try XCTUnwrap(storedConnection.to.oneOnOneConversation)
-            XCTAssertEqual(relatedConversation.messageProtocol, .mls)
-            XCTAssertEqual(relatedConversation.remoteIdentifier, mlsConversationID)
-        }
-    }
-
     private enum Scaffolding {
         static let member1ID = WireDataModel.QualifiedID(
             uuid: .mockID1,

WireDomain/Tests/WireDomainTests/LocalStores/ConnectionsLocalStoreTests.swift

@@ -545,57 +545,6 @@ final class ConversationLocalStoreTests: XCTestCase {
         }
     }
 
-    func testLinkOneOnOneUserIfNeeded_GivenLinkedUserButNoParticipants_ItKeepsMLSConversationUsable() async {
-        // Given an established MLS 1:1 linked to its one-on-one user but with no participants — the
-        // state the blocked party ends up in once the backend removes the blocker from the members.
-        let conversation = await context.perform { [self] in
-            _ = modelHelper.createSelfUser(in: context)
-            let conversation = modelHelper.createMLSConversation(
-                mlsStatus: .ready,
-                conversationType: .oneOnOne,
-                in: context
-            )
-            let otherUser = modelHelper.createUser(id: Scaffolding.otherUserID, domain: Scaffolding.domain, in: context)
-            conversation.oneOnOneUser = otherUser
-            return conversation
-        }
-
-        // When
-        await context.perform { [self] in
-            sut.linkOneOnOneUserIfNeeded(for: conversation)
-        }
-
-        // Then the MLS 1:1 is preserved and remains usable (not wiped, not read-only).
-        await context.perform {
-            XCTAssertEqual(conversation.mlsStatus, .ready)
-            XCTAssertEqual(conversation.messageProtocol, .mls)
-            XCTAssertFalse(conversation.isForcedReadOnly)
-        }
-    }
-
-    func testLinkOneOnOneUserIfNeeded_GivenNoLinkedUserAndNoParticipants_ItInvalidatesMLSConversation() async {
-        // Given an MLS 1:1 with no linked one-on-one user (a genuinely empty/malformed 1:1).
-        let conversation = await context.perform { [self] in
-            _ = modelHelper.createSelfUser(in: context)
-            return modelHelper.createMLSConversation(
-                mlsStatus: .ready,
-                conversationType: .oneOnOne,
-                in: context
-            )
-        }
-
-        // When
-        await context.perform { [self] in
-            sut.linkOneOnOneUserIfNeeded(for: conversation)
-        }
-
-        // Then the MLS group is invalidated and the conversation forced read-only.
-        await context.perform {
-            XCTAssertEqual(conversation.mlsStatus, .invalid)
-            XCTAssertTrue(conversation.isForcedReadOnly)
-        }
-    }
-
     private enum Scaffolding {
 
         static let selfUserId = UUID.mockID1

WireDomain/Tests/WireDomainTests/LocalStores/ConversationLocalStoreTests.swift

@@ -34,7 +34,6 @@ struct UpdateConversationItemTests {
         self.repository = MockConversationRepositoryProtocol()
         self.conversationID = .init(id: UUID(), domain: String.randomDomain())
         self.sut = UpdateConversationItem(repository: repository, conversationID: conversationID)
-        repository.isGroupConversationIdDomain_MockValue = true
     }
 
     @Test("It calls repository pull conversation")
@@ -62,19 +61,6 @@ struct UpdateConversationItemTests {
         #expect(invocation?.domain == conversationID.domain && invocation?.id == conversationID.id)
     }
 
-    @Test("It does not delete 1:1 conversation if not found")
-    func startsDeleteOneOnOneConversationIfNotFound() async throws {
-        // Given
-        repository.isGroupConversationIdDomain_MockValue = false
-        repository.pullConversationIdDomain_MockError = ConversationRepositoryError.conversationNotFound
-        repository.deleteConversationIdDomain_MockMethod = { _, _ in }
-        // When
-        try await sut.start()
-
-        // Then
-        #expect(repository.deleteConversationIdDomain_Invocations.isEmpty)
-    }
-
     @Test("It throws an error in case of non supported error")
     func startThrowsInOtherError() async throws {
         // Given

WireDomain/Tests/WireDomainTests/WorkAgent/WorkItem/UpdateConversationItemTests.swift

@@ -63,8 +63,7 @@ public enum Locators {
         case bottomBarDriveButton
         case createGroupOrSearchButton
         case conversationCell
-        case blockOptionOnContextMenu
-        case unblockOptionOnContextMenu
+        case blockOptionOnContextMenu = "Block…"
         case clearOptionOnContextMenu = "Clear Content…"
         case clearButtonOnBottomSheet
         case leaveButtonOnBottomSheet