wordpress-mobile · crazytonyli · Dec 19, 2022 · Nov 10, 2022 · Dec 12, 2022 · Dec 12, 2022
diff --git a/WordPress/Classes/Categories/Media+WPMediaAsset.m b/WordPress/Classes/Categories/Media+WPMediaAsset.m
@@ -1,7 +1,7 @@
 #import "Media+WPMediaAsset.h"
 #import "MediaService.h"
 #import "Blog.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "WordPress-Swift.h"
 
 @implementation Media(WPMediaAsset)

diff --git a/WordPress/Classes/Models/AbstractPost.m b/WordPress/Classes/Models/AbstractPost.m
@@ -1,6 +1,6 @@
 #import "AbstractPost.h"
 #import "Media.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "WordPress-Swift.h"
 #import "BasePost.h"
 @import WordPressKit;

diff --git a/WordPress/Classes/Models/BasePost.m b/WordPress/Classes/Models/BasePost.m
@@ -1,7 +1,7 @@
 #import "BasePost.h"
 #import "Media.h"
 #import "NSMutableDictionary+Helpers.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 @import WordPressShared;
 
 @implementation BasePost

diff --git a/WordPress/Classes/Models/Blog.m b/WordPress/Classes/Models/Blog.m
@@ -2,7 +2,7 @@
 #import "WPAccount.h"
 #import "AccountService.h"
 #import "NSURL+IDN.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "Constants.h"
 #import "WordPress-Swift.h"
 #import "WPUserAgent.h"

diff --git a/WordPress/Classes/Models/Media.m b/WordPress/Classes/Models/Media.m
@@ -1,5 +1,5 @@
 #import "Media.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "WordPress-Swift.h"
 
 @implementation Media

diff --git a/WordPress/Classes/Models/ReaderPost.m b/WordPress/Classes/Models/ReaderPost.m
@@ -1,6 +1,6 @@
 #import "ReaderPost.h"
 #import "AccountService.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "SourcePostAttribution.h"
 #import "WPAccount.h"
 #import "WPAvatarSource.h"

diff --git a/WordPress/Classes/Models/Theme.m b/WordPress/Classes/Models/Theme.m
@@ -1,6 +1,6 @@
 #import "Theme.h"
 #import "Blog.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "WPAccount.h"
 #import "AccountService.h"
 #import "WordPress-Swift.h"

diff --git a/WordPress/Classes/Services/AccountService.m b/WordPress/Classes/Services/AccountService.m
@@ -1,6 +1,6 @@
 #import "AccountService.h"
 #import "WPAccount.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "Blog.h"
 #import "BlogService.h"
 #import "TodayExtensionService.h"

diff --git a/WordPress/Classes/Services/BlogService.m b/WordPress/Classes/Services/BlogService.m
@@ -2,14 +2,13 @@
 #import "Blog.h"
 #import "WPAccount.h"
 #import "AccountService.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "WPError.h"
 #import "Media.h"
 #import "PostCategoryService.h"
 #import "CommentService.h"
 #import "PostService.h"
 #import "TodayExtensionService.h"
-#import "ContextManager.h"
 #import "WordPress-Swift.h"
 #import "PostType.h"
 @import WordPressKit;

diff --git a/WordPress/Classes/Services/BlogSyncFacade.m b/WordPress/Classes/Services/BlogSyncFacade.m
@@ -1,5 +1,5 @@
 #import "BlogSyncFacade.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "BlogService.h"
 #import "AccountService.h"
 #import "Blog.h"

diff --git a/WordPress/Classes/Services/CommentService.m b/WordPress/Classes/Services/CommentService.m
@@ -1,7 +1,7 @@
 #import "CommentService.h"
 #import "AccountService.h"
 #import "Blog.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "ReaderPost.h"
 #import "WPAccount.h"
 #import "PostService.h"

diff --git a/WordPress/Classes/Services/MediaService.m b/WordPress/Classes/Services/MediaService.m
@@ -2,7 +2,7 @@
 #import "AccountService.h"
 #import "Media.h"
 #import "WPAccount.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "Blog.h"
 #import <MobileCoreServices/MobileCoreServices.h>
 #import "WordPress-Swift.h"

diff --git a/WordPress/Classes/Services/MenusService.m b/WordPress/Classes/Services/MenusService.m
@@ -4,7 +4,7 @@
 #import "Menu.h"
 #import "MenuItem.h"
 #import "MenuLocation.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "PostService.h"
 #import "WordPress-Swift.h"
 @import WordPressKit;

diff --git a/WordPress/Classes/Services/PostCategoryService.m b/WordPress/Classes/Services/PostCategoryService.m
@@ -1,7 +1,7 @@
 #import "PostCategoryService.h"
 #import "PostCategory.h"
 #import "Blog.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "WordPress-Swift.h"
 @import WordPressKit;
 

diff --git a/WordPress/Classes/Services/PostService.m b/WordPress/Classes/Services/PostService.m
@@ -2,7 +2,7 @@
 #import "Coordinate.h"
 #import "PostCategory.h"
 #import "PostCategoryService.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "CommentService.h"
 #import "MediaService.h"
 #import "Media.h"

diff --git a/WordPress/Classes/Services/PostTagService.m b/WordPress/Classes/Services/PostTagService.m
@@ -1,7 +1,7 @@
 #import "PostTagService.h"
 #import "Blog.h"
 #import "PostTag.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "WordPress-Swift.h"
 @import WordPressKit;
 

diff --git a/WordPress/Classes/Services/ReaderPostService.m b/WordPress/Classes/Services/ReaderPostService.m
@@ -1,7 +1,7 @@
 #import "ReaderPostService.h"
 
 #import "AccountService.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "ReaderGapMarker.h"
 #import "ReaderPost.h"
 #import "ReaderSiteService.h"

diff --git a/WordPress/Classes/Services/ReaderSiteService.m b/WordPress/Classes/Services/ReaderSiteService.m
@@ -1,7 +1,7 @@
 #import "ReaderSiteService.h"
 
 #import "AccountService.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "ReaderPostService.h"
 #import "ReaderPost.h"
 #import "WPAccount.h"

diff --git a/WordPress/Classes/Services/ReaderTopicService.m b/WordPress/Classes/Services/ReaderTopicService.m
@@ -1,7 +1,7 @@
 #import "ReaderTopicService.h"
 
 #import "AccountService.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "ReaderPost.h"
 #import "ReaderPostService.h"
 #import "WPAccount.h"

diff --git a/WordPress/Classes/Services/ThemeService.m b/WordPress/Classes/Services/ThemeService.m
@@ -3,7 +3,7 @@
 #import "Blog.h"
 #import "Theme.h"
 #import "WPAccount.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "WordPress-Swift.h"
 @import WordPressKit;
 

diff --git a/WordPress/Classes/System/WordPress-Bridging-Header.h b/WordPress/Classes/System/WordPress-Bridging-Header.h
@@ -21,13 +21,12 @@
 #import "ConfigurablePostView.h"
 #import "Confirmable.h"
 #import "Constants.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "Coordinate.h"
 #import "CustomHighlightButton.h"
 
 #import "EditCommentViewController.h"
 
-#import "LegacyContextFactory.h"
 #import "LocalCoreDataService.h"
 
 #import "Media.h"

diff --git a/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m b/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m
@@ -1,5 +1,5 @@
 #import "WPAnalyticsTrackerAutomatticTracks.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "AccountService.h"
 #import "BlogService.h"
 #import "WPAccount.h"

diff --git a/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m b/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m
@@ -1,6 +1,6 @@
 #import "WPAppAnalytics.h"
 
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "WPAnalyticsTrackerWPCom.h"
 #import "WPAnalyticsTrackerAutomatticTracks.h"
 #import "WPTabBarController.h"

diff --git a/WordPress/Classes/Utility/ContainerContextFactory.swift b/WordPress/Classes/Utility/ContainerContextFactory.swift
diff --git a/WordPress/Classes/Utility/ContextManager+ErrorHandling.swift b/WordPress/Classes/Utility/ContextManager+ErrorHandling.swift
@@ -55,16 +55,7 @@ private extension NSExceptionName {
     static let coreDataSaveDerivedException = NSExceptionName("Unresolved Core Data save error (Derived Context)")
 }
 
-extension LegacyContextFactory {
-
-    /// A wrapper of `internalSave(_:)` to expose it as an Objective-C API for `LegacyContextFactory` to call.
-    @objc func internalSaveContext(_ context: NSManagedObjectContext) {
-        internalSave(context)
-    }
-
-}
-
-extension ManagedObjectContextFactory {
+extension ContextManager {
 
     func internalSave(_ context: NSManagedObjectContext) {
         guard context.hasChanges else {
@@ -87,7 +78,7 @@ extension ManagedObjectContextFactory {
 
 }
 
-private extension ManagedObjectContextFactory {
+private extension ContextManager {
 
     func handleSaveError(_ error: NSError, in context: NSManagedObjectContext) {
         let isMainContext = context == mainContext

diff --git a/WordPress/Classes/Utility/ContextManager.h b/WordPress/Classes/Utility/ContextManager.h