Change other dispatch mains to new fn

Stripe/STPAPIPostRequest.m

@@ -10,6 +10,7 @@
 #import "STPAPIClient.h"
 #import "STPAPIClient+Private.h"
 #import "StripeError.h"
+#import "STPDispatchFunctions.h"
 
 @implementation STPAPIPostRequest
 
@@ -36,7 +37,7 @@
         if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
             httpResponse = (NSHTTPURLResponse *)response;
         }
-        dispatch_async(dispatch_get_main_queue(), ^{
+        stpDispatchToMainThreadIfNecessary(^{
             if (returnedError) {
                 completion(nil, httpResponse, returnedError);
             } else {

Stripe/STPPromise.m

@@ -8,6 +8,8 @@
 
 #import "STPPromise.h"
 #import "STPWeakStrongMacros.h"
+#import "STPDispatchFunctions.h"
+
 
 @interface STPPromise<T>()
 
@@ -50,21 +52,13 @@
         return;
     }
     self.value = value;
-    if ([NSThread isMainThread]) {
+    stpDispatchToMainThreadIfNecessary(^{
         for (STPPromiseValueBlock valueBlock in self.successCallbacks) {
             valueBlock(value);
         }
         self.successCallbacks = nil;
         self.errorCallbacks = nil;
-    } else {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            for (STPPromiseValueBlock valueBlock in self.successCallbacks) {
-                valueBlock(value);
-            }
-            self.successCallbacks = nil;
-            self.errorCallbacks = nil;
-        });
-    }
+    });
 }
 
 - (void)fail:(NSError *)error {
@@ -72,21 +66,13 @@
         return;
     }
     self.error = error;
-    if ([NSThread isMainThread]) {
+    stpDispatchToMainThreadIfNecessary(^{
         for (STPPromiseErrorBlock errorBlock in self.errorCallbacks) {
             errorBlock(error);
         }
         self.successCallbacks = nil;
         self.errorCallbacks = nil;
-    } else {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            for (STPPromiseErrorBlock errorBlock in self.errorCallbacks) {
-                errorBlock(error);
-            }
-            self.successCallbacks = nil;
-            self.errorCallbacks = nil;
-        });
-    }
+    });
 }
 
 - (void)completeWith:(STPPromise *)promise {
@@ -102,13 +88,9 @@
 
 - (instancetype)onSuccess:(STPPromiseValueBlock)callback {
     if (self.value) {
-        if ([NSThread isMainThread]) {
+        stpDispatchToMainThreadIfNecessary( ^{
             callback(self.value);
-        } else {
-            dispatch_async(dispatch_get_main_queue(), ^{
-                callback(self.value);
-            });
-        }
+        });
     } else {
         self.successCallbacks = [self.successCallbacks arrayByAddingObject:callback];
     }
@@ -117,13 +99,9 @@
 
 - (instancetype)onFailure:(STPPromiseErrorBlock)callback {
     if (self.error) {
-        if ([NSThread isMainThread]) {
+        stpDispatchToMainThreadIfNecessary( ^{
             callback(self.error);
-        } else {
-            dispatch_async(dispatch_get_main_queue(), ^{
-                callback(self.error);
-            });
-        }
+        });
     } else {
         self.errorCallbacks = [self.errorCallbacks arrayByAddingObject:callback];
     }