chore: remove ZMUser.selfUser(inUserSession:) - WPB-20362 (#4260)

Author: caldrian

wire-ios-data-model/Source/Model/User/UserType+Federation.swift

@@ -16,8 +16,6 @@
 // along with this program. If not, see http://www.gnu.org/licenses/.
 //
 
-import Foundation
-
 extension UserType {
 
     func isFederating(with otherUser: UserType) -> Bool {

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

@@ -105,7 +105,7 @@ public class ZMSearchUser: NSObject, UserType {
         user?.objectId ?? remoteIdentifier!
     }
 
-    fileprivate weak var contextProvider: ContextProvider?
+    fileprivate weak var viewContext: NSManagedObjectContext?
     private let searchUsersCache: SearchUsersCache?
 
     fileprivate var internalDomain: String?
@@ -162,16 +162,12 @@ public class ZMSearchUser: NSObject, UserType {
     }
 
     public var isFederated: Bool {
-        guard let contextProvider else {
-            return false
-        }
-
-        return ZMUser.selfUser(inUserSession: contextProvider).isFederating(with: self)
+        guard let viewContext else { return false }
+        return ZMUser.selfUser(in: viewContext).isFederating(with: self)
     }
 
     public var isSelfUser: Bool {
         guard let user else { return false }
-
         return user.isSelfUser
     }
 
@@ -265,8 +261,8 @@ public class ZMSearchUser: NSObject, UserType {
     }
 
     public var oneToOneConversation: ZMConversation? {
-        if isTeamMember, let uiContext = contextProvider?.viewContext {
-            materialize(in: uiContext)?.oneToOneConversation
+        if isTeamMember, let viewContext {
+            materialize(in: viewContext)?.oneToOneConversation
         } else {
             user?.oneToOneConversation
         }
@@ -482,7 +478,7 @@ public class ZMSearchUser: NSObject, UserType {
 
     @objc
     public required init(
-        contextProvider: ContextProvider,
+        viewContext: NSManagedObjectContext,
         name: String,
         handle: String?,
         accentColor: ZMAccentColor?,
@@ -503,10 +499,10 @@ public class ZMSearchUser: NSObject, UserType {
         self.internalDomain = domain
         self.remoteIdentifier = existingUser?.remoteIdentifier ?? remoteIdentifier
         self.teamIdentifier = existingUser?.teamIdentifier ?? teamIdentifier
-        self.contextProvider = contextProvider
+        self.viewContext = viewContext
         self.searchUsersCache = searchUsersCache
 
-        let selfUser = ZMUser.selfUser(inUserSession: contextProvider)
+        let selfUser = ZMUser.selfUser(in: viewContext)
         self.internalIsTeamMember = teamIdentifier != nil && selfUser.teamIdentifier == teamIdentifier
         self.internalIsConnected = internalIsTeamMember
 
@@ -524,7 +520,7 @@ public class ZMSearchUser: NSObject, UserType {
         searchUsersCache: SearchUsersCache?
     ) {
         self.init(
-            contextProvider: contextProvider,
+            viewContext: contextProvider.viewContext,
             name: user.name ?? "",
             handle: user.handle,
             accentColor: user.zmAccentColor,
@@ -556,7 +552,7 @@ public class ZMSearchUser: NSObject, UserType {
         let accentColorRawValue = (payload["accent_id"] as? NSNumber)?.int16Value ?? 0
 
         self.init(
-            contextProvider: contextProvider,
+            viewContext: contextProvider.viewContext,
             name: name,
             handle: handle,
             accentColor: .from(rawValue: accentColorRawValue) ?? .default,
@@ -611,7 +607,7 @@ public class ZMSearchUser: NSObject, UserType {
     }
 
     public func connect(completion: @escaping (Error?) -> Void) {
-        let selfUser = ZMUser.selfUser(inUserSession: contextProvider!)
+        let selfUser = ZMUser.selfUser(in: viewContext!)
         selfUser.sendConnectionRequest(to: self) { [weak self] result in
             switch result {
             case .success:
@@ -628,7 +624,7 @@ public class ZMSearchUser: NSObject, UserType {
     private func updateLocalUser() {
         guard
             let userID = remoteIdentifier,
-            let viewContext = contextProvider?.viewContext
+            let viewContext
         else {
             return
         }
@@ -637,7 +633,7 @@ public class ZMSearchUser: NSObject, UserType {
     }
 
     private func notifySearchUserChanged() {
-        contextProvider?.viewContext.searchUserObserverCenter.notifyUpdatedSearchUser(self)
+        viewContext?.searchUserObserverCenter.notifyUpdatedSearchUser(self)
     }
 
     public func accept(completion: @escaping (Error?) -> Void) {
@@ -671,7 +667,7 @@ public class ZMSearchUser: NSObject, UserType {
 
         if let user {
             user.requestPreviewProfileImage()
-        } else if let notificationContext = contextProvider?.viewContext.notificationContext {
+        } else if let notificationContext = viewContext?.notificationContext {
             NotificationInContext(
                 name: .searchUserDidRequestPreviewAsset,
                 context: notificationContext,
@@ -686,7 +682,7 @@ public class ZMSearchUser: NSObject, UserType {
 
         if let user {
             user.requestCompleteProfileImage()
-        } else if let notificationContext = contextProvider?.viewContext.notificationContext {
+        } else if let notificationContext = viewContext?.notificationContext {
             NotificationInContext(
                 name: .searchUserDidRequestCompleteAsset,
                 context: notificationContext,
@@ -731,7 +727,7 @@ public class ZMSearchUser: NSObject, UserType {
             internalCompleteImageData = imageData
         }
 
-        contextProvider?.viewContext.searchUserObserverCenter.notifyUpdatedSearchUser(self)
+        viewContext?.searchUserObserverCenter.notifyUpdatedSearchUser(self)
     }
 
     public func update(from payload: [String: Any]) {

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

@@ -717,17 +717,6 @@ + (instancetype)selfUserInContext:(NSManagedObjectContext *)moc;
 @end
 
 
-@implementation ZMUser (Utilities)
-
-+ (ZMUser<ZMEditableUserType> *)selfUserInUserSession:(id<ZMContextProvider>)session
-{
-    VerifyReturnNil(session != nil);
-    return [self selfUserInContext:session.viewContext];
-}
-
-@end
-
-
 
 
 @implementation ZMUser (Editable)

wire-ios-data-model/Source/Public/ZMUser.h

@@ -83,15 +83,6 @@ typedef NS_ENUM(int16_t, ZMBlockState) {
 @end
 
 
-@protocol ZMEditableUserType;
-
-@interface ZMUser (Utilities)
-
-+ (ZMUser<ZMEditableUserType> *_Nonnull)selfUserInUserSession:(id<ZMContextProvider> _Nonnull)session;
-
-@end
-
-
 
 
 @interface ZMUser (Connections)

wire-ios-data-model/Tests/Source/Model/Observer/SearchUserObserverCenterTests.swift

@@ -170,7 +170,7 @@ final class SearchUserObserverCenterTests: ModelObjectsTests {
         user: ZMUser? = nil
     ) -> ZMSearchUser {
         ZMSearchUser(
-            contextProvider: coreDataStack,
+            viewContext: coreDataStack.viewContext,
             name: name,
             handle: handle,
             accentColor: accentColor,

wire-ios-data-model/Tests/Source/Model/Observer/SearchUserObserverTests.swift

@@ -137,7 +137,7 @@ final class SearchUserObserverTests: NotificationDispatcherTestBase {
         user: ZMUser? = nil
     ) -> ZMSearchUser {
         ZMSearchUser(
-            contextProvider: coreDataStack,
+            viewContext: coreDataStack.viewContext,
             name: name,
             handle: name.lowercased(),
             accentColor: .amber,

wire-ios-data-model/Tests/Source/Model/Observer/SearchUserSnapshotTests.swift

@@ -225,7 +225,7 @@ final class SearchUserSnapshotTests: ZMBaseManagedObjectTest {
         user: ZMUser? = nil
     ) -> ZMSearchUser {
         ZMSearchUser(
-            contextProvider: coreDataStack,
+            viewContext: coreDataStack.viewContext,
             name: name,
             handle: handle,
             accentColor: accentColor,

wire-ios-data-model/Tests/Source/Model/User/ZMSearchUserTests+Connections.swift

@@ -24,7 +24,7 @@ final class ZMSearchUserTests_Connections: ModelObjectsTests {
     func testThatConnectSendsAConnectToUserNotification() {
         // given
         let searchUser = ZMSearchUser(
-            contextProvider: coreDataStack,
+            viewContext: coreDataStack.viewContext,
             name: "John Doe",
             handle: "johndoe",
             accentColor: .turquoise,

wire-ios-data-model/Tests/Source/Model/User/ZMSearchUserTests+ProfileImages.swift

@@ -177,7 +177,7 @@ final class ZMSearchUserTests_ProfileImages: ZMBaseManagedObjectTest {
         user: ZMUser? = nil
     ) -> ZMSearchUser {
         ZMSearchUser(
-            contextProvider: coreDataStack,
+            viewContext: coreDataStack.viewContext,
             name: name,
             handle: name.lowercased(),
             accentColor: .amber,

wire-ios-data-model/Tests/Source/Model/User/ZMSearchUserTests+TeamUser.swift

@@ -73,7 +73,7 @@ final class ZMSearchUserTests_TeamUser: ModelObjectsTests {
 
     private func makeSearchUser(teamIdentifier: UUID?) -> ZMSearchUser {
         ZMSearchUser(
-            contextProvider: coreDataStack,
+            viewContext: coreDataStack.viewContext,
             name: "Foo",
             handle: "foo",
             accentColor: .amber,