Merge pull request #24 from deeje/feature/4.0.2

Fix for CloudKit error 3 when using cellular

CloudCore.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = "CloudCore"
   s.summary          = "Framework that enables synchronization between CloudKit and Core Data."
-  s.version          = "4.0.1"
+  s.version          = "4.0.2"
   s.homepage         = "https://github.com/deeje/CloudCore"
   s.license          = 'MIT'
   s.author           = { "deeje" => "deeje@mac.com", "Vasily Ulianov" => "vasily@me.com" }

Example/Sources/AppDelegate.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import CoreData
+import CloudKit
 import CloudCore
 import Connectivity
 

README.md

@@ -181,7 +181,7 @@ CloudCore now has built-in support for CloudKit Sharing.  There are several addi
 func windowScene(_ windowScene: UIWindowScene, 
 				 userDidAcceptCloudKitShareWith cloudKitShareMetadata: CKShare.Metadata) {
   let acceptShareOperation = CKAcceptSharesOperation(shareMetadatas: [cloudKitShareMetadata])
-  acceptShareOperation.qualityOfService = .userInteractive
+  acceptShareOperation.qualityOfService = .userInitiated
   acceptShareOperation.perShareCompletionBlock = { meta, share, error in
     CloudCore.pull(rootRecordID: meta.rootRecordID, container: self.persistentContainer, error: nil) { }
   }
@@ -198,7 +198,7 @@ OR
 func application(_ application: UIApplication,
                  userDidAcceptCloudKitShareWith cloudKitShareMetadata: CKShare.Metadata) {
   let acceptShareOperation = CKAcceptSharesOperation(shareMetadatas: [cloudKitShareMetadata])
-  acceptShareOperation.qualityOfService = .userInteractive
+  acceptShareOperation.qualityOfService = .userInitiated
   acceptShareOperation.perShareCompletionBlock = { meta, share, error in
     CloudCore.pull(rootRecordID: meta.rootRecordID, container: self.persistentContainer, error: nil) { }
   }

Source/Classes/CloudCore.swift

@@ -256,5 +256,21 @@ open class CloudCore {
 
 		delegate?.error(error: subscriptionError, module: nil)
 	}
-
+
+    static public func perform(completion: ((CKContainer) -> Void)) {
+        let container = config.container
+
+        if #available(iOS 15.0, *) {
+            let ckConfig = CKOperation.Configuration()
+//            ckConfig.container = container
+            ckConfig.qualityOfService = .userInitiated
+            ckConfig.allowsCellularAccess = true
+            container.configuredWith(configuration: ckConfig, group: nil) { configuredContainer in
+                completion(configuredContainer)
+            }
+        } else {
+            completion(container)
+        }
+    }
+
 }

Source/Classes/Pull/PublicSubscriptions/FetchPublicSubscriptionsOperation.swift

@@ -20,7 +20,7 @@ class FetchPublicSubscriptionsOperation: AsynchronousOperation {
         super.init()
 
         name = "FetchPublicSubscriptionsOperation"
-        qualityOfService = .userInteractive
+        qualityOfService = .userInitiated
     }
 
     override func main() {

Source/Classes/Pull/PublicSubscriptions/PublicDatabaseSubscriptions.swift

@@ -44,6 +44,7 @@ public class PublicDatabaseSubscriptions {
 
         let config = CKOperation.Configuration()
         config.timeoutIntervalForResource = 20
+        config.qualityOfService = .userInitiated
         modifySubscriptions.configuration = config
 
         CloudCore.config.container.publicCloudDatabase.add(modifySubscriptions)
@@ -67,6 +68,7 @@ public class PublicDatabaseSubscriptions {
 
         let config = CKOperation.Configuration()
         config.timeoutIntervalForResource = 20
+        config.qualityOfService = .userInitiated
         modifySubscription.configuration = config
 
         CloudCore.config.container.publicCloudDatabase.add(modifySubscription)

Source/Classes/Pull/PullChangesOperation.swift

@@ -65,7 +65,7 @@ public class PullChangesOperation: PullOperation {
                 let changedRecordIDs: NSMutableSet = []
                 let deletedRecordIDs: NSMutableSet = []
                 let fetchNotificationChanges = CKFetchNotificationChangesOperation(previousServerChangeToken: databaseChangeToken)
-                fetchNotificationChanges.qualityOfService = .userInteractive
+                fetchNotificationChanges.qualityOfService = .userInitiated
                 fetchNotificationChanges.notificationChangedBlock = { innerNotification in
                     if let innerQueryNotification = innerNotification as? CKQueryNotification {
                         if innerQueryNotification.queryNotificationReason == .recordDeleted {
@@ -80,7 +80,7 @@ public class PullChangesOperation: PullOperation {
                     let allChangedRecordIDs = changedRecordIDs.allObjects as! [CKRecord.ID]
                     let fetchRecords = CKFetchRecordsOperation(recordIDs: allChangedRecordIDs)
                     fetchRecords.database = CloudCore.config.container.publicCloudDatabase
-                    fetchRecords.qualityOfService = .userInteractive
+                    fetchRecords.qualityOfService = .userInitiated
                     fetchRecords.perRecordCompletionBlock = { record, recordID, error in
                         if error == nil {
                             self.addConvertRecordOperation(record: record!, context: backgroundContext)
@@ -111,7 +111,7 @@ public class PullChangesOperation: PullOperation {
 
                 let fetchDatabaseChanges = CKFetchDatabaseChangesOperation(previousServerChangeToken: databaseChangeToken)
                 fetchDatabaseChanges.database = database
-                fetchDatabaseChanges.qualityOfService = .userInteractive
+                fetchDatabaseChanges.qualityOfService = .userInitiated
                 fetchDatabaseChanges.recordZoneWithIDChangedBlock = { recordZoneID in
                     changedZoneIDs.append(recordZoneID)
                 }
@@ -173,7 +173,7 @@ public class PullChangesOperation: PullOperation {
 		if recordZoneIDs.isEmpty { return }
 
 		let recordZoneChangesOperation = FetchRecordZoneChangesOperation(from: database, recordZoneIDs: recordZoneIDs, tokens: tokens)
-        recordZoneChangesOperation.qualityOfService = .userInteractive
+        recordZoneChangesOperation.qualityOfService = .userInitiated
 		recordZoneChangesOperation.recordChangedBlock = {
             self.addConvertRecordOperation(record: $0, context: context)
 		}

Source/Classes/Pull/PullOperation.swift

@@ -24,7 +24,7 @@ public class PullOperation: Operation {
 
         super.init()
 
-        qualityOfService = .userInteractive
+        qualityOfService = .userInitiated
 
         queue.name = "PullQueue"
         queue.maxConcurrentOperationCount = 1

Source/Classes/Pull/PullRecordOperation.swift

@@ -63,7 +63,7 @@ public class PullRecordOperation: PullOperation {
     private func addFetchRecordsOp(recordIDs: [CKRecord.ID], backgroundContext: NSManagedObjectContext) {
         let fetchRecords = CKFetchRecordsOperation(recordIDs: recordIDs)
         fetchRecords.database = database
-        fetchRecords.qualityOfService = .userInteractive
+        fetchRecords.qualityOfService = .userInitiated
         fetchRecords.perRecordCompletionBlock = { record, recordID, error in
             if let record = record {
                 self.fetchedRecordIDs.append(recordID!)

Source/Classes/Pull/SubOperations/FetchRecordZoneChangesOperation.swift

@@ -38,7 +38,7 @@ class FetchRecordZoneChangesOperation: Operation {
 		super.init()
 
         name = "FetchRecordZoneChangesOperation"
-        qualityOfService = .userInteractive
+        qualityOfService = .userInitiated
 	}
 
 	override func main() {
@@ -90,7 +90,7 @@ class FetchRecordZoneChangesOperation: Operation {
 		}
 
         fetchRecordZoneChanges.database = self.database
-        fetchRecordZoneChanges.qualityOfService = .userInteractive
+        fetchRecordZoneChanges.qualityOfService = .userInitiated
 
 		return fetchRecordZoneChanges
 	}

Source/Classes/Pull/SubOperations/PurgeLocalDatabaseOperation.swift

@@ -21,7 +21,7 @@ class PurgeLocalDatabaseOperation: Operation {
 		super.init()
 
         name = "PurgeLocalDatabaseOperation"
-        qualityOfService = .userInteractive
+        qualityOfService = .userInitiated
 	}
 
 	override func main() {

Source/Classes/Push/PushOperationQueue.swift

@@ -49,7 +49,7 @@ class PushOperationQueue: OperationQueue {
 		let modifyRecords = CKModifyRecordsOperation(recordsToSave: recordsToSave, recordIDsToDelete: recordIDsToDelete)
         modifyRecords.database = database
 		modifyRecords.savePolicy = .changedKeys
-        modifyRecords.qualityOfService = .userInteractive
+        modifyRecords.qualityOfService = .userInitiated
 
 		modifyRecords.perRecordCompletionBlock = { record, error in
 			if let error = error {

Source/Classes/Setup/CreateCloudCoreZoneOperation.swift

@@ -18,14 +18,15 @@ class CreateCloudCoreZoneOperation: AsynchronousOperation {
         super.init()
 
         name = "CreateCloudCoreZoneOperation"
-        qualityOfService = .userInteractive
+        qualityOfService = .userInitiated
     }
 
 	override func main() {
 		super.main()
 
 		let cloudCoreZone = CKRecordZone(zoneName: CloudCore.config.zoneName)
 		let recordZoneOperation = CKModifyRecordZonesOperation(recordZonesToSave: [cloudCoreZone], recordZoneIDsToDelete: nil)
+        recordZoneOperation.qualityOfService = .userInitiated
 		recordZoneOperation.modifyRecordZonesCompletionBlock = {
 			if let error = $2 {
 				self.errorBlock?(error)

Source/Classes/Setup/PushAllLocalDataOperation.swift

@@ -31,7 +31,7 @@ class PushAllLocalDataOperation: Operation {
         super.init()
 
         name = "PushAllLocalDataOperation"
-        qualityOfService = .userInteractive
+        qualityOfService = .userInitiated
 	}
 
 	override func main() {

Source/Classes/Setup/SetupOperation.swift

@@ -32,7 +32,7 @@ class SetupOperation: Operation {
         super.init()
 
         name = "SetupOperation"
-        qualityOfService = .userInteractive
+        qualityOfService = .userInitiated
 	}
 
 	private let queue = OperationQueue()

Source/Classes/Setup/SubscribeOperation.swift

@@ -19,7 +19,7 @@ class SubscribeOperation: AsynchronousOperation {
         super.init()
 
         name = "SubscribeOperation"
-        qualityOfService = .userInteractive
+        qualityOfService = .userInitiated
     }
 
 	override func main() {
@@ -75,7 +75,7 @@ class SubscribeOperation: AsynchronousOperation {
 			}
 		}
 
-        modifySubscriptions.qualityOfService = .userInteractive
+        modifySubscriptions.qualityOfService = .userInitiated
 
 		return modifySubscriptions
 	}
@@ -89,7 +89,7 @@ class SubscribeOperation: AsynchronousOperation {
 				operationToCancel.cancel()
 			}
 		}
-        fetchSubscriptions.qualityOfService = .userInteractive
+        fetchSubscriptions.qualityOfService = .userInitiated
 
 		return fetchSubscriptions
 	}

Source/Classes/Sharing/CloudCoreSharingController.swift

@@ -49,6 +49,7 @@ public class CloudCoreSharingController: NSObject, UICloudSharingControllerDeleg
                     let sharingController = UICloudSharingController { _, handler in
                         let modifyOp = CKModifyRecordsOperation(recordsToSave: [aRecord, share], recordIDsToDelete: nil)
                         modifyOp.savePolicy = .changedKeys
+                        modifyOp.qualityOfService = .userInitiated
                         modifyOp.modifyRecordsCompletionBlock = { records, recordIDs, error in
                             if let share = records?.first as? CKShare {
                                 handler(share, CloudCore.config.container, error)