Merge pull request #1084 from BranchMetrics/SDK-1111

SDK-1111 support error return for latd method

Author: echo-branch

Branch-SDK/Branch.h

@@ -1120,7 +1120,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  @param window attribution window in days.  If the window is 0, the server will use the server side default.  If the window is outside the server supported range, it will default to 30 days.
  @param completion callback with attribution data
  */
-- (void)lastAttributedTouchDataWithAttributionWindow:(NSInteger)window completion:(void(^) (BranchLastAttributedTouchData * _Nullable latd))completion;
+- (void)lastAttributedTouchDataWithAttributionWindow:(NSInteger)window completion:(void(^) (BranchLastAttributedTouchData * _Nullable latd, NSError * _Nullable error))completion;
 
 #pragma mark - Short Url Sync methods
 

Branch-SDK/Branch.m

@@ -1285,7 +1285,7 @@ - (void)crossPlatformIdDataWithCompletion:(void(^) (BranchCrossPlatformID * _Nul
     });
 }
 
-- (void)lastAttributedTouchDataWithAttributionWindow:(NSInteger)window completion:(void(^) (BranchLastAttributedTouchData * _Nullable latd))completion {
+- (void)lastAttributedTouchDataWithAttributionWindow:(NSInteger)window completion:(void(^) (BranchLastAttributedTouchData * _Nullable latd, NSError * _Nullable error))completion {
     [self initSafetyCheck];
     dispatch_async(self.isolationQueue, ^(){
         [BranchLastAttributedTouchData requestLastTouchAttributedData:self.serverInterface key:self.class.branchKey attributionWindow:window completion:completion];

Branch-SDK/BranchLastAttributedTouchData.h

@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (nullable BranchLastAttributedTouchData *)buildFromJSON:(NSDictionary *)json;
 
-+ (void)requestLastTouchAttributedData:(BNCServerInterface *)serverInterface key:(NSString *)key attributionWindow:(NSInteger)window completion:(void(^) (BranchLastAttributedTouchData *latd))completion;
++ (void)requestLastTouchAttributedData:(BNCServerInterface *)serverInterface key:(NSString *)key attributionWindow:(NSInteger)window completion:(void(^) (BranchLastAttributedTouchData *latd, NSError *error))completion;
 
 @end
 

Branch-SDK/BranchLastAttributedTouchData.m

@@ -26,7 +26,7 @@ + (BranchLastAttributedTouchData *)buildFromJSON:(NSDictionary *)json {
     return nil;
 }
 
-+ (void)requestLastTouchAttributedData:(BNCServerInterface *)serverInterface key:(NSString *)key attributionWindow:(NSInteger)window completion:(void(^) (BranchLastAttributedTouchData *latd))completion {
++ (void)requestLastTouchAttributedData:(BNCServerInterface *)serverInterface key:(NSString *)key attributionWindow:(NSInteger)window completion:(void (^)(BranchLastAttributedTouchData *__nullable latd, NSError *__nullable error))completion {
     BranchLATDRequest *request = [BranchLATDRequest new];
 
     // Limit attribution range to about a year.  Although the server only supports up to 90 days as of Nov. 2019, it will fail gracefully for higher values.
@@ -41,14 +41,14 @@ + (void)requestLastTouchAttributedData:(BNCServerInterface *)serverInterface key
         // error is logged by the network service, skip parsing on error
         if (error) {
             if (completion) {
-                completion(nil);
+                completion(nil, error);
             }
             return;
         }
 
         BranchLastAttributedTouchData *latd = [self buildFromJSON:response.data];
         if (completion) {
-            completion(latd);
+            completion(latd, error);
         }
     }];
 }