SDK-777 don't retry event's with callbacks

Author: echo-branch

Branch-SDK/Branch-SDK/BNCCallbackMap.h

@@ -17,6 +17,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)storeRequest:(BNCServerRequest *)request withCompletion:(void (^_Nullable)(NSString *statusMessage))completion;
 
+- (BOOL)containsRequest:(BNCServerRequest *)request;
+
 - (void)callCompletionForRequest:(BNCServerRequest *)request withStatusMessage:(NSString *)statusMessage;
 
 @end

Branch-SDK/Branch-SDK/BNCCallbackMap.m

@@ -39,6 +39,14 @@ - (void)storeRequest:(BNCServerRequest *)request withCompletion:(void (^_Nullabl
     [self.callbacks setObject:completion forKey:request];
 }
 
+- (BOOL)containsRequest:(BNCServerRequest *)request {
+    BOOL contains = NO;
+    if ([self.callbacks objectForKey:request] != nil) {
+        contains = YES;
+    }
+    return contains;
+}
+
 - (void)callCompletionForRequest:(BNCServerRequest *)request withStatusMessage:(NSString *)statusMessage {
     void (^completion)(NSString *) = [self.callbacks objectForKey:request];
     if (completion) {

Branch-SDK/Branch-SDK/Branch.m

@@ -1905,16 +1905,8 @@ - (void) processRequest:(BNCServerRequest*)req
         // Next, remove all the requests that should not be replayed. Note, we do this before
         // calling callbacks, in case any of the callbacks try to kick off another request, which
         // could potentially start another request (and call these callbacks again)
-
-        NSSet<Class> *replayableRequests = [[NSSet alloc] initWithArray:@[
-            BranchEventRequest.class,
-            BranchUserCompletedActionRequest.class,
-            BranchSetIdentityRequest.class,
-            BranchCommerceEventRequest.class,
-        ]];
-
         for (BNCServerRequest *request in requestsToFail) {
-            if (Branch.trackingDisabled || ![replayableRequests containsObject:request.class]) {
+            if (Branch.trackingDisabled || ![self isReplayableRequest:request]) {
                 [self.requestQueue remove:request];
             }
         }
@@ -1927,6 +1919,7 @@ - (void) processRequest:(BNCServerRequest*)req
             BNCPerformBlockOnMainThreadSync(^ {
                 [request processResponse:nil error:error];
 
+                // BranchEventRequests can have callbacks directly tied to them.
                 if ([request isKindOfClass:[BranchEventRequest class]]) {
                     [[BNCCallbackMap shared] callCompletionForRequest:req withStatusMessage:[NSString stringWithFormat:@"Error: %@", error.description]];
                 }
@@ -1935,6 +1928,29 @@ - (void) processRequest:(BNCServerRequest*)req
     }
 }
 
+- (BOOL)isReplayableRequest:(BNCServerRequest *)request {
+    
+    // These request types
+    NSSet<Class> *replayableRequests = [[NSSet alloc] initWithArray:@[
+        BranchEventRequest.class,
+        BranchUserCompletedActionRequest.class,
+        BranchSetIdentityRequest.class,
+        BranchCommerceEventRequest.class,
+    ]];
+    
+    if ([replayableRequests containsObject:request.class]) {
+        
+        // Check if the client registered a callback for this request.
+        // This indicates the client will handle retry themselves, so fail it.
+        if ([[BNCCallbackMap shared] containsRequest:request]) {
+            return NO;
+        } else {
+            return YES;
+        }
+    }
+    return NO;
+}
+
 - (void)processNextQueueItem {
     dispatch_semaphore_wait(self.processing_sema, DISPATCH_TIME_FOREVER);