Merge pull request #960 from BranchMetrics/SDK-631-handle-init-error-states

SDK-631 add workaround for error state handling

Author: echo-branch

Branch-SDK/Branch-SDK/Branch.m

@@ -958,6 +958,8 @@ - (void)setIdentity:(NSString *)userId withCallback:(callbackWithParams)callback
         }
         return;
     }
+    
+    [self initSafetyCheck];
     dispatch_async(self.isolationQueue, ^(){
         BranchSetIdentityRequest *req = [[BranchSetIdentityRequest alloc] initWithUserId:userId callback:callback];
         [self.requestQueue enqueue:req];
@@ -1015,6 +1017,8 @@ - (void)userCompletedAction:(NSString *)action withState:(NSDictionary *)state {
     if (!action) {
         return;
     }
+    
+    [self initSafetyCheck];
     dispatch_async(self.isolationQueue, ^(){
         BranchUserCompletedActionRequest *req = [[BranchUserCompletedActionRequest alloc] initWithAction:action state:state];
         [self.requestQueue enqueue:req];
@@ -1027,6 +1031,7 @@ - (void)userCompletedAction:(NSString *)action withState:(NSDictionary *)state w
 }
 
 - (void)sendServerRequest:(BNCServerRequest*)request {
+    [self initSafetyCheck];
     dispatch_async(self.isolationQueue, ^(){
         [self.requestQueue enqueue:request];
         [self processNextQueueItem];
@@ -1039,6 +1044,7 @@ - (void)sendServerRequestWithoutSession:(BNCServerRequest*)request {
 }
 
 - (void)sendCommerceEvent:(BNCCommerceEvent *)commerceEvent metadata:(NSDictionary*)metadata withCompletion:(void (^)(NSDictionary *, NSError *))completion {
+    [self initSafetyCheck];
     dispatch_async(self.isolationQueue, ^(){
         BranchCommerceEventRequest *request = [[BranchCommerceEventRequest alloc] initWithCommerceEvent:commerceEvent metadata:metadata completion:completion];
         [self.requestQueue enqueue:request];
@@ -1049,6 +1055,7 @@ - (void)sendCommerceEvent:(BNCCommerceEvent *)commerceEvent metadata:(NSDictiona
 #pragma mark - Credit methods
 
 - (void)loadRewardsWithCallback:(callbackWithStatus)callback {
+    [self initSafetyCheck];
     dispatch_async(self.isolationQueue, ^(){
         BranchLoadRewardsRequest *req = [[BranchLoadRewardsRequest alloc] initWithCallback:callback];
         [self.requestQueue enqueue:req];
@@ -1097,7 +1104,7 @@ - (void)redeemRewards:(NSInteger)count forBucket:(NSString *)bucket callback:(ca
         }
         return;
     }
-
+    [self initSafetyCheck];
     dispatch_async(self.isolationQueue, ^(){
         BranchRedeemRewardsRequest *req = [[BranchRedeemRewardsRequest alloc] initWithAmount:count bucket:bucket callback:callback];
         [self.requestQueue enqueue:req];
@@ -1118,6 +1125,7 @@ - (void)getCreditHistoryAfter:(NSString *)creditTransactionId number:(NSInteger)
 }
 
 - (void)getCreditHistoryForBucket:(NSString *)bucket after:(NSString *)creditTransactionId number:(NSInteger)length order:(BranchCreditHistoryOrder)order andCallback:(callbackWithList)callback {
+    [self initSafetyCheck];
     dispatch_async(self.isolationQueue, ^(){
         BranchCreditHistoryRequest *req = [[BranchCreditHistoryRequest alloc] initWithBucket:bucket creditTransactionId:creditTransactionId length:length order:order callback:callback];
         [self.requestQueue enqueue:req];
@@ -1317,6 +1325,7 @@ - (void)getShortUrlWithParams:(NSDictionary *)params andTags:(NSArray *)tags and
 }
 
 - (void)getSpotlightUrlWithParams:(NSDictionary *)params callback:(callbackWithParams)callback {
+    [self initSafetyCheck];
     dispatch_async(self.isolationQueue, ^(){
         BranchSpotlightUrlRequest *req = [[BranchSpotlightUrlRequest alloc] initWithParams:params callback:callback];
         [self.requestQueue enqueue:req];
@@ -1550,6 +1559,8 @@ - (void)generateShortUrl:(NSArray *)tags
                 andStage:(NSString *)stage
              andCampaign:campaign andParams:(NSDictionary *)params
              andCallback:(callbackWithUrl)callback {
+    
+    [self initSafetyCheck];
     dispatch_async(self.isolationQueue, ^(){
         BNCLinkData *linkData = [self prepareLinkDataFor:tags
                                                 andAlias:alias
@@ -1742,6 +1753,7 @@ - (BNCLinkData *)prepareLinkDataFor:(NSArray *)tags
 #pragma mark - BranchUniversalObject methods
 
 - (void)registerViewWithParams:(NSDictionary *)params andCallback:(callbackWithParams)callback {
+    [self initSafetyCheck];
     dispatch_async(self.isolationQueue, ^(){
         BranchUniversalObject *buo = [[BranchUniversalObject alloc] init];
         buo.contentMetadata.customMetadata = (id) params;
@@ -1932,6 +1944,16 @@ - (void)clearNetworkQueue {
 
 #pragma mark - Session Initialization
 
+// SDK-631 Workaround to maintain existing error handling behavior.
+// Some methods require init before they are called.  Instead of returning an error, we try to fix the situation by calling init ourselves.
+// There is a follow up ticket to improve this.  SDK-633
+- (void)initSafetyCheck {
+    if (self.initializationStatus == BNCInitStatusUninitialized) {
+        BNCLogWarning(@"Branch avoided an error by preemptively initializing.");
+        [self initUserSessionAndCallCallback:NO];
+    }
+}
+
 - (void)initUserSessionAndCallCallback:(BOOL)callCallback {
     dispatch_async(self.isolationQueue, ^(){
         NSString *urlstring = nil;