feat: add mls group id in developer tools - WPB-16160 (#2553)

Author: netbe

wire-ios-data-model/Source/MLS/MLSGroupID.swift

@@ -52,6 +52,6 @@ extension MLSGroupID: CustomStringConvertible {
 extension MLSGroupID: SafeForLoggingStringConvertible {
 
     public var safeForLoggingDescription: String {
-        data.readableHash
+        description.redactedAndTruncated()
     }
 }

wire-ios/Wire-iOS Tests/ReferenceImages/GroupDetailsViewControllerSnapshotTests/testForMlsConversation_withNotVerifiedStatus.1.png

@@ -27,7 +27,7 @@ final class DeveloperDebugActionsViewModelTests: XCTestCase {
 
         // when
         // then
-        XCTAssertEqual(viewModel.buttons.count, 8)
+        XCTAssertEqual(viewModel.buttons.count, 9)
     }
 
     // MARK: - Helpers

wire-ios/Wire-iOS Tests/ReferenceImages/GroupDetailsViewControllerSnapshotTests/testForMlsConversation_withVerifiedStatus.1.png

@@ -39,6 +39,7 @@
 		01BC68512CE3AF9E00445243 /* EmptyConversationSearchResultsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01BC68502CE3AF9E00445243 /* EmptyConversationSearchResultsView.swift */; };
 		01BC68652CE496A500445243 /* EmptyPlaceholderContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01BC68642CE496A500445243 /* EmptyPlaceholderContainerView.swift */; };
 		01C1A7C72A54C45A0058D578 /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = 01C1A7C62A54C45A0058D578 /* SnapshotTesting */; };
+		01D2B13C2D63E8E90030D28D /* TextItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D2B13B2D63E8E90030D28D /* TextItemCell.swift */; };
 		01D2B7A52D64A9190030D28D /* WireCoreCrypto in Frameworks */ = {isa = PBXBuildFile; productRef = 01D2B7A42D64A9190030D28D /* WireCoreCrypto */; };
 		01D2C78F2CECC41D00F05E5E /* QRCodeScannerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D2C78E2CECC41D00F05E5E /* QRCodeScannerViewController.swift */; };
 		01D8E71A2BA39CE900B71CB7 /* PrivacyWarningChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D8E7192BA39CE900B71CB7 /* PrivacyWarningChecker.swift */; };
@@ -1963,6 +1964,7 @@
 		01A5E048297FDAB500624B65 /* copyExtraAudioNotifications */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = copyExtraAudioNotifications; sourceTree = "<group>"; };
 		01BC68502CE3AF9E00445243 /* EmptyConversationSearchResultsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyConversationSearchResultsView.swift; sourceTree = "<group>"; };
 		01BC68642CE496A500445243 /* EmptyPlaceholderContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyPlaceholderContainerView.swift; sourceTree = "<group>"; };
+		01D2B13B2D63E8E90030D28D /* TextItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextItemCell.swift; sourceTree = "<group>"; };
 		01D2C78E2CECC41D00F05E5E /* QRCodeScannerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeScannerViewController.swift; sourceTree = "<group>"; };
 		01D8E7192BA39CE900B71CB7 /* PrivacyWarningChecker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyWarningChecker.swift; sourceTree = "<group>"; };
 		01F5EAE32B712DD6009FD25D /* LogFileDestination.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogFileDestination.swift; sourceTree = "<group>"; };
@@ -7743,6 +7745,7 @@
 			children = (
 				01874DD52C18579300208716 /* ContextItemsProviders */,
 				EE742AB5284DE57900A6B5F3 /* DeveloperToolsView.swift */,
+				01D2B13B2D63E8E90030D28D /* TextItemCell.swift */,
 				013638F32BF6A23200A68F89 /* DeveloperToolsPresenter.swift */,
 				EE742AB7284DE66400A6B5F3 /* DeveloperToolsViewModel.swift */,
 				63238C692B860DE300951467 /* DeveloperE2ei */,
@@ -9386,6 +9389,7 @@
 				06DF42D12757DA56009C8A99 /* GuestLinkInfoCell.swift in Sources */,
 				0665DF7328F01D3B0094482B /* ProfileImagePickerManager.swift in Sources */,
 				5E8FFC0321ECC5CF0052DF03 /* AuthenticationFeatureProvider.swift in Sources */,
+				01D2B13C2D63E8E90030D28D /* TextItemCell.swift in Sources */,
 				EF4C5D4E23391C7E0092CA38 /* ConversationListCell+ZMConversationObserver.swift in Sources */,
 				EF51C2BF211B2CAF0099A599 /* Data+HEIF.swift in Sources */,
 				BF2A74711CEB466A002608BF /* ConversationInputBarViewController+Audio.swift in Sources */,

wire-ios/Wire-iOS UnitTests/Developer/DeveloperTools/DebugActions/DeveloperDebugActionsViewModelTests.swift

@@ -37,8 +37,9 @@ struct ConversationDeveloperActionsProvider: DeveloperToolsContextItemsProvider
         var items = [
             makeConversationIdItem(),
             makeConversationTypeItem(),
-            makeConversationMessageProtocolItem()
-        ]
+            makeConversationMessageProtocolItem(),
+            makeConversationMLSGroupIDItem()
+        ].compactMap { $0 }
 
         if DeveloperFlag.debugDuplicateObjects.isOn {
             items.append(makeDuplicateConversationItem())
@@ -72,6 +73,13 @@ struct ConversationDeveloperActionsProvider: DeveloperToolsContextItemsProvider
         ))
     }
 
+    private func makeConversationMLSGroupIDItem() -> DeveloperToolsViewModel.Item? {
+        .text(DeveloperToolsViewModel.TextItem(
+            title: "MLS Group ID",
+            value: conversation.mlsGroupID?.description ?? "-"
+        ))
+    }
+
     private func makeDuplicateConversationItem() -> DeveloperToolsViewModel.Item {
         .button(ButtonItem(
             title: "Duplicate Conversation",

wire-ios/Wire-iOS.xcodeproj/project.pbxproj

@@ -21,13 +21,59 @@ import SwiftUI
 struct DeveloperDebugActionsView: View {
 
     @ObservedObject var viewModel: DeveloperDebugActionsViewModel
+    @State var userInput: String = ""
 
     var body: some View {
         List(viewModel.buttons) { button in
             Button(action: button.action) {
                 Text(button.title)
             }
         }
+        .sheet(item: $viewModel.mlsGroupSearchItem, content: mlsGroupSearchView)
+        .presentationDetents([.medium])
+        .presentationDragIndicator(.visible)
+    }
+
+    @ViewBuilder
+    func mlsGroupSearchView(_ item: MLSGroupSearchItem) -> some View {
+        List {
+            Section("Conversations with MLS Group ID") {
+                HStack {
+                    TextField("Enter MLS Group ID", text: $userInput)
+                        .onSubmit(submitUserInput)
+                    Button("Search", action: submitUserInput)
+                        .disabled(userInput.isEmpty)
+                }
+            }
+            switch item {
+            case let .result(results, term):
+                if results.isEmpty, !term.isEmpty {
+                    Section {
+                        Text("Nothing found")
+                    }
+                } else {
+                    ForEach(results, id: \.id) { result in
+                        Section {
+                            TextItemCell(title: "Name:", value: result.name) {
+                                UIPasteboard.general.string = result.name
+                            }
+                            TextItemCell(title: "Conversation id:", value: result.id) {
+                                UIPasteboard.general.string = result.id
+                            }
+                            TextItemCell(title: "MLS Group id:", value: result.groupID?.description ?? "-") {
+                                UIPasteboard.general.string = result.groupID?.description ?? "-"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private func submitUserInput() {
+        Task {
+            await viewModel.findConversations(with: userInput.trim())
+        }
     }
 }
 

wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/ConversationDeveloperActionsProvider.swift

@@ -21,9 +21,31 @@ import WireDataModel
 import WireLogging
 import WireSyncEngine
 
+struct ConversationResult {
+    var id: String
+    var groupID: MLSGroupID?
+    var name: String
+
+    var description: String {
+        id
+    }
+}
+
+enum MLSGroupSearchItem: Identifiable {
+    var id: String {
+        switch self {
+        case .result:
+            "result"
+        }
+    }
+
+    case result([ConversationResult], String)
+}
+
 final class DeveloperDebugActionsViewModel: ObservableObject {
 
     @Published var buttons: [DeveloperDebugActionsDisplayModel.ButtonItem] = []
+    @Published var mlsGroupSearchItem: MLSGroupSearchItem?
 
     private var userSession: ZMUserSession? { ZMUserSession.shared() }
 
@@ -48,7 +70,8 @@ final class DeveloperDebugActionsViewModel: ObservableObject {
             .init(title: "Update Conversation to mixed protocol", action: updateConversationProtocolToMixed),
             .init(title: "Update Conversation to MLS protocol", action: updateConversationProtocolToMLS),
             .init(title: "Update MLS migration status", action: updateMLSMigrationStatus),
-            .init(title: "Delete domains in the database", action: deleteDomains)
+            .init(title: "Delete domains in the database", action: deleteDomains),
+            .init(title: "Find Conversation with MLS Group", action: showSearchMLSConversations)
         ]
     }
 
@@ -204,4 +227,49 @@ final class DeveloperDebugActionsViewModel: ObservableObject {
         }
     }
 
+    // MARK: Find conversation
+
+    private func showSearchMLSConversations() {
+        mlsGroupSearchItem = .result([], "")
+    }
+
+    @MainActor
+    func findConversations(with mlsGroupID: String?) async {
+        guard let strippedMLSGroupID = mlsGroupID?.replacingOccurrences(of: "*", with: "") else {
+            showConversationInfo(results: [], term: "")
+            return
+        }
+
+        guard let syncContext = userSession?.syncContext else {
+            showConversationInfo(results: [], term: strippedMLSGroupID)
+            return
+        }
+
+        let results = try? await syncContext.perform {
+            let fetchRequest = NSFetchRequest<ZMConversation>(entityName: ZMConversation.entityName())
+            fetchRequest.fetchBatchSize = 50
+            // as we have a string and MLSGroupID is data we can't fetch with a predicate
+            let conversations = try syncContext.fetch(fetchRequest)
+
+            var matchedConversationInfos = [ConversationResult]()
+            for conversation in conversations
+                where conversation.mlsGroupID?.description.starts(with: strippedMLSGroupID) == true {
+                matchedConversationInfos.append(
+                    ConversationResult(
+                        id: conversation.remoteIdentifier.uuidString,
+                        groupID: conversation.mlsGroupID,
+                        name: conversation.name ?? "-"
+                    )
+                )
+            }
+            return matchedConversationInfos
+        }
+        showConversationInfo(results: results ?? [], term: strippedMLSGroupID)
+    }
+
+    @MainActor
+    private func showConversationInfo(results: [ConversationResult], term: String) {
+        mlsGroupSearchItem = .result(results, term)
+    }
+
 }

wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DebugActions/DeveloperDebugActionsView.swift

@@ -57,18 +57,9 @@ struct DeveloperToolsView: View {
             }
 
         case let .text(textItem):
-            TextItemCell(title: textItem.title, value: textItem.value)
-                .contextMenu {
-                    Button(
-                        hapticFeedbackStyle: .success,
-                        action: {
-                            viewModel.handleEvent(.itemCopyRequested(item))
-                        },
-                        label: {
-                            Label("Copy", systemImage: "doc.on.doc")
-                        }
-                    )
-                }
+            TextItemCell(title: textItem.title, value: textItem.value) {
+                viewModel.handleEvent(.itemCopyRequested(item))
+            }
 
         case let .destination(destinationItem):
             NavigationLink(destinationItem.title, destination: destinationItem.makeView)
@@ -84,27 +75,6 @@ struct DeveloperToolsView: View {
 
 }
 
-// MARK: - Subviews
-
-private struct TextItemCell: View {
-
-    let title: String
-    let value: String
-
-    var body: some View {
-        HStack {
-            Text(title)
-
-            Spacer()
-
-            Text(value)
-                .lineLimit(1)
-                .truncationMode(.middle)
-                .foregroundColor(.secondary)
-        }
-    }
-}
-
 // MARK: - Previews
 
 struct DeveloperToolsView_Previews: PreviewProvider {

wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DebugActions/DeveloperDebugActionsViewModel.swift

@@ -0,0 +1,50 @@
+//
+// Wire
+// Copyright (C) 2025 Wire Swiss GmbH
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see http://www.gnu.org/licenses/.
+//
+
+import SwiftUI
+
+struct TextItemCell: View {
+
+    let title: String
+    let value: String
+    let onCopy: () -> Void
+
+    var body: some View {
+        HStack {
+            Text(title)
+
+            Spacer()
+
+            Text(value)
+                .lineLimit(1)
+                .truncationMode(.middle)
+                .foregroundColor(.secondary)
+        }
+        .contextMenu {
+            Button(
+                hapticFeedbackStyle: .success,
+                action: {
+                    onCopy()
+                },
+                label: {
+                    Label("Copy", systemImage: "doc.on.doc")
+                }
+            )
+        }
+    }
+}

wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DeveloperToolsView.swift

@@ -65,7 +65,7 @@ final class MessageProtocolSectionController: GroupDetailsSectionController {
             return 1
 
         case .mls, .mixed:
-            return Bundle.developerModeEnabled ? 3 : 2
+            return 2
         }
     }
 
@@ -92,10 +92,6 @@ final class MessageProtocolSectionController: GroupDetailsSectionController {
             cell.status = ciphersuite?.description ?? ""
             cell.allowMultilineStatus = true
 
-        case (.mls, 2) where Bundle.developerModeEnabled:
-            cell.title = "Group ID (hashed)"
-            cell.status = groupID?.safeForLoggingDescription
-
         default:
             break
         }