Merge branch 'QA' of ssh://github.com/BranchMetrics/ios-branch-deep-linking

Author: Edward Smith

.gitignore

@@ -1,10 +1,19 @@
-Pods/
-carthage-files/*.zip
-carthage-files/Carthage
+# Mac
+.DS_Store
+.LSOverride
+
+# Xcode
+[Bb]uild
 *.xcuserstate
 *.xcuserdatad
-*.DS_Store
 *.xcscmblueprint
+*.o
+
+# Pods
+Pods/
 
 # Carthage
 Carthage/Build
+carthage-files/*.zip
+carthage-files/Carthage
+

Branch-SDK/Branch-SDK/BNCConfig.h

@@ -9,7 +9,7 @@
 #ifndef Branch_SDK_Config_h
 #define Branch_SDK_Config_h
 
-#define SDK_VERSION             @"0.12.12"
+#define SDK_VERSION             @"0.12.13"
 
 #define BNC_PROD_ENV
 //#define BNC_STAGE_ENV

Branch-SDK/Branch-SDK/BNCDeviceInfo.h

@@ -28,8 +28,12 @@
 @property (nonatomic, strong) NSNumber *screenHeight;
 @property (nonatomic) BOOL isAdTrackingEnabled;
 
+@property (nonatomic, strong) NSString* country;            //  iso2 Country name (us, in,etc).
+@property (nonatomic, strong) NSString* language;           //  iso2 language code (en, ml).
+@property (nonatomic, strong) NSString* browserUserAgent;   //  Simple user agent string.
+
 
 //----------Methods----------------//
 + (BNCDeviceInfo *)getInstance;
 
-@end
+@end

Branch-SDK/Branch-SDK/BNCDeviceInfo.m

@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import "BNCDeviceInfo.h"
 #import "BNCPreferenceHelper.h"
 #import "BNCSystemObserver.h"
@@ -27,26 +28,62 @@ + (BNCDeviceInfo *)getInstance {
 }
 
 - (id)init {
-    if (self = [super init]) {
-        BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper preferenceHelper];
-        BOOL isRealHardwareId;
-        NSString *hardwareIdType;
-        NSString *hardwareId = [BNCSystemObserver getUniqueHardwareId:&isRealHardwareId isDebug:preferenceHelper.isDebug andType:&hardwareIdType];
-        if (hardwareId) {
-            self.hardwareId = hardwareId;
-            self.isRealHardwareId = isRealHardwareId;
-            self.hardwareIdType = hardwareIdType;
+    self = [super init];
+    if (!self) return self;
+
+    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper preferenceHelper];
+    BOOL isRealHardwareId;
+    NSString *hardwareIdType;
+    NSString *hardwareId =
+        [BNCSystemObserver getUniqueHardwareId:&isRealHardwareId
+            isDebug:preferenceHelper.isDebug
+            andType:&hardwareIdType];
+    if (hardwareId) {
+        self.hardwareId = hardwareId;
+        self.isRealHardwareId = isRealHardwareId;
+        self.hardwareIdType = hardwareIdType;
+    }
+    
+    self.vendorId = [BNCSystemObserver getVendorId];
+    self.brandName = [BNCSystemObserver getBrand];
+    self.modelName = [BNCSystemObserver getModel];
+    self.osName = [BNCSystemObserver getOS];
+    self.osVersion = [BNCSystemObserver getOSVersion];
+    self.screenWidth = [BNCSystemObserver getScreenWidth];
+    self.screenHeight = [BNCSystemObserver getScreenHeight];
+    self.isAdTrackingEnabled = [BNCSystemObserver adTrackingSafe];
+
+    //  Get the locale info --
+    CGFloat systemVersion = [UIDevice currentDevice].systemVersion.floatValue;
+    if (systemVersion < 9.0) {
+
+        self.language = [[NSLocale preferredLanguages] firstObject];
+        NSString *rawLocale = [NSLocale currentLocale].localeIdentifier;
+        NSRange range = [rawLocale rangeOfString:@"_"];
+        if (range.location != NSNotFound) {
+            range = NSMakeRange(range.location+1, rawLocale.length-range.location-1);
+            self.country = [rawLocale substringWithRange:range];
         }
-        
-        self.vendorId = [BNCSystemObserver getVendorId];
-        self.brandName = [BNCSystemObserver getBrand];
-        self.modelName = [BNCSystemObserver getModel];
-        self.osName = [BNCSystemObserver getOS];
-        self.osVersion = [BNCSystemObserver getOSVersion];
-        self.screenWidth = [BNCSystemObserver getScreenWidth];
-        self.screenHeight = [BNCSystemObserver getScreenHeight];
-        self.isAdTrackingEnabled = [BNCSystemObserver adTrackingSafe];
+
+    } else if (systemVersion < 10.0) {
+
+        NSString *rawLanguage = [[NSLocale preferredLanguages] firstObject];
+        NSDictionary *languageDictionary = [NSLocale componentsFromLocaleIdentifier:rawLanguage];
+        self.country = [languageDictionary objectForKey:@"kCFLocaleCountryCodeKey"];
+        self.language = [languageDictionary  objectForKey:@"kCFLocaleLanguageCodeKey"];
+
+    } else {
+
+        self.country = [NSLocale currentLocale].countryCode;
+        self.language = [NSLocale currentLocale].languageCode;
+
     }
+
+    self.browserUserAgent =
+        [[[UIWebView alloc]
+            initWithFrame:CGRectZero]
+                stringByEvaluatingJavaScriptFromString:@"navigator.userAgent"];
+
     return self;
 }
 

Branch-SDK/Branch-SDK/BNCPreferenceHelper.h

@@ -39,6 +39,7 @@
 @property (assign, nonatomic) NSInteger installRequestDelay;
 
 + (BNCPreferenceHelper *)preferenceHelper;
++ (NSURL*) URLForBranchDirectory;
 
 - (NSString *)getAPIBaseURL;
 - (NSString *)getAPIURL:(NSString *)endpoint;

Branch-SDK/Branch-SDK/BNCPreferenceHelper.m

@@ -610,13 +610,25 @@ - (void)writeObjectToDefaults:(NSString *)key value:(NSObject *)value {
 }
 
 - (void)persistPrefsToDisk {
-    NSDictionary *persistenceDict = [self.persistenceDict copy];
-    NSBlockOperation *newPersistOp = [NSBlockOperation blockOperationWithBlock:^{
-        if (![NSKeyedArchiver archiveRootObject:persistenceDict toFile:[self prefsFile]]) {
-            [self logWarning:@"Failed to persist preferences to disk"];
-        }
-    }];
+    @synchronized (self) {
+        NSDictionary *persistenceDict = [self.persistenceDict copy];
+        NSBlockOperation *newPersistOp = [NSBlockOperation blockOperationWithBlock:^ {
+            NSData *data = [NSKeyedArchiver archivedDataWithRootObject:persistenceDict];
+            if (!data) {
+                [self logWarning:@"Can't create preferences archive."];
+                return;
+            }
+            NSError *error = nil;
+            [data writeToURL:self.class.URLForPrefsFile
+                options:NSDataWritingAtomic error:&error];
+            if (error) {
+                [self logWarning:
+                    [NSString stringWithFormat:
+                        @"Failed to persist preferences to disk: %@.", error]];
+            }
+        }];
     [self.persistPrefsQueue addOperation:newPersistOp];
+    }
 }
 
 #pragma mark - Reading From Persistence
@@ -625,20 +637,23 @@ - (NSMutableDictionary *)persistenceDict {
     if (!_persistenceDict) {
         NSDictionary *persistenceDict = nil;
         @try {
-            persistenceDict = [NSKeyedUnarchiver unarchiveObjectWithFile:[self prefsFile]];
+            NSError *error = nil;
+            NSData *data = [NSData dataWithContentsOfURL:self.class.URLForPrefsFile
+                    options:0 error:&error];
+            if (error || !data)
+                NSLog(@"Error opening prefs file: %@.", error);
+            else
+                persistenceDict = [NSKeyedUnarchiver unarchiveObjectWithData:data];
         }
         @catch (NSException *exception) {
-            [self logWarning:@"Failed to load preferences from disk"];
+            [self logWarning:@"Failed to load preferences from disk."];
         }
 
-        if (persistenceDict) {
+        if ([persistenceDict isKindOfClass:[NSDictionary class]])
             _persistenceDict = [persistenceDict mutableCopy];
-        }
-        else {
+        else
             _persistenceDict = [[NSMutableDictionary alloc] init];
-        }
     }
-    
     return _persistenceDict;
 }
 
@@ -672,8 +687,69 @@ - (NSInteger)readIntegerFromDefaults:(NSString *)key {
     return NSNotFound;
 }
 
-- (NSString *)prefsFile {
-    return [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject] stringByAppendingPathComponent:BRANCH_PREFS_FILE];
++ (NSString *)prefsFile_deprecated {
+    NSString * path =
+        [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES)
+            firstObject]
+                stringByAppendingPathComponent:BRANCH_PREFS_FILE];
+    return path;
+}
+
++ (NSURL*) URLForBranchDirectory {
+    NSError *error = nil;
+    NSURL *URL =
+        [[NSFileManager defaultManager]
+            URLForDirectory:NSApplicationSupportDirectory
+            inDomain:NSUserDomainMask
+            appropriateForURL:nil
+            create:YES
+            error:&error];
+    if (error) {
+        NSLog(@"Error creating URLForPrefsDirectory: %@.", error);
+        return nil;
+    }
+    URL = [URL URLByAppendingPathComponent:@"io.branch"];
+    [[NSFileManager defaultManager]
+        createDirectoryAtURL:URL
+        withIntermediateDirectories:YES
+        attributes:nil
+        error:&error];
+    if (error) {
+        NSLog(@"Error creating URLForPrefsDirectory: %@.", error);
+        return nil;
+    }
+    return URL;
+}
+
++ (NSURL*) URLForPrefsFile {
+    NSURL *URL = [self URLForBranchDirectory];
+    URL = [URL URLByAppendingPathComponent:BRANCH_PREFS_FILE];
+    return URL;
+}
+
++ (void) moveOldPrefsFile {
+    NSURL *oldURL = [NSURL fileURLWithPath:self.prefsFile_deprecated];
+    NSURL *newURL = [self URLForPrefsFile];
+
+    NSError *error = nil;
+    [[NSFileManager defaultManager]
+        moveItemAtURL:oldURL
+        toURL:newURL
+        error:&error];
+
+    if (error && error.code != NSFileNoSuchFileError) {
+        if (error.code == NSFileWriteFileExistsError) {
+            [[NSFileManager defaultManager]
+                removeItemAtURL:oldURL
+                error:&error];
+        } else {
+            NSLog(@"Error moving prefs file: %@.", error);
+        }
+    }
+}
+
++ (void) initialize {
+    [self moveOldPrefsFile];
 }
 
 @end

Branch-SDK/Branch-SDK/BNCServerInterface.m

@@ -298,7 +298,11 @@ - (void)updateDeviceInfoToMutableDictionary:(NSMutableDictionary *)dict {
     [self safeSetValue:deviceInfo.osVersion forKey:BRANCH_REQUEST_KEY_OS_VERSION onDict:dict];
     [self safeSetValue:deviceInfo.screenWidth forKey:BRANCH_REQUEST_KEY_SCREEN_WIDTH onDict:dict];
     [self safeSetValue:deviceInfo.screenHeight forKey:BRANCH_REQUEST_KEY_SCREEN_HEIGHT onDict:dict];
-    
+
+    [self safeSetValue:deviceInfo.browserUserAgent forKey:@"user_agent" onDict:dict];
+    [self safeSetValue:deviceInfo.country forKey:@"country" onDict:dict];
+    [self safeSetValue:deviceInfo.language forKey:@"language" onDict:dict];
+
     dict[BRANCH_REQUEST_KEY_AD_TRACKING_ENABLED] = @(deviceInfo.isAdTrackingEnabled);
 
 }