chore: separate user properties isApp and isBot - WPB-21441

WireDomain/Sources/WireDomain/Repositories/Message/MessageLocalStore.swift

@@ -18,7 +18,7 @@
 
 import CoreData
 import GenericMessageProtocol
 import WireCryptobox
 import WireDataModel
 import WireLogging
 
@@ -71,7 +71,7 @@
 
         return await context.perform { [context] in
             ZMOTRMessage.fetch(
                 withNonce: id,
                 for: conversation,
                 in: context
             )
@@ -86,7 +86,7 @@
             ZMUser.selfUser(in: context)
         }
 
         return await context.perform {
             text.mentions.any { $0.userID.uppercased() == selfUser.remoteIdentifier.uuidString }
         }
     }
@@ -94,7 +94,7 @@
     public func isMessageQuotingSelf(
         quotedMessage: ZMOTRMessage?
     ) async -> Bool {
         await context.perform {
             quotedMessage?.sender?.isSelfUser ?? false
         }
     }
@@ -150,8 +150,8 @@
             ZMUser.selfUser(in: context)
         }
 
         return await context.perform {
             let isSelf = conversation.isSelfConversation && senderID != selfUser.remoteIdentifier
             return !isSelf && !conversation.isForcedReadOnly
         }
     }
@@ -200,13 +200,13 @@
     ) async {
         await context.perform { [self] in
             if isNewMessage {
                 do {
                     try clientMessage.setUnderlyingMessage(genericMessage)
                     clientMessage.updateNormalizedText()
                 } catch {
                     assertionFailure("Failed to set generic message: \(error.localizedDescription)")
                 }
             } else {
                 applyLinkPreviewUpdate(
                     clientMessage: clientMessage,
                     updatedMessage: genericMessage,
@@ -217,7 +217,7 @@
             finalizeMessageUpdate(
                 message: clientMessage,
                 senderID: senderID,
                 senderDomain: senderDomain,
                 conversation: conversation
             )
         }
@@ -232,7 +232,7 @@
         senderDomain: String
     ) async {
         await context.perform { [self] in
             do {
                 try assetClientMessage.setUnderlyingMessage(genericMessage)
             } catch {
                 return assertionFailure(
@@ -242,7 +242,7 @@
 
             // We assume received assets are V3 since backend no longer supports sending V2 assets.
             assetClientMessage.version = 3
 
             assetTransferStateResolver.resolveTransferState(
                 assetMessage: assetClientMessage,
                 genericMessage: genericMessage,
@@ -252,7 +252,7 @@
             finalizeMessageUpdate(
                 message: assetClientMessage,
                 senderID: senderID,
                 senderDomain: senderDomain,
                 conversation: conversation
             )
         }
@@ -270,7 +270,7 @@
         await context.perform { [self] in
             guard let conversation = ZMConversation.fetch(
                 with: conversationID,
                 domain: conversationDomain,
                 in: context
             ) else { return }
 
@@ -294,7 +294,7 @@
         _ hiddenMessage: MessageHide,
         in conversation: ZMConversation
     ) async {
         await context.perform { [context] in
             guard conversation.isSelfConversation else {
                 return
             }
@@ -313,7 +313,7 @@
     ) async {
         await context.perform { [context] in
             ZMMessage.remove(
                 remotelyDeletedMessage: deletedMessage,
                 inConversation: conversation,
                 senderID: senderID,
                 inContext: context
@@ -330,7 +330,7 @@
         await context.perform { [context] in
             ZMMessage.add(
                 reaction: messageReaction,
                 senderID: senderID,
                 conversation: conversation,
                 creationDate: date,
                 inContext: context
@@ -347,7 +347,7 @@
     ) async {
         await context.perform {
             _ = ZMMessageConfirmation.createMessageConfirmations(
                 confirmation,
                 conversation: conversation,
                 senderUUID: senderID,
                 senderDomain: senderDomain,
@@ -369,7 +369,7 @@
 
             ZMClientMessage.updateButtonStates(
                 buttonID: buttonID,
                 referenceMessageID: referenceMessageID,
                 for: conversation,
                 in: context
             )
@@ -391,8 +391,8 @@
 
         await context.perform { [self] in
             guard let editedClientMessage = ZMClientMessage.fetch(
                 withNonce: editedMessageID,
                 for: conversation,
                 in: context
             ) else {
                 return
@@ -423,7 +423,7 @@
         date: Date
     ) async throws -> (ZMOTRMessage, isNew: Bool) {
         try await context.perform { [self] in
 
             if let clearedTime = conversation.clearedTimeStamp, clearedTime.compare(date) != .orderedAscending {
                 throw Failure.invalidInsertion(reason: "message is older than cleared time")
             }
@@ -439,7 +439,7 @@
             let clientMessage = messageType == .asset ?
                 ZMAssetClientMessage.fetch(
                     withNonce: nonce,
                     for: conversation,
                     in: context
                 ) :
                 ZMClientMessage.fetch(
@@ -532,7 +532,7 @@
         case let .participantsRemovedAnonymously(participants, date):
 
             let removedUsers = await context.perform {
                 participants.compactMap { id, domain in
                     let existing = conversation.localParticipants
 
                     return existing.first(where: {
@@ -556,7 +556,7 @@
         case let .participantsRemoved(participants, sender, date):
 
             let removedUsers = await context.perform {
                 participants.compactMap { id, domain in
                     let existing = conversation.localParticipants
 
                     return existing.first(where: {
@@ -658,7 +658,7 @@
             let selfUser = await fetchSelfUser()
 
             let (creator, localParticipants, userDefinedName) = await context.perform {
                 (
                     conversation.creator,
                     conversation.localParticipants,
                     conversation.userDefinedName
@@ -672,22 +672,22 @@
                 timestamp: date
             )
 
             await context.perform {
                 newConversationMessage.text = userDefinedName
 
                 guard let selfUserTeam = selfUser.team,
                       conversation.team == selfUserTeam else { return }
 
                 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)
                 newConversationMessage.numberOfGuestsAdded = Int16(guests.count)
             }
 
             let hasReadReceiptsEnabled = await context.perform {
                 conversation.hasReadReceiptsEnabled
             }
 
@@ -738,11 +738,11 @@
                 timestamp: date
             )
 
             let previousLastMessage = await context.perform {
                 conversation.lastMessage
             }
 
             await context.perform { [context] in
                 let lastMessage = previousLastMessage as? ZMSystemMessage
                 let isPotentialGapMigration = lastMessage?.systemMessageType == .mlsMigrationPotentialGap
                 let lastMessageTimestamp = lastMessage?.serverTimestamp
@@ -775,7 +775,7 @@
 
         case let .receiptModeIsOn(date):
 
             let creator = await context.perform {
                 conversation.creator
             }
 
@@ -827,7 +827,7 @@
                 return []
             }
 
             let senderClient = await context.perform {
                 sender.clients.first(where: {
                     $0.remoteIdentifier == senderClientID
                 })
@@ -858,7 +858,7 @@
 
             let client = await context.perform {
                 UserClient.fetchUserClient(
                     withRemoteId: senderClientID,
                     forUser: sender,
                     createIfNeeded: true
                 )
@@ -910,8 +910,8 @@
                 timestamp: date
             )
 
             await context.perform {
                 systemMessage.text = newName
                 systemMessage.visibleInConversation = conversation
                 conversation.updateTimestampsAfterUpdatingMessage(systemMessage)
             }
@@ -932,7 +932,7 @@
                 timestamp: date
             )
 
             await context.perform {
                 let isArchived = conversation.isArchived
                 let mutedMessageTypes = conversation.mutedMessageTypes
 
@@ -976,10 +976,10 @@
     ) async -> ZMSystemMessage {
         await context.perform { [context] in
             let systemMessage = ZMSystemMessage(nonce: UUID(), managedObjectContext: context)
             systemMessage.systemMessageType = messageType
             systemMessage.sender = sender
             systemMessage.users = users ?? Set()
             systemMessage.addedUsers = addedUsers
             systemMessage.clients = clients ?? Set()
             systemMessage.serverTimestamp = timestamp
             systemMessage.text = text
@@ -1004,8 +1004,8 @@
         _ messages: Set<ZMSystemMessage>,
         to conversation: ZMConversation
     ) async {
         await context.perform {
             for message in messages {
                 conversation.append(message)
             }
         }

wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack.swift

@@ -40,7 +40,7 @@
     }
 }
 
-@objc
+@objc(ZMContextProvider)
 public protocol ContextProvider {
 
     var account: Account { get }
@@ -114,8 +114,8 @@
 
 }
 
-@objcMembers
-public class CoreDataStack: NSObject, CoreDataStackProtocol {
+@objc @objcMembers
+public class CoreDataStack: NSObject, CoreDataStackProtocol, ContextProvider {
 
     public let account: Account
 
@@ -369,7 +369,7 @@
 
     func configureViewContext(_ context: NSManagedObjectContext) async {
         context.markAsUIContext()
         await context.perform {
             context.localDomain = self.localDomain
             context.isFederationEnabled = self.isFederationEnabled
             context.createDispatchGroups()
@@ -381,17 +381,17 @@
     }
 
     func configureContextReferences() async {
         await viewContext.perform {
             self.viewContext.zm_sync = self.syncContext
         }
         await syncContext.perform {
             self.syncContext.zm_userInterface = self.viewContext
         }
     }
 
     func configureSyncContext(_ context: NSManagedObjectContext) async {
         context.markAsSyncContext()
         await context.perform {
             context.localDomain = self.localDomain
             context.isFederationEnabled = self.isFederationEnabled
             context.createDispatchGroups()
@@ -417,7 +417,7 @@
 
     func configureSearchContext(_ context: NSManagedObjectContext) async {
         context.markAsSearch()
         await context.perform {
             context.localDomain = self.localDomain
             context.isFederationEnabled = self.isFederationEnabled
             context.createDispatchGroups()
@@ -430,7 +430,7 @@
 
     func configureEventContext(_ context: NSManagedObjectContext) async {
         await context.perform {
             context.createDispatchGroups()
             self.dispatchGroup.map(context.addGroup(_:))
         }
     }
@@ -559,7 +559,7 @@
 }
 
 // MARK: -
 
 public class PersistentContainer: NSPersistentContainer {
 
     var storeURL: URL? {

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)
     }
 

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.

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)

wire-ios-data-model/Source/Model/Conversation/ZMConversation.m

@@ -147,7 +147,7 @@
 @property (nonatomic) ZMConversationSecurityLevel securityLevel;
 @end
 
 
 @implementation ZMConversation
 
 @dynamic userDefinedName;
@@ -393,7 +393,7 @@
     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;

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"

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)
     }

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 }
 

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

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)

wire-ios-data-model/Source/Model/User/ZMUser.m

@@ -155,7 +155,7 @@
 @end
 
 
 
 @implementation ZMUser
 
 + (NSSet<NSString *> *)keyPathsForValuesAffectingIsApp
@@ -163,6 +163,16 @@
     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)canBeConnected;
 {
-    if (self.isApp || self.isWirelessUser) {
+    if (self.isAppOrBot || self.isWirelessUser) {
         return NO;
     }
     return ! self.isConnected && ! self.isPendingApprovalByOtherUser;
@@ -710,7 +720,7 @@
 
 @implementation ZMUser (Utilities)
 
-+ (ZMUser<ZMEditableUserType> *)selfUserInUserSession:(id<ContextProvider>)session
++ (ZMUser<ZMEditableUserType> *)selfUserInUserSession:(id<ZMContextProvider>)session
 {
     VerifyReturnNil(session != nil);
     return [self selfUserInContext:session.viewContext];

wire-ios-data-model/Source/Model/User/ZMUser.swift

@@ -64,7 +64,15 @@
     }
 
     @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? {
@@ -528,7 +536,7 @@
         Set(participantRoles.compactMap(\.conversation))
     }
 }
 
 extension NSManagedObject: SafeForLoggingStringConvertible {
     public var safeForLoggingDescription: String {
         let moc: String = managedObjectContext?.description ?? "nil"

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);

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,

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
 

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;

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
 

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],

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())

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");
 }
 

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

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

wire-ios-sync-engine/Source/UserSession/URLActionProcessors/ConnectToBotURLActionProcessor.swift

@@ -42,6 +42,7 @@ final class ConnectToBotURLActionProcessor: NSObject, URLActionProcessor {
     func process(urlAction: URLAction, delegate: PresentationDelegate?) {
         guard case let .connectBot(serviceUserData) = urlAction else { return }
 
+        let providerIdentifier = serviceUserData.provider.transportString()
         let serviceUser = ZMSearchUser(
             contextProvider: contextProvider,
             name: "",
@@ -52,7 +53,7 @@ final class ConnectToBotURLActionProcessor: NSObject, URLActionProcessor {
             user: nil,
             searchUsersCache: searchUsersCache
         )
-        serviceUser.providerIdentifier = serviceUserData.provider.transportString()
+        serviceUser.providerIdentifier = providerIdentifier
         serviceUser.createConversation(
             transportSession: transportSession,
             eventProcessor: eventProcessor,