wireapp · caldrian · Dec 11, 2025 · Dec 3, 2025 · Dec 3, 2025 · Dec 3, 2025
diff --git a/WireDomain/Sources/WireDomain/Repositories/Message/MessageLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/Message/MessageLocalStore.swift
@@ -680,7 +680,7 @@ public final class MessageLocalStore: MessageLocalStoreProtocol {
 
                 let members = selfUserTeam.members.compactMap(\.user)
                 let guests = localParticipants.filter {
-                    !$0.isApp && $0.membership == nil
+                    !$0.isAppOrBot && $0.membership == nil
                 }
 
                 newConversationMessage.allTeamUsersAdded = localParticipants.isSuperset(of: members)

diff --git a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesView.swift b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesView.swift
@@ -126,7 +126,7 @@ private extension FilesView {
             }
         }
 
-        if !viewModel.isRecycleBin {
+        if !viewModel.isRecycleBin, viewModel.isFoldersEnabled {
             ToolbarItem(placement: .navigationBarTrailing) {
                 moreActionsButton
             }

diff --git a/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack.swift b/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack.swift
@@ -40,7 +40,7 @@ extension CoreDataStackError: LocalizedError {
     }
 }
 
-@objc
+@objc(ZMContextProvider)
 public protocol ContextProvider {
 
     var account: Account { get }
@@ -114,8 +114,8 @@ public protocol CoreDataStackProtocol: ContextProvider {
 
 }
 
-@objcMembers
-public class CoreDataStack: NSObject, CoreDataStackProtocol {
+@objc @objcMembers
+public class CoreDataStack: NSObject, CoreDataStackProtocol, ContextProvider {
 
     public let account: Account
 

diff --git a/wire-ios-data-model/Source/Model/Conversation/ConversationLike.swift b/wire-ios-data-model/Source/Model/Conversation/ConversationLike.swift
@@ -102,13 +102,13 @@ extension ZMConversation: ConversationLike {
 
     public var sortedOtherParticipants: [UserType] {
         localParticipants
-            .filter { !$0.isApp }
+            .filter { !$0.isAppOrBot }
             .sortedAscendingPrependingNil(by: \.name)
     }
 
     public var sortedApps: [UserType] {
         localParticipants
-            .filter(\.isApp)
+            .filter(\.isAppOrBot)
             .sortedAscendingPrependingNil(by: \.name)
     }
 

diff --git a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+ExternalParticipant.swift b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+ExternalParticipant.swift
@@ -48,6 +48,7 @@ public extension ZMConversation {
     internal class func keyPathsForValuesAffectingExternalParticipantsState() -> Set<String> {
         [
             "participantRoles.user.isApp",
+            "participantRoles.user.isBot",
             "participantRoles.user.hasTeam",
             "participantRoles.user.isExternalPartner"
         ]
@@ -63,7 +64,7 @@ public extension ZMConversation {
         let selfUser = ZMUser.selfUser(in: managedObjectContext!)
         let otherUsers = participants.subtracting([selfUser])
 
-        if otherUsers.count == 1, otherUsers.first!.isApp {
+        if otherUsers.count == 1, otherUsers.first!.isAppOrBot {
             return []
         }
 
@@ -75,7 +76,7 @@ public extension ZMConversation {
         for user in otherUsers {
             if canDisplayGuests, user.isFederated {
                 state.insert(.visibleRemotes)
-            } else if user.isApp {
+            } else if user.isAppOrBot {
                 state.insert(.visibleApps)
             } else if canDisplayExternals, user.isExternalPartner {
                 state.insert(.visibleExternals)
@@ -98,7 +99,7 @@ public extension ZMConversation {
     /// Returns whether apps are present, regardless of the display rules.
 
     var areAppsPresent: Bool {
-        localParticipants.any(\.isApp)
+        localParticipants.any(\.isAppOrBot)
     }
 
     /// Returns whether guests are present, regardless of the display rules.

diff --git a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+SystemMessages.swift b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+SystemMessages.swift
@@ -97,7 +97,7 @@ public extension ZMConversation {
            team == selfUserTeam {
 
             let members = selfUserTeam.members.compactMap(\.user)
-            let guests = users.filter { !$0.isApp && $0.membership == nil }
+            let guests = users.filter { !$0.isAppOrBot && $0.membership == nil }
 
             systemMessage.allTeamUsersAdded = users.isSuperset(of: members)
             systemMessage.numberOfGuestsAdded = Int16(guests.count)

diff --git a/wire-ios-data-model/Source/Model/Conversation/ZMConversation.m b/wire-ios-data-model/Source/Model/Conversation/ZMConversation.m
@@ -393,7 +393,7 @@ + (NSSet *)keyPathsForValuesAffectingIsReadOnly;
     return [NSSet setWithObjects:ZMConversationConversationTypeKey, ZMConversationParticipantRolesKey, ZMConversationIsForcedReadOnlyKey, nil];
 }
 
-+ (instancetype)existingOneOnOneConversationWithUser:(ZMUser *)otherUser inUserSession:(id<ContextProvider>)session;
++ (instancetype)existingOneOnOneConversationWithUser:(ZMUser *)otherUser inUserSession:(id<ZMContextProvider>)session;
 {
     NOT_USED(session);
     return otherUser.oneOnOneConversation;

diff --git a/wire-ios-data-model/Source/Model/User/ServiceUser.swift b/wire-ios-data-model/Source/Model/User/ServiceUser.swift
@@ -16,19 +16,20 @@
 // along with this program. If not, see http://www.gnu.org/licenses/.
 //
 
-import Foundation
-
 @objc
-public protocol ServiceUser: AnyObject, UserType {
+public protocol Bot: AnyObject, UserType {
     var providerIdentifier: String? { get }
     var serviceIdentifier: String? { get }
 }
 
 @objc
-public protocol SearchServiceUser: ServiceUser {
+public protocol BotSearchResult: Bot {
     var summary: String? { get }
 }
 
+public typealias ServiceUser = Bot
+public typealias SearchServiceUser = BotSearchResult
+
 extension ZMUser {
     static let servicesMustBeMentioned = false
     static let serviceMentionKeyword = "@bots"

diff --git a/wire-ios-data-model/Source/Model/User/Set+ServiceUser.swift b/wire-ios-data-model/Source/Model/User/Set+ServiceUser.swift
@@ -16,16 +16,14 @@
 // along with this program. If not, see http://www.gnu.org/licenses/.
 //
 
-import Foundation
-
 extension Set<ZMUser> {
 
-    var apps: Set<ZMUser> {
-        filter(\.isApp)
+    var appsOrBots: Set<ZMUser> {
+        filter(\.isAppOrBot)
     }
 
     func categorizeServicesAndUser() -> (services: Set<ZMUser>, users: Set<ZMUser>) {
-        let services = apps
+        let services = appsOrBots
         let users = subtracting(services)
         return (services, users)
     }

diff --git a/wire-ios-data-model/Source/Model/User/UserType.swift b/wire-ios-data-model/Source/Model/User/UserType.swift
@@ -72,10 +72,16 @@ public protocol UserType: NSObjectProtocol, UserConnections {
     /// The role (and permissions) e.g. partner, member, admin, owner
     var teamRole: TeamRole { get }
 
-    /// Whether this is an app/bot/service user.
+    /// Whether this is an app (new-style MLS service).
 
     var isApp: Bool { get }
 
+    /// Whether this is a bot (old-style service).
+
+    var isBot: Bool { get }
+
+    var isAppOrBot: Bool { get }
+
     /// Whether this uses uses SSO.
     var usesCompanyLogin: Bool { get }
 

diff --git a/wire-ios-data-model/Source/Model/User/ZMSearchUser.swift b/wire-ios-data-model/Source/Model/User/ZMSearchUser.swift
@@ -93,6 +93,7 @@ extension ZMSearchUser: SearchServiceUser {
 
 @objc
 public class ZMSearchUser: NSObject, UserType {
+
     public var providerIdentifier: String?
     public var summary: String?
     public var assetKeys: SearchUserAssetKeys?
@@ -209,9 +210,15 @@ public class ZMSearchUser: NSObject, UserType {
     }
 
     public var isApp: Bool {
-        providerIdentifier != nil
+        false // Apps (new-style services) don't use ZMSearchUser
+    }
+
+    public var isBot: Bool {
+        providerIdentifier?.isEmpty == false
     }
 
+    public var isAppOrBot: Bool { isBot }
+
     public var usesCompanyLogin: Bool {
         user?.usesCompanyLogin == true
     }
@@ -474,7 +481,7 @@ public class ZMSearchUser: NSObject, UserType {
     }
 
     @objc
-    public init(
+    public required init(
         contextProvider: ContextProvider,
         name: String,
         handle: String?,
@@ -650,7 +657,7 @@ public class ZMSearchUser: NSObject, UserType {
     }
 
     @objc public var canBeConnected: Bool {
-        guard !isApp else { return false }
+        guard !isAppOrBot else { return false }
 
         if let user {
             return user.canBeConnected

diff --git a/wire-ios-data-model/Source/Model/User/ZMUser+Permissions.swift b/wire-ios-data-model/Source/Model/User/ZMUser+Permissions.swift
@@ -257,7 +257,7 @@ public extension ZMUser {
                 return false
             }
 
-            return !isApp // Bots are never guests
+            return !isAppOrBot // Apps or bots are never guests
                 && !isFederated // Federated users are never guests
                 && ZMUser.selfUser(in: context).hasTeam // There can't be guests in a team that doesn't exist
                 && conversation.localParticipantsContain(user: self)

diff --git a/wire-ios-data-model/Source/Model/User/ZMUser.m b/wire-ios-data-model/Source/Model/User/ZMUser.m
@@ -163,6 +163,16 @@ @implementation ZMUser
     return [NSSet setWithObjects:TypeKey, nil];
 }
 
++ (NSSet<NSString *> *)keyPathsForValuesAffectingIsBot
+{
+    return [NSSet setWithObjects:TypeKey, nil];
+}
+
++ (NSSet<NSString *> *)keyPathsForValuesAffectingIsAppOrBot
+{
+    return [NSSet setWithObjects:TypeKey, nil];
+}
+
 - (BOOL)isSelfUser
 {
     if ([self isZombieObject]) {
@@ -239,7 +249,7 @@ - (BOOL) managedByWire {
 
 - (BOOL)canBeConnected;
 {
-    if (self.isApp || self.isWirelessUser) {
+    if (self.isAppOrBot || self.isWirelessUser) {
         return NO;
     }
     return ! self.isConnected && ! self.isPendingApprovalByOtherUser;
@@ -710,7 +720,7 @@ + (instancetype)selfUserInContext:(NSManagedObjectContext *)moc;
 
 @implementation ZMUser (Utilities)
 
-+ (ZMUser<ZMEditableUserType> *)selfUserInUserSession:(id<ContextProvider>)session
++ (ZMUser<ZMEditableUserType> *)selfUserInUserSession:(id<ZMContextProvider>)session
 {
     VerifyReturnNil(session != nil);
     return [self selfUserInContext:session.viewContext];

diff --git a/wire-ios-data-model/Source/Model/User/ZMUser.swift b/wire-ios-data-model/Source/Model/User/ZMUser.swift
@@ -64,7 +64,15 @@ extension ZMUser: UserType {
     }
 
     @objc public var isApp: Bool {
-        type == .app || type == .bot
+        type == .app
+    }
+
+    @objc public var isBot: Bool {
+        type == .bot
+    }
+
+    @objc public var isAppOrBot: Bool {
+        isApp || isBot
     }
 
     public var teamName: String? {

diff --git a/wire-ios-data-model/Source/Model/ZMManagedObject.m b/wire-ios-data-model/Source/Model/ZMManagedObject.m
@@ -39,7 +39,7 @@ @interface ZMManagedObject ()
 
 @implementation ZMManagedObject
 
-+ (NSManagedObjectID *)objectIDForURIRepresentation:(NSURL *)url inUserSession:(id<ContextProvider>)userSession
++ (NSManagedObjectID *)objectIDForURIRepresentation:(NSURL *)url inUserSession:(id<ZMContextProvider>)userSession
 {
     VerifyReturnNil(url != nil);
     VerifyReturnNil(userSession != nil);
@@ -56,7 +56,7 @@ + (NSManagedObjectID *)objectIDForURIRepresentation:(NSURL *)url inManagedObject
     return [psc managedObjectIDForURIRepresentation:url];
 }
 
-+ (instancetype)existingObjectWithID:(NSManagedObjectID *)identifier inUserSession:(id<ContextProvider>)userSession;
++ (instancetype)existingObjectWithID:(NSManagedObjectID *)identifier inUserSession:(id<ZMContextProvider>)userSession;
 {
     VerifyReturnNil(identifier);
     VerifyReturnNil(userSession);

diff --git a/wire-ios-data-model/Source/Notifications/ObjectObserverTokens/UserChangeInfo.swift b/wire-ios-data-model/Source/Notifications/ObjectObserverTokens/UserChangeInfo.swift
@@ -47,6 +47,7 @@ extension ZMUser: ObjectInSnapshot {
             #keyPath(ZMUser.readReceiptsEnabledChangedRemotely),
             ZMUserKeys.RichProfile,
             #keyPath(ZMUser.isApp),
+            #keyPath(ZMUser.isBot),
             #keyPath(ZMUser.serviceIdentifier),
             #keyPath(ZMUser.providerIdentifier),
             ZMUserKeys.legalHoldRequest,

diff --git a/wire-ios-data-model/Source/Public/ZMConversation.h b/wire-ios-data-model/Source/Public/ZMConversation.h
@@ -97,7 +97,7 @@ typedef NS_ENUM(int16_t, ZMConversationListIndicator) {
 - (void)markAsUnread;
 
 /// If that conversation exists, it is returned, @c nil otherwise.
-+ (nullable instancetype)existingOneOnOneConversationWithUser:(nonnull ZMUser *)otherUser inUserSession:(nonnull id<ContextProvider> )session;
++ (nullable instancetype)existingOneOnOneConversationWithUser:(nonnull ZMUser *)otherUser inUserSession:(nonnull id<ZMContextProvider> )session;
 
 @end
 

diff --git a/wire-ios-data-model/Source/Public/ZMManagedObject.h b/wire-ios-data-model/Source/Public/ZMManagedObject.h
@@ -20,15 +20,15 @@
 
 extern NSString * _Nonnull const ZMDataPropertySuffix;
 
-@protocol ContextProvider;
+@protocol ZMContextProvider;
 
 @interface ZMManagedObject : NSManagedObject
 
 @property (nonatomic, readonly) BOOL isZombieObject;
 
-+ (nullable NSManagedObjectID *)objectIDForURIRepresentation:(nullable NSURL *)url inUserSession:(nullable id<ContextProvider>)userSession;
++ (nullable NSManagedObjectID *)objectIDForURIRepresentation:(nullable NSURL *)url inUserSession:(nullable id<ZMContextProvider>)userSession;
 + (nullable NSManagedObjectID *)objectIDForURIRepresentation:(nullable NSURL *)url inManagedObjectContext:(nullable NSManagedObjectContext *)context;
-+ (nullable instancetype)existingObjectWithID:(nullable NSManagedObjectID *)identifier inUserSession:(nullable id<ContextProvider>)userSession;
++ (nullable instancetype)existingObjectWithID:(nullable NSManagedObjectID *)identifier inUserSession:(nullable id<ZMContextProvider>)userSession;
 + (nullable instancetype)existingObjectWithObjectIdentifier:(nullable NSString *)identifier inManagedObjectContext:(nullable NSManagedObjectContext *)context;
 
 - (nullable NSString *)objectIDURLString;

diff --git a/wire-ios-data-model/Source/Public/ZMUser.h b/wire-ios-data-model/Source/Public/ZMUser.h
@@ -87,7 +87,7 @@ typedef NS_ENUM(int16_t, ZMBlockState) {
 
 @interface ZMUser (Utilities)
 
-+ (ZMUser<ZMEditableUserType> *_Nonnull)selfUserInUserSession:(id<ContextProvider> _Nonnull)session;
++ (ZMUser<ZMEditableUserType> *_Nonnull)selfUserInUserSession:(id<ZMContextProvider> _Nonnull)session;
 
 @end
 

diff --git a/wire-ios-data-model/Tests/Source/Model/TeamTests.swift b/wire-ios-data-model/Tests/Source/Model/TeamTests.swift
@@ -83,7 +83,7 @@ final class TeamTests: ZMConversationTestsBase {
         let guest = ZMUser.insertNewObject(in: uiMOC)
         let bot = ZMUser.insertNewObject(in: uiMOC)
         bot.type = .bot
-        XCTAssert(bot.isApp)
+        XCTAssert(bot.isAppOrBot)
         guard let conversation = ZMConversation.insertGroupConversation(
             moc: uiMOC,
             participants: [guest, bot],

diff --git a/wire-ios-data-model/Tests/Source/Model/User/ZMSearchUserPayloadParsingTests.swift b/wire-ios-data-model/Tests/Source/Model/User/ZMSearchUserPayloadParsingTests.swift
@@ -63,7 +63,7 @@ final class ZMSearchUserPayloadParsingTests: ZMBaseManagedObjectTest {
         XCTAssertEqual(user.domain, domain)
         XCTAssertEqual(user.remoteIdentifier, uuid)
         XCTAssertEqual(user.zmAccentColor?.rawValue, 5)
-        XCTAssertFalse(user.isApp)
+        XCTAssertFalse(user.isAppOrBot)
         XCTAssertTrue(user.canBeConnected)
     }
 
@@ -88,7 +88,7 @@ final class ZMSearchUserPayloadParsingTests: ZMBaseManagedObjectTest {
         )!
 
         // then
-        XCTAssertTrue(user.isApp)
+        XCTAssertTrue(user.isAppOrBot)
         XCTAssertEqual(user.summary, "Short summary")
         XCTAssertEqual(user.providerIdentifier, provider.transportString())
         XCTAssertEqual(user.serviceIdentifier, uuid.transportString())

diff --git a/wire-ios-data-model/Tests/Source/Model/User/ZMUserTests.m b/wire-ios-data-model/Tests/Source/Model/User/ZMUserTests.m
@@ -1927,7 +1927,7 @@ - (void)testThatItReturnsCorrectUserNameForService
     user.name = @"User Name";
     [user setValue:@(ZMTypeOfUserBot) forKey:@"typeValue"];
 
-    XCTAssertTrue(user.isApp);
+    XCTAssertTrue(user.isAppOrBot);
     XCTAssertEqualObjects(user.name, @"User Name");
 }
 

diff --git a/wire-ios-sync-engine/Source/Synchronization/ZMSyncStrategy.h b/wire-ios-sync-engine/Source/Synchronization/ZMSyncStrategy.h
@@ -35,7 +35,7 @@
 
 @interface ZMSyncStrategy : NSObject <TearDownCapable, RequestStrategy>
 
-- (instancetype _Nonnull )initWithContextProvider:(id<ContextProvider> _Nonnull)contextProvider
+- (instancetype _Nonnull )initWithContextProvider:(id<ZMContextProvider> _Nonnull)contextProvider
                           notificationsDispatcher:(NotificationDispatcher * _Nonnull)notificationsDispatcher
                                   operationStatus:(OperationStatus * _Nonnull)operationStatus
                                       application:(id<ZMApplication> _Nonnull)application

diff --git a/wire-ios-sync-engine/Source/Synchronization/ZMSyncStrategy.m b/wire-ios-sync-engine/Source/Synchronization/ZMSyncStrategy.m
@@ -58,7 +58,7 @@ @implementation ZMSyncStrategy
 ZM_EMPTY_ASSERTING_INIT()
 
 
-- (instancetype)initWithContextProvider:(id<ContextProvider>)contextProvider
+- (instancetype)initWithContextProvider:(id<ZMContextProvider>)contextProvider
                 notificationsDispatcher:(NotificationDispatcher *)notificationsDispatcher
                         operationStatus:(OperationStatus *)operationStatus
                             application:(id<ZMApplication>)application
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,7 +87,7 @@ typedef NS_ENUM(int16_t, ZMBlockState) { @@
     @interface ZMUser (Utilities)
-    + (ZMUser<ZMEditableUserType> *_Nonnull)selfUserInUserSession:(id<ContextProvider> _Nonnull)session;
+    + (ZMUser<ZMEditableUserType> *_Nonnull)selfUserInUserSession:(id<ZMContextProvider> _Nonnull)session;
     @end
@@ Expand Down @@