fix: change the condition to close the call - WPB-24070 (#4435)

Author: KaterinaWire

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

@@ -1330,11 +1330,11 @@ public final class ConversationLocalStore: ConversationLocalStoreProtocol {
     }
 
     public func execute(
-        identifier: MLSGroupID,
+        conversationID: QualifiedID,
         block: @escaping @Sendable (ZMConversation?, NSManagedObjectContext) -> Void
     ) async {
         await context.perform { [context] in
-            let conversation = ZMConversation.fetch(with: identifier, in: context)
+            let conversation = ZMConversation.fetch(with: conversationID, in: context)
             block(conversation, context)
         }
     }

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

@@ -492,8 +492,14 @@ public protocol ConversationLocalStoreProtocol {
 
     func fetchServerTimeDelta() async -> TimeInterval
 
+    /// Fetches the conversation matching the given qualified ID and executes a block,
+    /// providing the conversation (if found) and the context.
+    /// - Parameters:
+    ///   - conversationID: The qualified conversation ID used to look up the conversation.
+    ///   - block: Some code that should be invoked with the fetched conversation and the managed object context.
     func execute(
-        identifier: MLSGroupID,
+        conversationID: QualifiedID,
         block: @escaping @Sendable (ZMConversation?, NSManagedObjectContext) -> Void
     ) async
+
 }

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

@@ -193,14 +193,14 @@ public protocol ConversationRepositoryProtocol: Sendable {
     ) async throws -> String?
 
     /// Checks if selfUser is still in a given conversation
-    /// - Parameter groupID: mlsGroupID of the conversation
+    /// - Parameter conversationID: QualifiedID of the conversation
     /// - Returns: true if selfUser belongs to the conversation, false otherwise
     func isSelfAnActiveMember(
-        in groupID: WireDataModel.MLSGroupID
+        in conversationID: WireDataModel.QualifiedID
     ) async -> Bool
 
     /// Reset the pendingProposalDate for the conversation
-    /// - Parameter groupID: mlsGroupID of the conversation
-    func clearPendingProposals(in groupID: WireDataModel.MLSGroupID) async
+    /// - Parameter groupID: QualifiedID of the conversation
+    func clearPendingProposals(in conversationID: WireDataModel.QualifiedID) async
 
 }

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

@@ -381,17 +381,17 @@ public final class ConversationRepository: ConversationRepositoryProtocol {
     }
 
     public func isSelfAnActiveMember(
-        in groupID: MLSGroupID
+        in conversationID: WireDataModel.QualifiedID
     ) async -> Bool {
         nonisolated(unsafe) var isSelfAnActiveMember = false
-        await conversationsLocalStore.execute(identifier: groupID) { conversation, _ in
+        await conversationsLocalStore.execute(conversationID: conversationID) { conversation, _ in
             isSelfAnActiveMember = conversation?.isSelfAnActiveMember ?? false
         }
         return isSelfAnActiveMember
     }
 
-    public func clearPendingProposals(in groupID: WireDataModel.MLSGroupID) async {
-        await conversationsLocalStore.execute(identifier: groupID) { conversation, context in
+    public func clearPendingProposals(in conversationID: WireDataModel.QualifiedID) async {
+        await conversationsLocalStore.execute(conversationID: conversationID) { conversation, context in
             conversation?.commitPendingProposalDate = nil
             context.saveOrRollback()
         }

WireDomain/Sources/WireDomain/Synchronization/CommitPendingProsalsGenerator.swift

@@ -117,7 +117,7 @@ public final class CommitPendingProposalsGenerator: NSObject, LiveGeneratorProto
             }
 
             // Re-check membership right before enqueuing the actual work item
-            let stillMember = await repository.isSelfAnActiveMember(in: mlsGroupID)
+            let stillMember = await repository.isSelfAnActiveMember(in: conversationID)
             guard stillMember else { return }
 
             // Enqueue parent group item
@@ -126,6 +126,7 @@ public final class CommitPendingProposalsGenerator: NSObject, LiveGeneratorProto
                     repository: repository,
                     conversationID: conversationID,
                     groupID: mlsGroupID,
+                    isSubconversation: false,
                     mlsService: mlsService
                 )
             )
@@ -137,6 +138,7 @@ public final class CommitPendingProposalsGenerator: NSObject, LiveGeneratorProto
                         repository: repository,
                         conversationID: conversationID,
                         groupID: subgroupID,
+                        isSubconversation: true,
                         mlsService: mlsService
                     )
                 )

WireDomain/Sources/WireDomain/WorkAgent/WorkItem/CommitPendingProposalItem.swift

@@ -41,24 +41,30 @@ struct CommitPendingProposalItem: WorkItem, CustomStringConvertible {
 
     let conversationID: WireDataModel.QualifiedID
     let groupID: WireDataModel.MLSGroupID
+    let isSubconversation: Bool
     let logger = WireLogger.mls
 
     public init(
         repository: ConversationRepositoryProtocol,
         conversationID: WireDataModel.QualifiedID,
         groupID: WireDataModel.MLSGroupID,
+        isSubconversation: Bool,
         mlsService: MLSServiceInterface
     ) {
         self.repository = repository
         self.conversationID = conversationID
         self.groupID = groupID
+        self.isSubconversation = isSubconversation
         self.mlsService = mlsService
     }
 
     func start() async throws {
-        let logAttributes: LogAttributes = [.mlsGroupID: groupID.safeForLoggingDescription] + LogAttributes.safePublic
+        let logAttributes: LogAttributes = [
+            .mlsGroupID: groupID.safeForLoggingDescription,
+            .isSubconversation: isSubconversation
+        ] + LogAttributes.safePublic
 
-        let isSelfAnActiveMember = await repository.isSelfAnActiveMember(in: groupID)
+        let isSelfAnActiveMember = await repository.isSelfAnActiveMember(in: conversationID)
 
         guard isSelfAnActiveMember else {
             logger.info("cancelling commit as the user is no longer a member", attributes: logAttributes)
@@ -67,7 +73,7 @@ struct CommitPendingProposalItem: WorkItem, CustomStringConvertible {
 
         guard try await mlsService.conversationExists(groupID: groupID) else {
             logger.warn("mls group does not exist, clearing pending proposal", attributes: logAttributes)
-            await repository.clearPendingProposals(in: groupID)
+            await repository.clearPendingProposals(in: conversationID)
             return
         }
 

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

@@ -48,6 +48,7 @@ class CommitPendingProposalItemTests {
             repository: repository,
             conversationID: conversationID,
             groupID: mlsGroupID,
+            isSubconversation: false,
             mlsService: mlsService
         )
     }

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

@@ -49,6 +49,7 @@ public enum LogAttributesKey: String, Comparable, Sendable {
     case syncVersion = "sync_version"
     case workItemID = "work_item_id"
     case isNewClient = "is_new_client"
+    case isSubconversation = "is_subconversation"
     case timeInterval = "time_interval"
 
     public static func < (lhs: LogAttributesKey, rhs: LogAttributesKey) -> Bool {

WireLogging/Sources/WireLogging/LogAttributes.swift

@@ -500,44 +500,7 @@ extension WireCallCenterV3 {
             return false
         }
 
-        switch conversation.messageProtocol {
-        case .mls:
-            return shouldEndCallForMLS(
-                previousParticipants: previousParticipants,
-                newParticipants: newParticipants
-            )
-        case .mixed, .proteus:
-            return shouldEndCallForProteus(
-                previousParticipants: previousParticipants,
-                newParticipants: newParticipants
-            )
-        }
-    }
-
-    private func shouldEndCallForMLS(
-        previousParticipants: [AVSCallMember],
-        newParticipants: [AVSCallMember]
-    ) -> Bool {
-        /// We assume that the 2nd participant is the other user.
-        /// If the other user's audio state changes from `established` to `connecting`,
-        /// it means the call connection was dropped and the call should be ended.
-        ///  https://wearezeta.atlassian.net/wiki/spaces/PAD/pages/1314750477/2024-07-29+1+1+calls+over+SFT
-        guard
-            previousParticipants.count == 2,
-            newParticipants.count == 2,
-            previousParticipants[1].audioState == .established,
-            newParticipants[1].audioState == .connecting
-        else {
-            return false
-        }
-        return true
-    }
-
-    private func shouldEndCallForProteus(
-        previousParticipants: [AVSCallMember],
-        newParticipants: [AVSCallMember]
-    ) -> Bool {
-        previousParticipants.count == 2 && newParticipants.count == 1
+        return previousParticipants.count == 2 && newParticipants.count == 1
     }
 
 }