Added constants and fixed isDeepLink

Author: nsingh-branch

Branch-TestBed/Branch-TestBed/AppDelegate.m

@@ -31,6 +31,7 @@ - (BOOL)application:(UIApplication *)application
        Info.plist file. This makes Branch test against your test environment (As shown in the Branch
        Dashboard) instead of the live environment.
     */
+    [Branch setReferrerGbraidValidityWindow: 1000000000];
 
     // Branch.useTestBranchKey = YES;  // Make sure to comment this line out for production apps!!!
     Branch *branch = [Branch getInstance];
@@ -54,6 +55,7 @@ - (BOOL)application:(UIApplication *)application
 
     [branch checkPasteboardOnInstall];
 
+
     /*
      *    Required: Initialize Branch, passing a deep link handler block:
      */

Branch-TestBed/Branch-TestBed/ViewController.m

@@ -146,6 +146,7 @@ - (void)viewDidLoad {
             [self.setParnerParamsButton setImage:[UIImage systemImageNamed:@"folder.badge.plus"] forState:UIControlStateNormal];
         }
     }
+    
 }
 - (IBAction)goToPasteControlPressed:(id)sender {
     [self performSegueWithIdentifier:@"GoToPasteControlView"

BranchSDK/BNCReferringURLUtility.m

@@ -11,6 +11,7 @@
 #import "BranchConstants.h"
 #import "BNCUrlQueryParameter.h"
 #import "NSMutableDictionary+Branch.h"
+#import "BNCLog.h"
 
 @interface BNCReferringURLUtility()
 
@@ -41,7 +42,7 @@ - (void)parseReferringURL:(NSURL *)url {
             param.value = item.value;
             param.timestamp = [NSDate date];
             param.isDeepLink = YES;
-            
+
             //If there is no validity window, set to default.
             if (param.validityWindow == 0) {
                 param.validityWindow = [self defaultValidityWindowForParam:item.name];
@@ -66,10 +67,7 @@ - (NSDictionary *)getURLQueryParamsForRequest:(NSString *)endpoint {
     if (gbraid) {
         [returnedParams bnc_safeAddEntriesFromDictionary:gbraid];
     }
-
-    //For future parameters, their functions can be added here
 
-    NSLog(@"Added following params to %@: %@", endpoint, returnedParams);
     return returnedParams;
 }
 
@@ -100,7 +98,7 @@ - (NSDictionary *)addGbraidValuesFor:(NSString *)endpoint {
 
                 if ([endpoint containsString:@"/v1/open"]) {
                     returnedParams[BRANCH_REQUEST_KEY_IS_DEEPLINK_GBRAID] = @(gbraid.isDeepLink);
-                    gbraid.isDeepLink = 0;
+                    gbraid.isDeepLink = NO;
 
                     //Forcing write to disk
                     [BNCPreferenceHelper sharedInstance].referringURLQueryParameters = [self serializeToJson:self.urlQueryParameters];
@@ -114,7 +112,7 @@ - (NSDictionary *)addGbraidValuesFor:(NSString *)endpoint {
 
 // Helper Methods
 - (BOOL)isSupportedQueryParameter:(NSString *)param {
-    NSArray *validURLQueryParameters = @[@"gbraid", @"gclid"];
+    NSArray *validURLQueryParameters = @[BRANCH_REQUEST_KEY_REFERRER_GBRAID, BRANCH_REQUEST_KEY_GCLID];
     if ([validURLQueryParameters containsObject:param]) {
         return YES;
     } else {
@@ -145,11 +143,11 @@ - (NSMutableDictionary *)serializeToJson:(NSMutableDictionary<NSString *, BNCUrl
 
     for (BNCUrlQueryParameter *param in urlQueryParameters.allValues) {
         NSMutableDictionary *paramDict = [NSMutableDictionary new];
-        paramDict[@"name"] = param.name;
-        paramDict[@"value"] = param.value;
-        paramDict[@"timestamp"] = param.timestamp;
-        paramDict[@"isDeepLink"] = @(param.isDeepLink);
-        paramDict[@"validityWindow"] = @(param.validityWindow);
+        paramDict[BRANCH_URL_QUERY_PARAMETERS_NAME_KEY] = param.name;
+        paramDict[BRANCH_URL_QUERY_PARAMETERS_VALUE_KEY] = param.value;
+        paramDict[BRANCH_URL_QUERY_PARAMETERS_TIMESTAMP_KEY] = param.timestamp;
+        paramDict[BRANCH_URL_QUERY_PARAMETERS_IS_DEEPLINK_KEY] = @(param.isDeepLink);
+        paramDict[BRANCH_URL_QUERY_PARAMETERS_VALIDITY_WINDOW_KEY] = @(param.validityWindow);
 
         json[param.name] = paramDict;
     }
@@ -164,11 +162,15 @@ - (NSMutableDictionary *)serializeToJson:(NSMutableDictionary<NSString *, BNCUrl
         if ([temp isKindOfClass:NSDictionary.class] || [temp isKindOfClass:NSMutableDictionary.class]) {
             NSDictionary *paramDict = (NSDictionary *)temp;
             BNCUrlQueryParameter *param = [BNCUrlQueryParameter new];
-            param.name = paramDict[@"name"];
-            param.value = paramDict[@"value"];
-            param.timestamp = paramDict[@"timestamp"];
-            param.isDeepLink = paramDict[@"isDeepLink"];
-            param.validityWindow = [paramDict[@"validityWindow"] doubleValue];
+            param.name = paramDict[BRANCH_URL_QUERY_PARAMETERS_NAME_KEY];
+            param.value = paramDict[BRANCH_URL_QUERY_PARAMETERS_VALUE_KEY];
+            param.timestamp = paramDict[BRANCH_URL_QUERY_PARAMETERS_TIMESTAMP_KEY];
+            if (paramDict[BRANCH_URL_QUERY_PARAMETERS_IS_DEEPLINK_KEY] != nil) {
+                param.isDeepLink = ((NSNumber *)paramDict[BRANCH_URL_QUERY_PARAMETERS_IS_DEEPLINK_KEY]).boolValue;
+            } else {
+                param.isDeepLink = NO;
+            }
+            param.validityWindow = [paramDict[BRANCH_URL_QUERY_PARAMETERS_VALIDITY_WINDOW_KEY] doubleValue];
 
             result[param.name] = param;
         }
@@ -186,14 +188,14 @@ -(void)checkForAndMigrateOldGbraid {
         NSDate *existingGbraidInitDate = [BNCPreferenceHelper sharedInstance].referrerGBRAIDInitDate;
 
         BNCUrlQueryParameter *gbraid = [BNCUrlQueryParameter new];
-        gbraid.name = @"gbraid";
+        gbraid.name = BRANCH_REQUEST_KEY_REFERRER_GBRAID;
         gbraid.value = existingGbraidValue;
         gbraid.timestamp = existingGbraidInitDate;
         gbraid.validityWindow = existingGbraidValidityWindow;
         gbraid.isDeepLink = NO;
 
-        if (self.urlQueryParameters[@"gbraid"].value == nil) {
-            [self.urlQueryParameters setValue:gbraid forKey:@"gbraid"];
+        if (self.urlQueryParameters[BRANCH_REQUEST_KEY_REFERRER_GBRAID].value == nil) {
+            [self.urlQueryParameters setValue:gbraid forKey:BRANCH_REQUEST_KEY_REFERRER_GBRAID];
             [BNCPreferenceHelper sharedInstance].referringURLQueryParameters = [self serializeToJson:self.urlQueryParameters];
         }
     }

BranchSDK/BranchConstants.h

@@ -84,6 +84,11 @@ extern NSString * const BRANCH_REQUEST_KEY_REFERRER_GBRAID;
 extern NSString * const BRANCH_REQUEST_KEY_REFERRER_GBRAID_TIMESTAMP;
 extern NSString * const BRANCH_REQUEST_KEY_IS_DEEPLINK_GBRAID;
 extern NSString * const BRANCH_REQUEST_KEY_GCLID;
+extern NSString * const BRANCH_URL_QUERY_PARAMETERS_NAME_KEY;
+extern NSString * const BRANCH_URL_QUERY_PARAMETERS_VALUE_KEY;
+extern NSString * const BRANCH_URL_QUERY_PARAMETERS_TIMESTAMP_KEY;
+extern NSString * const BRANCH_URL_QUERY_PARAMETERS_IS_DEEPLINK_KEY;
+extern NSString * const BRANCH_URL_QUERY_PARAMETERS_VALIDITY_WINDOW_KEY;
 
 extern NSString * const BRANCH_REQUEST_ENDPOINT_SET_IDENTITY;
 extern NSString * const BRANCH_REQUEST_ENDPOINT_APP_LINK_SETTINGS;

BranchSDK/BranchConstants.m

@@ -77,8 +77,13 @@
 NSString * const BRANCH_REQUEST_METADATA_KEY_SCANTIME_WINDOW = @"skan_time_window";
 NSString * const BRANCH_REQUEST_KEY_REFERRER_GBRAID = @"gbraid";
 NSString * const BRANCH_REQUEST_KEY_REFERRER_GBRAID_TIMESTAMP = @"gbraid_timestamp";
-NSString * const BRANCH_REQUEST_KEY_GCLID = @"gclid";
 NSString * const BRANCH_REQUEST_KEY_IS_DEEPLINK_GBRAID = @"is_deeplink_gbraid";
+NSString * const BRANCH_REQUEST_KEY_GCLID = @"gclid";
+NSString * const BRANCH_URL_QUERY_PARAMETERS_NAME_KEY = @"name";
+NSString * const BRANCH_URL_QUERY_PARAMETERS_VALUE_KEY = @"value";
+NSString * const BRANCH_URL_QUERY_PARAMETERS_TIMESTAMP_KEY = @"timestamp";
+NSString * const BRANCH_URL_QUERY_PARAMETERS_IS_DEEPLINK_KEY = @"isDeepLink";
+NSString * const BRANCH_URL_QUERY_PARAMETERS_VALIDITY_WINDOW_KEY = @"validityWindow";
 
 NSString * const BRANCH_REQUEST_ENDPOINT_SET_IDENTITY = @"profile";
 NSString * const BRANCH_REQUEST_ENDPOINT_APP_LINK_SETTINGS = @"app-link-settings";