Merge pull request #314 from BranchMetrics/fix-crash

Will prevent future crashes

Author: ahmednawar

Branch-SDK/Branch-SDK/BNCPreferenceHelper.m

@@ -7,6 +7,7 @@
 //
 
 #import "BNCPreferenceHelper.h"
+#import "BNCEncodingUtils.h"
 #import "BNCConfig.h"
 #import "Branch.h"
 
@@ -368,13 +369,25 @@ - (void)setSessionParams:(NSString *)sessionParams {
 
 - (NSString *)installParams {
     if (!_installParams) {
-        _installParams = [self readStringFromDefaults:BRANCH_PREFS_KEY_INSTALL_PARAMS];
+        id installParamsFromCache = [self readStringFromDefaults:BRANCH_PREFS_KEY_INSTALL_PARAMS];
+        if ([installParamsFromCache isKindOfClass:[NSString class]]) {
+            _installParams = [self readStringFromDefaults:BRANCH_PREFS_KEY_INSTALL_PARAMS];
+        }
+        else if ([installParamsFromCache isKindOfClass:[NSDictionary class]]) {
+            [self writeObjectToDefaults:BRANCH_PREFS_KEY_INSTALL_PARAMS value:nil];
+        }
     }
 
     return _installParams;
 }
 
 - (void)setInstallParams:(NSString *)installParams {
+    if ([installParams isKindOfClass:[NSDictionary class]]) {
+        _installParams = [BNCEncodingUtils encodeDictionaryToJsonString:installParams];
+        [self writeObjectToDefaults:BRANCH_PREFS_KEY_INSTALL_PARAMS value:_installParams];
+        return;
+    }
+    
     if (![_installParams isEqualToString:installParams]) {
         _installParams = installParams;
         [self writeObjectToDefaults:BRANCH_PREFS_KEY_INSTALL_PARAMS value:installParams];

Branch-SDK/Branch-SDK/Requests/BranchOpenRequest.m

@@ -113,7 +113,11 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
     if (sessionData.length && preferenceHelper.isReferrable) {
         NSDictionary *sessionDataDict = [BNCEncodingUtils decodeJsonStringToDictionary:sessionData];
         BOOL dataIsFromALinkClick = [sessionDataDict[BRANCH_RESPONSE_KEY_CLICKED_BRANCH_LINK] isEqual:@1];
-        BOOL storedParamsAreEmpty = !preferenceHelper.installParams.length;
+        
+        BOOL storedParamsAreEmpty = YES;
+        if ([preferenceHelper.installParams isKindOfClass:[NSString class]]) {
+            storedParamsAreEmpty = !preferenceHelper.installParams.length;
+        }
 
         if (dataIsFromALinkClick && (self.isInstall || storedParamsAreEmpty)) {
             preferenceHelper.installParams = sessionData;

Branch-TestBed/Branch-TestBed/ViewController.m

@@ -117,7 +117,9 @@ - (IBAction)cmdExecuteBuy:(id)sender {
 }
 - (IBAction)cmdIdentifyUserClick:(id)sender {
     Branch *branch = [Branch getInstance];
-    [branch setIdentity:@"test_user_10"];
+    [branch setIdentity:@"test_user_104" withCallback:^(NSDictionary *params, NSError *error) {
+        NSLog(@"callback in setIdentity %@", params);
+    }];
 }
 - (IBAction)logoutWithCallback {
   Branch *branch = [Branch getInstance];