return CKQueryOperation

AppMessage/AppMessage.xcodeproj/project.pbxproj

@@ -36,6 +36,8 @@
 		7F61CA3A19829CC7005EF254 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 7F61CA3719829CC7005EF254 /* [email protected] */; };
 		7F61CA3B19829CC7005EF254 /* MessageIncoming.aiff in Resources */ = {isa = PBXBuildFile; fileRef = 7F61CA3819829CC7005EF254 /* MessageIncoming.aiff */; };
 		7F61CA3C19829CC7005EF254 /* MessageOutgoing.aiff in Resources */ = {isa = PBXBuildFile; fileRef = 7F61CA3919829CC7005EF254 /* MessageOutgoing.aiff */; };
+		7F6A7CE51C6A765E00B1DC88 /* EVSort.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F9E680F1C675F9E00F0F4D3 /* EVSort.swift */; };
+		7F6A7CE61C6A765F00B1DC88 /* EVSort.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F9E680F1C675F9E00F0F4D3 /* EVSort.swift */; };
 		7F76554C197FF0FE008AD0D5 /* Asset.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F76554B197FF0FE008AD0D5 /* Asset.swift */; };
 		7F7C03621A382C3C00054ED7 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7F7C03611A382C3C00054ED7 /* Localizable.strings */; };
 		7F9E68101C675F9E00F0F4D3 /* EVSort.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F9E680F1C675F9E00F0F4D3 /* EVSort.swift */; };
@@ -638,6 +640,7 @@
 			files = (
 				7F4CA2C21C4121C600AEE29D /* EVCloudKitEnums.swift in Sources */,
 				7F2976581BB940730074C85A /* EVCloudData.swift in Sources */,
+				7F6A7CE51C6A765E00B1DC88 /* EVSort.swift in Sources */,
 				7F2976511BB93D6A0074C85A /* OSXTest.swift in Sources */,
 				7F2976561BB940730074C85A /* EVglobal.swift in Sources */,
 				7F2976571BB940730074C85A /* EVCloudKitDao.swift in Sources */,
@@ -681,6 +684,7 @@
 			files = (
 				7F4CA2C11C4121C500AEE29D /* EVCloudKitEnums.swift in Sources */,
 				7F4A37051BDD92D600A0F73F /* EVglobal.swift in Sources */,
+				7F6A7CE61C6A765F00B1DC88 /* EVSort.swift in Sources */,
 				7F4A37061BDD92D600A0F73F /* EVCloudKitDao.swift in Sources */,
 				7F4A37071BDD92D600A0F73F /* EVCloudData.swift in Sources */,
 				7F4A37081BDD92D600A0F73F /* EVCloudKitDataObject.swift in Sources */,

AppMessage/AppMessage/AppDelegate.swift

@@ -19,7 +19,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Only call this line once. It will make sure the recordType are there in iCloud.
         // After this, go to the iCloud dashboard and make all metadata for each recordType queryable and sortable!
         // If you use this in your own project, then make sure that the fields are not nil otherwise the field will not be created.
-//        EVCloudKitDao.publicDB.createRecordTypes([Message(), Asset(), News(), Invoice()])
+        //EVCloudKitDao.publicDB.createRecordTypes([Message(), Asset(), News(), Invoice()])
 
 
         // During development you will probably play around with subscriptins.
@@ -43,7 +43,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         })
     }
 
-    #if os(tvOS)
+//    #if os(tvOS)
     //This will only be called when your app is active. So this is what you should use on tvOS
     func application(application: UIApplication, didReceiveRemoteNotification userInfo: [NSObject : AnyObject]) {
         EVLog("Push received")
@@ -53,7 +53,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             EVLog("All notifications are processed")
         })
     }
-    #else
+//    #else
     // Process al notifications even if we are in the background. tvOS will not have this event
     // Make sure you enable background notifications in the app settings. (entitlements: pushnotifications and  backgrounds modes - notifications plus background fetch)
     func application(application: UIApplication, didReceiveRemoteNotification userInfo: [NSObject : AnyObject], fetchCompletionHandler completionHandler: (UIBackgroundFetchResult) -> Void) {
@@ -65,7 +65,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 completionHandler(.NewData)
         })
     }
-    #endif
+//    #endif
 
     func applicationDidEnterBackground(application: UIApplication) {
         // Just to make sure that all updates are written do the cache.

AppMessage/AppMessage/CloudKit/EVCloudData.swift

@@ -115,7 +115,7 @@ public class EVCloudData: NSObject {
      */
     override init() {        
         super.init()
-        NSTimer.scheduledTimerWithTimeInterval(60, target: self, selector: Selector("backupAllData"), userInfo: nil, repeats: true)
+        NSTimer.scheduledTimerWithTimeInterval(60, target: self, selector: #selector(EVCloudData.backupAllData), userInfo: nil, repeats: true)
     }
 
     // ------------------------------------------------------------------------
@@ -296,12 +296,13 @@ public class EVCloudData: NSObject {
     
     - returns: ?
     */
-    public class func getNotificationCenterId(filterId: String, var changeType: DataChangeNotificationType? = nil) -> String {
+    public class func getNotificationCenterId(filterId: String, changeType: DataChangeNotificationType? = nil) -> String {
         if changeType == nil {
-            changeType = DataChangeNotificationType.DataChanged
+            return "NL.EVICT.CloudKit.\(filterId).\(DataChangeNotificationType.DataChanged)"
+        } else {
+            return "NL.EVICT.CloudKit.\(filterId).\(changeType!)"
         }
 
-        return "NL.EVICT.CloudKit.\(filterId).\(changeType!)"
     }
 
      /**
@@ -614,7 +615,7 @@ public class EVCloudData: NSObject {
         deletedHandler:((recordId: String, dataIndex: Int) -> Void)? = nil,
         dataChangedHandler:(() -> Void)? = nil,
         errorHandler:((error: NSError) -> Void)? = nil
-        ) -> Void {
+        ) -> CKQueryOperation {
             // Set the post notifications flag for this filter ID before checking the cache
             if postNotifications != nil && postNotifications! {
                 self.postNotifications[filterId] = postNotifications!
@@ -690,7 +691,7 @@ public class EVCloudData: NSObject {
 
             dao.subscribe(type, predicate:predicate, filterId: filterId, configureNotificationInfo:configureNotificationInfo ,errorHandler: errorHandler)
 
-            dao.query(type, predicate: predicate, orderBy: orderBy, completionHandler: { results, isFinished in
+            return dao.query(type, predicate: predicate, orderBy: orderBy, completionHandler: { results, isFinished in
                 if self.data[filterId] != nil && self.data[filterId]! == results && self.data[filterId]!.count > 0 {
                     return false // Result was already returned from cache
                 }

AppMessage/AppMessage/CloudKit/EVCloudKitDao.swift

@@ -305,12 +305,13 @@ public class EVCloudKitDao {
     - parameter errorHandler: The function that will be called when there was an error
     :return: No return value
     */
-  internal func queryRecords<T:EVCloudKitDataObject>(type:T, query: CKQuery, completionHandler: (results: [T], isFinished: Bool) -> Bool, errorHandler:((error: NSError) -> Void)? = nil) {
+  internal func queryRecords<T:EVCloudKitDataObject>(type:T, query: CKQuery, completionHandler: (results: [T], isFinished: Bool) -> Bool, errorHandler:((error: NSError) -> Void)? = nil) -> CKQueryOperation {
         if !(query.sortDescriptors != nil) {
             query.sortDescriptors = [NSSortDescriptor(key: "creationDate", ascending: false)]
         }
         let operation = CKQueryOperation(query: query)
         operation.qualityOfService = .UserInitiated
+        operation.queuePriority = .VeryHigh
         var results = [T]()
         operation.recordFetchedBlock = { record in
             if let parsed = self.fromCKRecord(record) as? T  {
@@ -329,6 +330,7 @@ public class EVCloudKitDao {
         }
         operation.resultsLimit = CKQueryOperationMaximumResults;
         database.addOperation(operation)
+        return operation
     }
 
 
@@ -341,7 +343,7 @@ public class EVCloudKitDao {
     - parameter errorHandler: The function that will be called when there was an error
     :return: No return value
     */
-    private func queryRecords<T:EVCloudKitDataObject>(cursor: CKQueryCursor, continueWithResults:[T], completionHandler: (results: [T], isFinished: Bool) -> Bool, errorHandler:((error: NSError) -> Void)? = nil) {
+    private func queryRecords<T:EVCloudKitDataObject>(cursor: CKQueryCursor, continueWithResults:[T], completionHandler: (results: [T], isFinished: Bool) -> Bool, errorHandler:((error: NSError) -> Void)? = nil) -> CKQueryOperation {
         var results = continueWithResults
         let operation = CKQueryOperation(cursor: cursor)
         operation.qualityOfService = .UserInitiated
@@ -362,6 +364,7 @@ public class EVCloudKitDao {
         }
         operation.resultsLimit = CKQueryOperationMaximumResults;
         database.addOperation(operation)
+        return operation
     }
 
 
@@ -595,7 +598,7 @@ public class EVCloudKitDao {
      - parameter errorHandler:      The function that will be called when there was an error
      :return: No return value
      */
-    public func saveItems(items: [EVCloudKitDataObject], completionHandler: (records: [CKRecord]) -> Void, errorHandler:((error: NSError) -> Void)? = nil) {
+    public func saveItems(items: [EVCloudKitDataObject], completionHandler: (records: [CKRecord]) -> Void, errorHandler:((error: NSError) -> Void)? = nil) -> CKModifyRecordsOperation {
         let recordsToSave: [CKRecord] = items.map({self.toCKRecord($0)})
         let operation = CKModifyRecordsOperation(recordsToSave: recordsToSave, recordIDsToDelete: nil)
         operation.atomic = false
@@ -606,6 +609,7 @@ public class EVCloudKitDao {
             })
         }
         operation.start()
+        return operation
     }
 
 
@@ -634,7 +638,7 @@ public class EVCloudKitDao {
      - parameter errorHandler:      The function that will be called when there was an error
      :return: No return value
      */
-    public func deleteItems(items: [EVCloudKitDataObject], completionHandler: (records: [CKRecord]) -> Void, errorHandler:((error: NSError) -> Void)? = nil) {
+    public func deleteItems(items: [EVCloudKitDataObject], completionHandler: (records: [CKRecord]) -> Void, errorHandler:((error: NSError) -> Void)? = nil) -> CKModifyRecordsOperation {
         let recordsToDelete: [CKRecordID] = items.map({$0.recordID})
         let operation = CKModifyRecordsOperation(recordsToSave: nil, recordIDsToDelete: recordsToDelete)
         operation.atomic = false
@@ -645,8 +649,10 @@ public class EVCloudKitDao {
             })
         }
         operation.start()
+        return operation
     }
 
+
     // ------------------------------------------------------------------------
     // MARK: - Data methods - Query
     // ------------------------------------------------------------------------
@@ -659,11 +665,11 @@ public class EVCloudKitDao {
     - parameter errorHandler: The function that will be called when there was an error
     :return: No return value
     */
-    public func query<T:EVCloudKitDataObject>(type:T, orderBy: OrderBy = Descending(field: "creationDate"), completionHandler: (results: [T], isFinished: Bool) -> Bool, errorHandler:((error: NSError) -> Void)? = nil) {
+    public func query<T:EVCloudKitDataObject>(type:T, orderBy: OrderBy = Descending(field: "creationDate"), completionHandler: (results: [T], isFinished: Bool) -> Bool, errorHandler:((error: NSError) -> Void)? = nil) -> CKQueryOperation {
        let recordType = EVReflection.swiftStringFromClass(type)
         let query = CKQuery(recordType: recordType, predicate: NSPredicate(value: true))
         query.sortDescriptors = orderBy.sortDescriptors()
-        queryRecords(type, query:query, completionHandler: completionHandler, errorHandler: errorHandler)
+        return queryRecords(type, query:query, completionHandler: completionHandler, errorHandler: errorHandler)
     }
 
     /**
@@ -676,15 +682,19 @@ public class EVCloudKitDao {
     - parameter errorHandler: The function that will be called when there was an error
     :return: No return value
     */
-    public func query<T:EVCloudKitDataObject>(type:T, referenceRecordName: String, referenceField: String, orderBy: OrderBy = Descending(field: "creationDate"), completionHandler: (results: [T], isFinished: Bool) -> Bool, errorHandler:((error: NSError) -> Void)? = nil) {
+    public func query<T:EVCloudKitDataObject>(type:T, referenceRecordName: String, referenceField: String, orderBy: OrderBy = Descending(field: "creationDate"), completionHandler: (results: [T], isFinished: Bool) -> Bool, errorHandler:((error: NSError) -> Void)? = nil) -> CKQueryOperation {
         let recordType = EVReflection.swiftStringFromClass(type)
         let parentId = CKRecordID(recordName: referenceRecordName)
         let parent = CKReference(recordID: parentId, action: CKReferenceAction.None)
         let query = CKQuery(recordType: recordType, predicate: NSPredicate(format: "%K == %@", referenceField ,parent))
         query.sortDescriptors = orderBy.sortDescriptors()
-        queryRecords(type, query:query, completionHandler: completionHandler, errorHandler: errorHandler)
+        return queryRecords(type, query:query, completionHandler: completionHandler, errorHandler: errorHandler)
     }
 
+
+
+
+
     /**
     Query a recordType with a predicate
 
@@ -694,11 +704,11 @@ public class EVCloudKitDao {
     - parameter errorHandler: The function that will be called when there was an error
     :return: No return value
     */
-    public func query<T:EVCloudKitDataObject>(type:T, predicate: NSPredicate, orderBy: OrderBy = Descending(field: "creationDate"), completionHandler: (results: [T], isFinished: Bool) -> Bool, errorHandler:((error: NSError) -> Void)? = nil){
+    public func query<T:EVCloudKitDataObject>(type:T, predicate: NSPredicate, orderBy: OrderBy = Descending(field: "creationDate"), completionHandler: (results: [T], isFinished: Bool) -> Bool, errorHandler:((error: NSError) -> Void)? = nil) -> CKQueryOperation{
         let recordType = EVReflection.swiftStringFromClass(type)
         let query: CKQuery = CKQuery(recordType: recordType, predicate: predicate)
         query.sortDescriptors = orderBy.sortDescriptors()
-        queryRecords(type, query:query, completionHandler: completionHandler, errorHandler: errorHandler)
+        return queryRecords(type, query:query, completionHandler: completionHandler, errorHandler: errorHandler)
     }
 
     /**
@@ -710,11 +720,11 @@ public class EVCloudKitDao {
     - parameter errorHandler: The function that will be called when there was an error
     :return: No return value
     */
-    public func query<T:EVCloudKitDataObject>(type:T, tokens: String, orderBy: OrderBy = Descending(field: "creationDate"), completionHandler: (results: [T], isFinished: Bool) -> Bool, errorHandler:((error: NSError) -> Void)? = nil) {
+    public func query<T:EVCloudKitDataObject>(type:T, tokens: String, orderBy: OrderBy = Descending(field: "creationDate"), completionHandler: (results: [T], isFinished: Bool) -> Bool, errorHandler:((error: NSError) -> Void)? = nil) -> CKQueryOperation {
         let recordType = EVReflection.swiftStringFromClass(type)
         let query = CKQuery(recordType: recordType, predicate: NSPredicate(format: "allTokens TOKENMATCHES[cdl] %@", tokens))
         query.sortDescriptors = orderBy.sortDescriptors()
-        queryRecords(type, query:query, completionHandler: completionHandler, errorHandler: errorHandler)
+        return queryRecords(type, query:query, completionHandler: completionHandler, errorHandler: errorHandler)
     }
 
     /**
@@ -729,13 +739,13 @@ public class EVCloudKitDao {
     - parameter errorHandler: The function that will be called when there was an error
     :return: No return value
     */
-    public func query<T: EVCloudKitDataObject>(type: T, fieldname: String, latitude: Double, longitude: Double, distance: Int ,completionHandler: (results: [T], isFinished: Bool) -> Bool, errorHandler:((error: NSError) -> Void)? = nil) {
+    public func query<T: EVCloudKitDataObject>(type: T, fieldname: String, latitude: Double, longitude: Double, distance: Int ,completionHandler: (results: [T], isFinished: Bool) -> Bool, errorHandler:((error: NSError) -> Void)? = nil) -> CKQueryOperation{
         let recordType: String = EVReflection.swiftStringFromClass(type)
         let location: CLLocation = CLLocation(latitude: CLLocationDegrees(latitude), longitude: CLLocationDegrees(longitude))
         let predecate: NSPredicate =  NSPredicate(format: "distanceToLocation:fromLocation:(%K, %@) < %@", [fieldname, location, distance])
         let query = CKQuery(recordType:recordType, predicate:predecate)
         query.sortDescriptors = [CKLocationSortDescriptor(key: fieldname, relativeLocation: location)]
-        queryRecords(type, query:query, completionHandler: completionHandler, errorHandler: errorHandler)
+        return queryRecords(type, query:query, completionHandler: completionHandler, errorHandler: errorHandler)
     }
 
     // ------------------------------------------------------------------------