chore: create searchContext on demand - WPB-20362

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

@@ -48,7 +48,6 @@
     var viewContext: NSManagedObjectContext { get }
     func newBackgroundContext() -> NSManagedObjectContext
     var syncContext: NSManagedObjectContext { get }
-    var searchContext: NSManagedObjectContext { get }
     var eventContext: NSManagedObjectContext { get }
 
 }
@@ -138,8 +137,6 @@
         return context
     }()
 
-    public lazy var searchContext: NSManagedObjectContext = messagesContainer.newBackgroundContext()
-
     public lazy var eventContext: NSManagedObjectContext = eventsContainer.newBackgroundContext()
 
     public let accountContainer: URL
@@ -253,7 +250,6 @@
 
         viewContext.tearDown()
         syncContext.tearDown()
-        searchContext.tearDown()
         eventContext.tearDown()
         closeStores()
     }
@@ -311,7 +307,6 @@
             await configureContextReferences()
             await configureViewContext(viewContext)
             await configureSyncContext(syncContext)
-            await configureSearchContext(searchContext)
 
         } catch {
             WireLogger.localStorage.critical(
@@ -374,7 +369,7 @@
 
     func configureViewContext(_ context: NSManagedObjectContext) async {
         context.markAsUIContext()
         await context.perform {
             context.localDomain = self.localDomain
             context.isFederationEnabled = self.isFederationEnabled
             context.createDispatchGroups()
@@ -386,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 {
         // Note: markAsSyncContext() is now called in the lazy initializer
         await context.perform {
             context.localDomain = self.localDomain
             context.isFederationEnabled = self.isFederationEnabled
             context.createDispatchGroups()
@@ -413,22 +408,9 @@
         }
     }
 
-    func configureSearchContext(_ context: NSManagedObjectContext) async {
-        context.markAsSearch()
-        await context.perform {
-            context.localDomain = self.localDomain
-            context.isFederationEnabled = self.isFederationEnabled
-            context.createDispatchGroups()
-            self.dispatchGroup.map(context.addGroup(_:))
-            context.setupLocalCachedSessionAndSelfUser()
-            context.undoManager = nil
-            context.mergePolicy = NSMergePolicy(merge: .rollbackMergePolicyType)
-        }
-    }
-
     func configureEventContext(_ context: NSManagedObjectContext) async {
         await context.perform {
             context.createDispatchGroups()
             self.dispatchGroup.map(context.addGroup(_:))
         }
     }
@@ -557,7 +539,7 @@
 }
 
 // MARK: -
 
 public class PersistentContainer: NSPersistentContainer {
 
     var storeURL: URL? {

wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+tests.h

@@ -22,7 +22,6 @@
 @interface NSManagedObjectContext (zmessagingTests)
 
 - (void)markAsSyncContext;
-- (void)markAsSearchContext;
 - (void)markAsUIContext;
 - (void)disableObjectRefresh;
 

wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+zmessaging.h

@@ -25,7 +25,6 @@
 
 extern NSString * _Nonnull const IsUserInterfaceContextKey;
 extern NSString * _Nonnull const IsSyncContextKey;
-extern NSString * _Nonnull const IsSearchContextKey;
 extern NSString * _Nonnull const IsEventContextKey;
 
 @interface NSManagedObjectContext (zmessaging)
@@ -37,9 +36,6 @@ extern NSString * _Nonnull const IsEventContextKey;
 /// Inverse of @c zm_isSyncContext
 @property (readonly) BOOL zm_isUserInterfaceContext;
 
-/// Returns @c YES if the receiver is a context that is used for searching.
-@property (readonly) BOOL zm_isSearchContext;
-
 /// Returns @c YES if the context should refresh objects following the policy for the sync context
 @property (readonly) BOOL zm_shouldRefreshObjectsWithSyncContextPolicy;
 

wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+zmessaging.m

@@ -31,7 +31,6 @@
 #import <WireDataModel/WireDataModel-Swift.h>
 
 NSString * const IsSyncContextKey = @"ZMIsSyncContext";
-NSString * const IsSearchContextKey = @"ZMIsSearchContext";
 NSString * const IsUserInterfaceContextKey = @"ZMIsUserInterfaceContext";
 NSString * const IsEventContextKey = @"ZMIsEventDecoderContext";
 
@@ -88,7 +87,7 @@ @implementation NSManagedObjectContext (zmessaging)
 
 - (BOOL)zm_isValidContext
 {
-    return self.zm_isSyncContext || self.zm_isUserInterfaceContext || self.zm_isSearchContext;
+    return self.zm_isSyncContext || self.zm_isUserInterfaceContext;
 }
 
 - (id)validUserInfoValueOfClass:(Class)class forKey:(NSString *)key
@@ -128,11 +127,6 @@ - (BOOL)zm_isUserInterfaceContext
     return [[self validUserInfoValueOfClass:[NSNumber class] forKey:IsUserInterfaceContextKey] boolValue];
 }
 
-- (BOOL)zm_isSearchContext
-{
-    return [self.userInfo[IsSearchContextKey] boolValue];
-}
-
 - (NSManagedObjectContext*)zm_syncContext
 {
     if (self.zm_isSyncContext) {
@@ -539,13 +533,6 @@ - (void)markAsSyncContext;
     }];
 }
 
-- (void)markAsSearchContext;
-{
-    [self performBlockAndWait:^{
-        self.userInfo[IsSearchContextKey] = @YES;
-    }];
-}
-
 - (void)markAsUIContext
 {
     [self performBlockAndWait:^{
@@ -558,7 +545,6 @@ - (void)resetContextType
     [self performBlockAndWait:^{
         self.userInfo[IsSyncContextKey] = @NO;
         self.userInfo[IsUserInterfaceContextKey] = @NO;
-        self.userInfo[IsSearchContextKey] = @NO;
     }];
 }
 

wire-ios-data-model/Tests/Source/Model/ZMBaseManagedObjectTest.h

@@ -44,7 +44,6 @@
 @property (nonatomic, readonly, nonnull) CoreDataStack *coreDataStack;
 @property (nonatomic, readonly, nonnull) NSManagedObjectContext *uiMOC;
 @property (nonatomic, readonly, nonnull) NSManagedObjectContext *syncMOC;
-@property (nonatomic, readonly, nonnull) NSManagedObjectContext *searchMOC;
 
 @property (nonatomic, readonly) BOOL shouldUseRealKeychain;
 @property (nonatomic, readonly) BOOL shouldUseInMemoryStore;

wire-ios-data-model/Tests/Source/Model/ZMBaseManagedObjectTest.m

@@ -138,11 +138,6 @@ - (NSManagedObjectContext *)syncMOC
     return self.coreDataStack.syncContext;
 }
 
-- (NSManagedObjectContext *)searchMOC
-{
-    return self.coreDataStack.searchContext;
-}
-
 - (void)resetUIandSyncContextsAndResetPersistentStore:(BOOL)resetPersistentStore
 {
     self.coreDataStack = nil;

wire-ios-sync-engine/Source/SessionManager/UserSessionLoader.swift

@@ -403,7 +403,7 @@
         coreDataStack: CoreDataStack,
         cookieStorage: CookieStorage
     ) async -> ZMUserSession {
         let selfClientID = await coreDataStack.viewContext.perform {
             ZMUser.selfUser(in: coreDataStack.viewContext).selfClient()?.remoteIdentifier
         }
         let legacyEnvironment = BackendEnvironment(environment)
@@ -469,8 +469,7 @@
             accountID: accountID,
             databaseContexts: [
                 coreDataStack.viewContext,
-                coreDataStack.syncContext,
-                coreDataStack.searchContext
+                coreDataStack.syncContext
             ],
             canPerformKeyMigration: true,
             sharedUserDefaults: sharedUserDefaults,

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

@@ -21,7 +21,6 @@ import Foundation
 @objcMembers
 public class SearchDirectory: NSObject {
 
-    let searchContext: NSManagedObjectContext
     let contextProvider: ContextProvider
     let transportSession: TransportSessionType
     private let apiVersion: WireTransport.APIVersion?
@@ -39,7 +38,6 @@ public class SearchDirectory: NSObject {
 
     public convenience init(userSession: ZMUserSession) {
         self.init(
-            searchContext: userSession.searchManagedObjectContext,
             contextProvider: userSession,
             transportSession: userSession.transportSession,
             searchUsersCache: userSession.searchUsersCache,
@@ -50,15 +48,13 @@ public class SearchDirectory: NSObject {
     }
 
     init(
-        searchContext: NSManagedObjectContext,
         contextProvider: ContextProvider,
         transportSession: TransportSessionType,
         searchUsersCache: SearchUsersCache?,
         refreshUsersMissingMetadataAction: RecurringAction,
         refreshConversationsMissingMetadataAction: RecurringAction,
         apiVersion: WireTransport.APIVersion?
     ) {
-        self.searchContext = searchContext
         self.contextProvider = contextProvider
         self.transportSession = transportSession
         self.searchUsersCache = searchUsersCache
@@ -74,7 +70,6 @@ public class SearchDirectory: NSObject {
     public func perform(_ request: SearchRequest) -> SearchTask {
         let task = SearchTask(
             task: .search(searchRequest: request),
-            searchContext: searchContext,
             contextProvider: contextProvider,
             transportSession: transportSession,
             searchUsersCache: searchUsersCache,
@@ -96,7 +91,6 @@ public class SearchDirectory: NSObject {
     public func lookup(qualifiedID: QualifiedID) -> SearchTask {
         let task = SearchTask(
             task: .lookup(qualifiedID: qualifiedID),
-            searchContext: searchContext,
             contextProvider: contextProvider,
             transportSession: transportSession,
             searchUsersCache: searchUsersCache,