Revert "fix: send message - WPB-20880 (#3815)"

This reverts commit fa5bc8c.

Author: netbe

wire-ios-request-strategy/Sources/Object Syncs/Helpers/ZMChangeTrackerBootstrap.h

@@ -25,5 +25,5 @@
 - (instancetype)initWithManagedObjectContext:(NSManagedObjectContext *)context changeTrackers:(NSArray *)changeTrackers;
 
 - (void)fetchObjectsForChangeTrackers;
-- (void)addChangeTrackers:(NSArray *)changeTrackers;
+
 @end

wire-ios-request-strategy/Sources/Object Syncs/Helpers/ZMChangeTrackerBootstrap.m

@@ -55,15 +55,16 @@ - (NSEntityDescription *)entityForEntityName:(NSString *)name;
     return entity;
 }
 
-- (void)fetchObjectsForChangeTrackers:(NSArray*)trackers {
-    NSArray *fetchRequests = [trackers mapWithBlock:^id(id tracker) {
+- (void)fetchObjectsForChangeTrackers
+{
+    NSArray *fetchRequests = [self.changeTrackers mapWithBlock:^id(id tracker) {
         return [tracker fetchRequestForTrackedObjects];
     }];
 
     NSMapTable *entityToRequestMap = [self sortFetchRequestsByEntity:fetchRequests];
     NSMapTable *entityToResultsMap = [self executeMappedFetchRequests:entityToRequestMap];
 
-    for (id <ZMContextChangeTracker> tracker in trackers) {
+    for (id <ZMContextChangeTracker> tracker in self.changeTrackers) {
         NSFetchRequest *request = [tracker fetchRequestForTrackedObjects];
         if (request == nil) {
             continue;
@@ -83,20 +84,6 @@ - (void)fetchObjectsForChangeTrackers:(NSArray*)trackers {
     }
 }
 
-- (void)fetchObjectsForChangeTrackers
-{
-    [self fetchObjectsForChangeTrackers:self.changeTrackers];
-}
-
-- (void)addChangeTrackers:(NSArray *)changeTrackers
-{
-    [self fetchObjectsForChangeTrackers:changeTrackers];
-    
-    NSMutableArray* allTrackers = changeTrackers.mutableCopy;
-    [allTrackers addObjectsFromArray:changeTrackers];
-    self.changeTrackers = allTrackers;
-}
-
 - (NSMapTable *)sortFetchRequestsByEntity:(NSArray *)fetchRequests;
 {
     NSMapTable *requestsMap = [NSMapTable strongToStrongObjectsMapTable];

wire-ios-sync-engine/Source/Synchronization/StrategyDirectory.swift

@@ -29,7 +29,6 @@ public protocol StrategyDirectoryProtocol {
     var eventAsyncConsumers: [ZMEventAsyncConsumer] { get }
     var requestStrategies: [RequestStrategy] { get }
     var contextChangeTrackers: [ZMContextChangeTracker] { get }
-    var clientContextChangeTrackers: [ZMContextChangeTracker] { get }
 
 }
 
@@ -41,7 +40,6 @@ public class StrategyDirectory: NSObject, StrategyDirectoryProtocol {
     public private(set) var eventConsumers: [ZMEventConsumer]
     public private(set) var eventAsyncConsumers: [ZMEventAsyncConsumer]
     public private(set) var contextChangeTrackers: [ZMContextChangeTracker]
-    public private(set) var clientContextChangeTrackers: [ZMContextChangeTracker] = []
     public private(set) var initiateResetMLSConversationUseCaseFactory: (NSManagedObjectContext) -> WireRequestStrategy
         .InitiateResetMLSConversationUseCaseProtocol
 
@@ -474,16 +472,16 @@ public class StrategyDirectory: NSObject, StrategyDirectoryProtocol {
             self.requestStrategies.append(contentsOf: strategies.compactMap { $0 as? RequestStrategy })
             self.eventConsumers.append(contentsOf: strategies.compactMap { $0 as? ZMEventConsumer })
             self.eventAsyncConsumers.append(contentsOf: strategies.compactMap { $0 as? ZMEventAsyncConsumer })
-            self.clientContextChangeTrackers = strategies.flatMap { (object: Any) -> [ZMContextChangeTracker] in
-                if let source = object as? ZMContextChangeTrackerSource {
-                    return source.contextChangeTrackers
-                } else if let tracker = object as? ZMContextChangeTracker {
-                    return [tracker]
-                } else {
-                    return []
-                }
-            }
-            self.contextChangeTrackers.append(contentsOf: clientContextChangeTrackers)
+            self.contextChangeTrackers
+                .append(contentsOf: strategies.flatMap { (object: Any) -> [ZMContextChangeTracker] in
+                    if let source = object as? ZMContextChangeTrackerSource {
+                        return source.contextChangeTrackers
+                    } else if let tracker = object as? ZMContextChangeTracker {
+                        return [tracker]
+                    } else {
+                        return []
+                    }
+                })
         }
     }
 

wire-ios-sync-engine/Source/Synchronization/ZMSyncStrategy.h

@@ -43,7 +43,6 @@
                            eventProcessingTracker:(id<EventProcessingTrackerProtocol> _Nonnull)eventProcessingTracker;
 
 - (void)tearDown;
-- (void)updateStrategyClientContextChangeTrackers;
 
 @property (nonatomic, readonly, nonnull) NSManagedObjectContext *syncMOC;
 @property (nonatomic, nullable) id<EventProcessingTrackerProtocol> eventProcessingTracker;

wire-ios-sync-engine/Source/Synchronization/ZMSyncStrategy.m

@@ -123,13 +123,6 @@ - (void)appTerminated:(NSNotification *)note
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
-- (void)updateStrategyClientContextChangeTrackers
-{
-    [self.syncMOC performBlock:^{
-        [self.changeTrackerBootStrap addChangeTrackers:self.strategyDirectory.clientContextChangeTrackers];
-    }];
-}
-
 - (NSManagedObjectContext *)moc
 {
     return self.syncMOC;

wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession.swift

@@ -676,7 +676,6 @@ public final class ZMUserSession: NSObject {
                 incrementalSyncObserver: incrementalSyncObserver,
                 metadata: resolvedBackendMetadata
             )
-            syncStrategy?.updateClientContextChangeTrackers()
         }
     }
 

wire-ios-sync-engine/Tests/Source/Synchronization/MockStrategyDirectory.swift

@@ -20,7 +20,6 @@ import Foundation
 
 @objcMembers
 public class MockStrategyDirectory: NSObject, StrategyDirectoryProtocol {
-    public var clientContextChangeTrackers: [any ZMContextChangeTracker] = []
 
     public var eventConsumers: [ZMEventConsumer] = []