fix: show apps tab for legacy bots - WPB-21441

WireMessaging/Sources/WireMessagingDomain/ConversationCreation/ConversationCreationRepositoryProtocol.swift

@@ -17,4 +17,14 @@
 //
 
 // sourcery: AutoMockable
-public protocol ConversationCreationRepositoryProtocol {}
+public protocol ConversationCreationRepositoryProtocol {
+
+    /// Legacy services (bots) are deprecated and cannot be set up any more. However, teams who have bots already set up
+    /// may continue using them.
+    /// While the `apps` feature flag controls if the UI allows for starting a conversation with an app (new-style
+    /// MLS-only service) or adding an app to a conversation, there is no feature flag for bots (old-style Proteus-only
+    /// services). If there are bots already added to the team, bots are considered enabled.
+
+    func areBotsSetUpInTheTeam() async throws -> Bool
+
+}

WireNetwork/Sources/WireNetwork/APIs/Rest/UpdateEventsAPI/Event decoding/FeatureConfig/AppsFeatureConfigDecoder.swift

@@ -0,0 +1,34 @@
+//
+// 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 Foundation
+
+struct AppsFeatureConfigDecoder {
+
+    func decode(
+        from container: KeyedDecodingContainer<FeatureConfigEventCodingKeys>
+    ) throws -> AppsFeatureConfig {
+        let payload = try container.decode(
+            FeatureWithoutConfig.self,
+            forKey: .payload
+        )
+
+        return AppsFeatureConfig(status: payload.status.toAPIModel())
+    }
+
+}

WireNetwork/Sources/WireNetwork/APIs/Rest/UpdateEventsAPI/Event decoding/UpdateEventDecodingProxy+FeatureConfig.swift

@@ -40,6 +40,11 @@ extension UpdateEventDecodingProxy {
                 let event = FeatureConfigUpdateEvent(featureConfig: .appLock(config))
                 updateEvent = .featureConfig(.update(event))
 
+            case "apps":
+                let config = try AppsFeatureConfigDecoder().decode(from: container)
+                let event = FeatureConfigUpdateEvent(featureConfig: .apps(config))
+                updateEvent = .featureConfig(.update(event))
+
             case "classifiedDomains":
                 let config = try ClassifiedDomainsFeatureConfigDecoder().decode(from: container)
                 let event = FeatureConfigUpdateEvent(featureConfig: .classifiedDomains(config))

wire-ios-sync-engine/Source/UserSession/Search/SearchRequest.swift

@@ -49,6 +49,7 @@ public struct SearchOptions: OptionSet {
     /// Services which are enabled in your team.
 
     public static let services = SearchOptions(rawValue: 1 << 6)
+    // TODO: [WPB-20362] consider renaming to `bots` and adding `apps`
 
     /// Users from federated servers.
 

wire-ios-sync-engine/Source/UserSession/Search/SearchResult.swift

@@ -42,7 +42,7 @@ public struct SearchResult {
 
     /// Bots.
 
-    public var services: [ServiceUser]
+    public var services: [ServiceUser] // TODO: [WPB-20362] add `apps`
 
     /// Cache for search users.
 

wire-ios-utilities/Source/DeveloperFlag.swift

@@ -24,7 +24,6 @@ public enum DeveloperFlag: String, CaseIterable {
 
     case channelsHistory
     case chatBubbles
-    case considerAppsFeatureFlag
     case consumableNotifications
     case createLegacyBackups
     case debugDuplicateObjects
@@ -45,11 +44,6 @@ public enum DeveloperFlag: String, CaseIterable {
 
     public var description: String {
         switch self {
-        case .considerAppsFeatureFlag:
-            "Apps are not fully supported by the backend yet (e.g. no search endpoint available yet). However, some " +
-                "customers already have the apps feature flag enabled as a workaround for another issue." +
-                "If this toggle is off, the apps feature flag is ignored. Toggle it on for development."
-
         case .createLegacyBackups:
             "Don't use the cross-platform library when creating backups."
 

wire-ios/Wire-iOS Tests/AddParticipantsViewControllerSnapshotTests.swift

@@ -80,6 +80,7 @@ final class AddParticipantsViewControllerSnapshotTests: XCTestCase {
         let newValues = ConversationCreationValues(
             isChannel: false,
             isAppsFeatureEnabled: true,
+            areLegacyBotsAvailable: false,
             name: "",
             participants: [],
             allowGuests: true,

wire-ios/Wire-iOS Tests/ConversationCreationControllerSnapshotTests.swift

@@ -86,7 +86,10 @@ final class ConversationCreationControllerSnapshotTests: XCTestCase {
 
     // MARK: - Helper Method
 
-    private func createSut(isTeamMember: Bool, messageProtocol: Feature.MLS.Config.MessageProtocol = .proteus) async {
+    private func createSut(
+        isTeamMember: Bool,
+        messageProtocol: Feature.MLS.Config.MessageProtocol = .proteus
+    ) async {
         let mockSelfUser = MockUserType.createSelfUser(name: "Alice", inTeam: isTeamMember ? UUID() : nil)
         let mockUserSession = UserSessionMock(mockUser: mockSelfUser)
         mockUserSession.isWireCellsEnabled = true
@@ -98,9 +101,11 @@ final class ConversationCreationControllerSnapshotTests: XCTestCase {
             )
         )
 
-        sut = await ConversationCreationController(
+        sut = ConversationCreationController(
             preSelectedParticipants: nil,
-            userSession: mockUserSession
+            userSession: mockUserSession,
+            isAppsFeatureEnabled: false,
+            areLegacyBotsAvailable: false
         )
     }
 }

wire-ios/Wire-iOS Tests/ConversationDetail/ConversationDetailsTests.swift

@@ -19,6 +19,7 @@
 import Foundation
 import WireTestingPackage
 import XCTest
+
 @testable import Wire
 
 final class ConversationDetailsTests: XCTestCase {
@@ -45,13 +46,21 @@ final class ConversationDetailsTests: XCTestCase {
         conversation.isChannel = false
 
         XCTAssertFalse(
-            sut.accessible(in: conversation, by: user)
+            sut.accessible(
+                in: conversation,
+                by: user,
+                areLegacyBotsAvailable: false
+            )
         )
     }
 
     func testAccessOptionNotAllowed_ForChannel_Member() {
         XCTAssertFalse(
-            sut.accessible(in: conversation, by: user)
+            sut.accessible(
+                in: conversation,
+                by: user,
+                areLegacyBotsAvailable: false
+            )
         )
     }
 

wire-ios/Wire-iOS Tests/ConversationDetail/GroupDetailsViewControllerSnapshotTests.swift

@@ -108,7 +108,9 @@ final class GroupDetailsViewControllerSnapshotTests: XCTestCase {
             mainCoordinator: mockMainCoordinator,
             selfProfileUIBuilder: MockSelfProfileViewControllerBuilderProtocol(),
             conversationCreationRepository: MockConversationCreationRepositoryProtocol(),
-            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase
+            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase,
+            areLegacyBotsAvailable: false,
+            isAppsFeatureEnabled: false
         )
 
         // THEN
@@ -130,7 +132,9 @@ final class GroupDetailsViewControllerSnapshotTests: XCTestCase {
             mainCoordinator: mockMainCoordinator,
             selfProfileUIBuilder: MockSelfProfileViewControllerBuilderProtocol(),
             conversationCreationRepository: MockConversationCreationRepositoryProtocol(),
-            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase
+            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase,
+            areLegacyBotsAvailable: false,
+            isAppsFeatureEnabled: false
         )
 
         // THEN
@@ -163,7 +167,9 @@ final class GroupDetailsViewControllerSnapshotTests: XCTestCase {
             mainCoordinator: mockMainCoordinator,
             selfProfileUIBuilder: MockSelfProfileViewControllerBuilderProtocol(),
             conversationCreationRepository: MockConversationCreationRepositoryProtocol(),
-            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase
+            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase,
+            areLegacyBotsAvailable: false,
+            isAppsFeatureEnabled: false
         )
 
         // THEN
@@ -185,7 +191,9 @@ final class GroupDetailsViewControllerSnapshotTests: XCTestCase {
             mainCoordinator: mockMainCoordinator,
             selfProfileUIBuilder: MockSelfProfileViewControllerBuilderProtocol(),
             conversationCreationRepository: MockConversationCreationRepositoryProtocol(),
-            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase
+            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase,
+            areLegacyBotsAvailable: false,
+            isAppsFeatureEnabled: false
         )
 
         // THEN
@@ -206,7 +214,9 @@ final class GroupDetailsViewControllerSnapshotTests: XCTestCase {
             mainCoordinator: mockMainCoordinator,
             selfProfileUIBuilder: MockSelfProfileViewControllerBuilderProtocol(),
             conversationCreationRepository: MockConversationCreationRepositoryProtocol(),
-            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase
+            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase,
+            areLegacyBotsAvailable: false,
+            isAppsFeatureEnabled: false
         )
 
         // THEN
@@ -229,7 +239,9 @@ final class GroupDetailsViewControllerSnapshotTests: XCTestCase {
             mainCoordinator: mockMainCoordinator,
             selfProfileUIBuilder: MockSelfProfileViewControllerBuilderProtocol(),
             conversationCreationRepository: MockConversationCreationRepositoryProtocol(),
-            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase
+            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase,
+            areLegacyBotsAvailable: false,
+            isAppsFeatureEnabled: false
         )
 
         snapshotHelper.verify(matching: sut)
@@ -250,7 +262,9 @@ final class GroupDetailsViewControllerSnapshotTests: XCTestCase {
             mainCoordinator: mockMainCoordinator,
             selfProfileUIBuilder: MockSelfProfileViewControllerBuilderProtocol(),
             conversationCreationRepository: MockConversationCreationRepositoryProtocol(),
-            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase
+            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase,
+            areLegacyBotsAvailable: false,
+            isAppsFeatureEnabled: false
         )
 
         // THEN
@@ -272,7 +286,9 @@ final class GroupDetailsViewControllerSnapshotTests: XCTestCase {
             mainCoordinator: mockMainCoordinator,
             selfProfileUIBuilder: MockSelfProfileViewControllerBuilderProtocol(),
             conversationCreationRepository: MockConversationCreationRepositoryProtocol(),
-            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase
+            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase,
+            areLegacyBotsAvailable: false,
+            isAppsFeatureEnabled: false
         )
 
         // THEN
@@ -294,7 +310,9 @@ final class GroupDetailsViewControllerSnapshotTests: XCTestCase {
             mainCoordinator: mockMainCoordinator,
             selfProfileUIBuilder: MockSelfProfileViewControllerBuilderProtocol(),
             conversationCreationRepository: MockConversationCreationRepositoryProtocol(),
-            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase
+            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase,
+            areLegacyBotsAvailable: false,
+            isAppsFeatureEnabled: false
         )
 
         // THEN
@@ -316,7 +334,9 @@ final class GroupDetailsViewControllerSnapshotTests: XCTestCase {
             mainCoordinator: mockMainCoordinator,
             selfProfileUIBuilder: MockSelfProfileViewControllerBuilderProtocol(),
             conversationCreationRepository: MockConversationCreationRepositoryProtocol(),
-            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase
+            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase,
+            areLegacyBotsAvailable: false,
+            isAppsFeatureEnabled: false
         )
 
         // THEN
@@ -340,7 +360,9 @@ final class GroupDetailsViewControllerSnapshotTests: XCTestCase {
             mainCoordinator: mockMainCoordinator,
             selfProfileUIBuilder: MockSelfProfileViewControllerBuilderProtocol(),
             conversationCreationRepository: MockConversationCreationRepositoryProtocol(),
-            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase
+            isUserE2EICertifiedUseCase: userSession.isUserE2EICertifiedUseCase,
+            areLegacyBotsAvailable: false,
+            isAppsFeatureEnabled: false
         )
 
         snapshotHelper.verify(matching: sut)

wire-ios/Wire-iOS Tests/ConversationList/Container/ConversationListViewControllerSnapshotTests.swift

@@ -73,6 +73,7 @@ final class ConversationListViewControllerSnapshotTests: XCTestCase {
 
         zClientViewController = ZClientViewController(
             account: coreDataStack.account,
+            contextProvider: DefaultManagedObjectContextProvider(contextProvider: coreDataStack),
             selfProfileViewsMonitor: SelfProfileViewsMonitorImplementation(),
             userSession: userSession,
             trackingManager: nil,

wire-ios/Wire-iOS Tests/ConversationOptionsServicesViewControllerTests.swift → wire-ios/Wire-iOS Tests/ConversationServicesOptionsViewControllerTests.swift

@@ -16,6 +16,7 @@
 // along with this program. If not, see http://www.gnu.org/licenses/.
 //
 
+import WireDataModel
 import WireTestingPackage
 import XCTest
 
@@ -25,6 +26,10 @@ final class MockServicesOptionsViewModelConfiguration: ConversationServicesOptio
     // MARK: Properties
 
     typealias SetHandler = (Bool, (Result<Void, Error>) -> Void) -> Void
+
+    var messageProtocol: MessageProtocol = .proteus
+    var areLegacyBotsAvailable = false
+    var isAppsFeatureEnabled = true
     var allowApps: Bool
     var allowAppsChangedHandler: ((Bool) -> Void)?
     var areAppsPresent = true

wire-ios/Wire-iOS Tests/StartUIViewControllerSnapshotTests.swift

@@ -65,6 +65,7 @@ final class StartUIViewControllerSnapshotTests: CoreDataSnapshotTestCase {
 
     func setupSut() {
         sut = StartUIViewController(
+            areLegacyBotsAvailable: true,
             isAppsFeatureEnabled: true,
             userSession: userSession,
             mainCoordinator: mockMainCoordinator,

wire-ios/Wire-iOS Tests/ZClientViewControllerTests.swift

@@ -37,6 +37,7 @@ final class ZClientViewControllerTests: XCTestCase {
         userSession.coreDataStack = coreDataFixture.coreDataStack
         sut = ZClientViewController(
             account: Account.mockAccount(imageData: mockImageData),
+            contextProvider: DefaultManagedObjectContextProvider(contextProvider: coreDataFixture.coreDataStack),
             selfProfileViewsMonitor: MockSelfProfileViewsMonitorImplementation(didViewSelfProfile: false),
             userSession: userSession,
             trackingManager: nil,

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

@@ -646,10 +646,10 @@
 				ConversationMessageCell/MockCell.swift,
 				ConversationMessageCell/ReadReceiptSystemMessage/ReadReceiptViewModelTests.swift,
 				ConversationMessageCell/SimpleChatBubblesSnapshotTests.swift,
-				ConversationOptionsServicesViewControllerTests.swift,
 				ConversationOptionsViewControllerTests.swift,
 				ConversationReplyCellDescriptionTests.swift,
 				ConversationReplyCellTests.swift,
+				ConversationServicesOptionsViewControllerTests.swift,
 				ConversationStatusTests.swift,
 				"ConversationStatusTests+Icon.swift",
 				ConversationTitleViewTests.swift,

wire-ios/Wire-iOS/Sources/UserInterface/AddContacts/AddParticipantsViewController.swift

@@ -369,6 +369,7 @@ final class AddParticipantsViewController: UIViewController {
             let updated = ConversationCreationValues(
                 isChannel: values.isChannel,
                 isAppsFeatureEnabled: values.isAppsFeatureEnabled,
+                areLegacyBotsAvailable: values.areLegacyBotsAvailable,
                 name: values.name,
                 participants: userSelection.users,
                 allowGuests: values.allowGuests,