From b494698b687f808ca5838916fc9afddf15838787 Mon Sep 17 00:00:00 2001
From: Satindar Dhillon <satindar@gmail.com>
Date: Thu, 21 Apr 2022 15:25:34 -0700
Subject: [PATCH] create background managed object context

---
 .../xcshareddata/xcschemes/Omnivore-iOS.xcscheme           | 6 ++++++
 .../Sources/Models/CoreData/StorageProvider.swift          | 2 +-
 .../Sources/Services/DataService/DataService.swift         | 7 +++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/apple/Omnivore.xcodeproj/xcshareddata/xcschemes/Omnivore-iOS.xcscheme b/apple/Omnivore.xcodeproj/xcshareddata/xcschemes/Omnivore-iOS.xcscheme
index da134da69..68e486e5a 100644
--- a/apple/Omnivore.xcodeproj/xcshareddata/xcschemes/Omnivore-iOS.xcscheme
+++ b/apple/Omnivore.xcodeproj/xcshareddata/xcschemes/Omnivore-iOS.xcscheme
@@ -76,6 +76,12 @@
             ReferencedContainer = "container:Omnivore.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-com.apple.CoreData.ConcurrencyDebug 1"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/apple/OmnivoreKit/Sources/Models/CoreData/StorageProvider.swift b/apple/OmnivoreKit/Sources/Models/CoreData/StorageProvider.swift
index 4274d22c9..f74c220ed 100644
--- a/apple/OmnivoreKit/Sources/Models/CoreData/StorageProvider.swift
+++ b/apple/OmnivoreKit/Sources/Models/CoreData/StorageProvider.swift
@@ -12,7 +12,7 @@ public class PersistentContainer: NSPersistentContainer {
     let model = NSManagedObjectModel(contentsOf: modelURL)!
     let container = PersistentContainer(name: "DataModel", managedObjectModel: model)
 
-    container.viewContext.automaticallyMergesChangesFromParent = false
+    container.viewContext.automaticallyMergesChangesFromParent = true
     container.viewContext.name = "viewContext"
     container.viewContext.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
     container.viewContext.undoManager = nil
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift b/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
index 5b556ce89..4c0ca1ab2 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
@@ -14,13 +14,20 @@ public final class DataService: ObservableObject {
   let networker: Networker
 
   let persistentContainer: PersistentContainer
+  let backgroundContext: NSManagedObjectContext
   var subscriptions = Set<AnyCancellable>()
+
+  var viewContext: NSManagedObjectContext {
+    persistentContainer.viewContext
+  }
+
   public var deletedHighlightsIDs = Set<String>()
 
   public init(appEnvironment: AppEnvironment, networker: Networker) {
     self.appEnvironment = appEnvironment
     self.networker = networker
     self.persistentContainer = PersistentContainer.make()
+    self.backgroundContext = persistentContainer.newBackgroundContext()
 
     persistentContainer.loadPersistentStores { _, error in
       if let error = error {