Merge pull request #1003 from BranchMetrics/INTENG-8758-be-more-consistent-about-callback-thread

INTENG-8758 restore previous callback on main behavior

Author: echo-branch

Branch-SDK/Branch-SDK/Branch.m

@@ -1591,7 +1591,10 @@ - (void)generateShortUrl:(NSArray *)tags
 
         if ([self.linkCache objectForKey:linkData]) {
             if (callback) {
-                callback([self.linkCache objectForKey:linkData], nil);
+                // callback on main, this is generally what the client expects and maintains our previous behavior
+                dispatch_async(dispatch_get_main_queue(), ^ {
+                    callback([self.linkCache objectForKey:linkData], nil);
+                });
             }
             return;
         }
@@ -1774,7 +1777,12 @@ - (void)registerViewWithParams:(NSDictionary *)params andCallback:(callbackWithP
         BranchUniversalObject *buo = [[BranchUniversalObject alloc] init];
         buo.contentMetadata.customMetadata = (id) params;
         [[BranchEvent standardEvent:BranchStandardEventViewItem withContentItem:buo] logEvent];
-        if (callback) callback(@{}, nil);
+        if (callback) {
+            // callback on main, this is generally what the client expects and maintains our previous behavior
+            dispatch_async(dispatch_get_main_queue(), ^ {
+                callback(@{}, nil);
+            });
+        }
     });
 }