fix: updated iOS SDK to 0.12.16 [ √ iOS ]

hooks/afterPrepareHook.js

@@ -79,5 +79,4 @@ function activateUniversalLinksInIos(cordovaContext, pluginPreferences) {
 
   // generate entitlements file
   iosProjectEntitlements.generateAssociatedDomainsEntitlements(cordovaContext, pluginPreferences);
-}
-//# sourceMappingURL=afterPrepareHook.js.map
+}

hooks/beforePluginInstallHook.js

@@ -152,5 +152,4 @@ module.exports = function (ctx) {
   installRequiredNodeModules(modules);
 
   createPluginInstalledFlag(ctx);
-};
-//# sourceMappingURL=beforePluginInstallHook.js.map
+};

hooks/iosBeforePrepareHook.js

@@ -77,5 +77,4 @@ function getOldProjectName(projectDir) {
   return projectName;
 }
 
-// endregion
-//# sourceMappingURL=iosBeforePrepareHook.js.map
+// endregion

hooks/lib/android/manifestWriter.js

@@ -296,5 +296,4 @@ Class injects plugin preferences into AndroidManifest.xml file.
   }
 
   // endregion
-})();
-//# sourceMappingURL=manifestWriter.js.map
+})();

hooks/lib/configXmlHelper.js

@@ -118,5 +118,4 @@ Helper class to read data from config.xml file.
   }
 
   // endregion
-})();
-//# sourceMappingURL=configXmlHelper.js.map
+})();

hooks/lib/configXmlParser.js

@@ -130,5 +130,4 @@ Parser for config.xml file. Read plugin-specific preferences (from <branch-confi
   }
 
   // endregion
-})();
-//# sourceMappingURL=configXmlParser.js.map
+})();

hooks/lib/ios/projectEntitlements.js

@@ -174,5 +174,4 @@ Script only generates content. File it self is included in the xcode project in
   }
 
   // endregion
-})();
-//# sourceMappingURL=projectEntitlements.js.map
+})();

hooks/lib/ios/xcodePreferences.js

@@ -217,5 +217,4 @@ Which is:
   }
 
   // endregion
-})();
-//# sourceMappingURL=xcodePreferences.js.map
+})();

hooks/lib/xmlHelper.js

@@ -56,5 +56,4 @@ Small helper class to read/write from/to xml file.
 
     return isSaved;
   }
-})();
-//# sourceMappingURL=xmlHelper.js.map
+})();

src/ios/dependencies/Branch-SDK/BNCConfig.h

@@ -9,7 +9,7 @@
 #ifndef Branch_SDK_Config_h
 #define Branch_SDK_Config_h
 
-#define SDK_VERSION             @"0.12.11"
+#define SDK_VERSION             @"0.12.16"
 
 #define BNC_PROD_ENV
 //#define BNC_STAGE_ENV

src/ios/dependencies/Branch-SDK/BNCContentDiscoveryManager.m

@@ -43,10 +43,7 @@ - (NSString *)spotlightIdentifierFromActivity:(NSUserActivity *)userActivity {
     // If it has our prefix, then the link identifier is just the last piece of the identifier.
     NSString *activityIdentifier = userActivity.userInfo[CSSearchableItemActivityIdentifier];
     BOOL isBranchIdentifier = [activityIdentifier hasPrefix:BRANCH_SPOTLIGHT_PREFIX];
-
-    // Checking for CSSearchableItemActionType in the activity for legacy spotlight indexing (pre 0.12.7)
-    // Now we index NSUserActivies with type set to io.branch. + bundleId for better SEO
-    if ([userActivity.activityType isEqualToString:CSSearchableItemActionType] || isBranchIdentifier) {
+    if (isBranchIdentifier) {
         return activityIdentifier;
     }
 #endif

src/ios/dependencies/Branch-SDK/BNCDeviceInfo.h

@@ -24,12 +24,16 @@
 @property (nonatomic, strong) NSString *modelName;
 @property (nonatomic, strong) NSString *osName;
 @property (nonatomic, strong) NSString *osVersion;
-@property (nonatomic) NSNumber *screenWidth;
-@property (nonatomic) NSNumber *screenHeight;
+@property (nonatomic, strong) NSNumber *screenWidth;
+@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

src/ios/dependencies/Branch-SDK/BNCDeviceInfo.m

@@ -6,10 +6,14 @@
 //  Copyright © 2016 Branch Metrics. All rights reserved.
 //
 
+
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import "BNCDeviceInfo.h"
 #import "BNCPreferenceHelper.h"
 #import "BNCSystemObserver.h"
+#import "BNCXcode7Support.h"
+
 
 @interface BNCDeviceInfo()
 
@@ -27,26 +31,63 @@ + (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 {
+
+        NSLocale *locale = [NSLocale currentLocale];
+        self.country = [locale countryCode];
+        self.language = [locale languageCode ];
+
     }
+
+    self.browserUserAgent =
+        [[[UIWebView alloc]
+            initWithFrame:CGRectZero]
+                stringByEvaluatingJavaScriptFromString:@"navigator.userAgent"];
+
     return self;
 }
 

src/ios/dependencies/Branch-SDK/BNCEncodingUtils.m

@@ -244,7 +244,7 @@ + (NSString *)encodeDictionaryToJsonString:(NSDictionary *)dictionary {
         }
         else {
             // If this type is not a known type, don't attempt to encode it.
-            NSLog(@"Cannot encode value for key %@, type is in list of accepted types", key);
+            NSLog(@"[encodeDictionaryToJsonString] Cannot encode value for key %@, type is not in list of accepted types", key);
             continue;
         }
 
@@ -311,7 +311,7 @@ + (NSString *)encodeArrayToJsonString:(NSArray *)array {
         }
         else {
             // If this type is not a known type, don't attempt to encode it.
-            NSLog(@"Cannot encode value %@, type is not in list of accepted types", obj);
+            NSLog(@"[encodedArray] Cannot encode value %@, type is not in list of accepted types", obj);
             continue;
         }
 
@@ -365,7 +365,7 @@ + (NSString *)encodeDictionaryToQueryString:(NSDictionary *)dictionary {
             }
             else {
                 // If this type is not a known type, don't attempt to encode it.
-                NSLog(@"Cannot encode value %@, type is in not list of accepted types", obj);
+                NSLog(@"[encodeDictionaryToQueryString] Cannot encode value %@, type is not in list of accepted types", obj);
                 continue;
             }
 

src/ios/dependencies/Branch-SDK/BNCError.h

@@ -6,9 +6,11 @@
 //  Copyright (c) 2014 Branch Metrics. All rights reserved.
 //
 
+
 #import <Foundation/Foundation.h>
 
-FOUNDATION_EXPORT NSString * const BNCErrorDomain;
+
+FOUNDATION_EXPORT NSString *_Nonnull const BNCErrorDomain;
 
 enum {
     BNCInitError = 1000,
@@ -22,4 +24,4 @@ enum {
 
 @interface BNCError : NSObject
 
-@end
+@end

src/ios/dependencies/Branch-SDK/BNCError.m

@@ -6,8 +6,10 @@
 //  Copyright (c) 2014 Branch Metrics. All rights reserved.
 //
 
+
 #import "BNCError.h"
 
+
 NSString * const BNCErrorDomain = @"io.branch";
 
 @implementation BNCError

src/ios/dependencies/Branch-SDK/BNCPreferenceHelper.h

@@ -37,8 +37,10 @@
 @property (strong, nonatomic) NSString *externalIntentURI;
 @property (strong, nonatomic) NSMutableDictionary *savedAnalyticsData;
 @property (assign, nonatomic) NSInteger installRequestDelay;
+@property (strong, nonatomic) NSDictionary *appleSearchAdDetails;
 
 + (BNCPreferenceHelper *)preferenceHelper;
++ (NSURL*) URLForBranchDirectory;
 
 - (NSString *)getAPIBaseURL;
 - (NSString *)getAPIURL:(NSString *)endpoint;