2.1.3 — Generated Files

Author: mxcl

.checkout

@@ -15,13 +15,13 @@ import Foundation.NSNotification
 
 */
 extension NSNotificationCenter {
-    class func once(name: String) -> Promise<[NSObject: AnyObject]> {
+    public class func once(name: String) -> Promise<[NSObject: AnyObject]> {
         return once(name).then(on: zalgo) { (note: NSNotification) -> [NSObject: AnyObject] in
             return note.userInfo ?? [:]
         }
     }
 
-    class func once(name: String) -> Promise<NSNotification> {
+    public class func once(name: String) -> Promise<NSNotification> {
         return Promise { fulfill, _ in
             var id: AnyObject?
             id = NSNotificationCenter.defaultCenter().addObserverForName(name, object: nil, queue: PMKOperationQueue){ note in

Categories/Foundation/NSNotificationCenter+Promise.swift

@@ -32,7 +32,7 @@
 
 #if defined(PMKEZBake) && defined(SWIFT_CLASS)
     // https://github.com/PromiseKit/EZiOS7/issues/2
-    #define PMKPromise AnyPromise
+    #define AnyPromise PMKPromise
 #else
     #if !defined(SWIFT_PASTE)
     # define SWIFT_PASTE_HELPER(x, y) x##y

PromiseKit.m

@@ -358,8 +358,14 @@ private class Consumable: NSObject {
 private var handle: UInt8 = 0
 
 func consume(error: NSError) {
-    let pmke = objc_getAssociatedObject(error, &handle) as! Consumable
-    pmke.consumed = true
+    // The association could be nil if the objc_setAssociatedObject
+    // has taken a *really* long time. Or perhaps the user has
+    // overused `zalgo`. Thus we ignore it. This is an unlikely edge
+    // case and the unhandled-error feature is not mission-critical.
+
+    if let pmke = objc_getAssociatedObject(error, &handle) as? Consumable {
+        pmke.consumed = true
+    }
 }
 
 extension AnyPromise {
@@ -376,7 +382,7 @@ func unconsume(error: NSError) {
     } else {
         // this is how we know when the error is deallocated
         // because we will be deallocated at the same time
-        objc_setAssociatedObject(error, &handle, Consumable(parent: error), objc_AssociationPolicy(OBJC_ASSOCIATION_RETAIN_NONATOMIC))
+        objc_setAssociatedObject(error, &handle, Consumable(parent: error), objc_AssociationPolicy(OBJC_ASSOCIATION_RETAIN))
     }
 }