Merge pull request #216 from BranchMetrics/update-ios-lib-12-10

chore: Update iOS library and changlog

Author: aaustin

CHANGELOG.md

@@ -2,6 +2,13 @@
 All notable changes to the Branch Web SDK will be documented here.
 The Branch Web SDK adheres to [Semantic Versioning](http://semver.org/).
 
+## [v2.2.1] - 2016-09-15
+- Updated iOS library to v 0.12.10
+- Support for iOS extensions (iMessage apps)
+- New mechanism for incorporating the Android library (build.gradle extension)
+- Added support for routing non Branch links (`NonBranchLinkHandler`)
+- Number of small fixes and tweaks
+
 ## [v2.1.0] - 2016-05-20
 
 We've been frantically addressing all of the discrepancies and bugs over the last couple months. This version marks a stable update that should have resolved most of the issues.

plugin.template.xml

@@ -26,7 +26,7 @@ SOFTWARE.
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="io.branch.sdk"
-        version="2.1.10">
+        version="2.2.1">
 
     <name>branch-cordova-sdk</name>
     <description>Branch SDK Plugin</description>

plugin.xml

@@ -26,7 +26,7 @@ SOFTWARE.
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="io.branch.sdk"
-        version="2.2.0">
+        version="2.2.1">
 
     <name>branch-cordova-sdk</name>
     <description>Branch SDK Plugin</description>

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.9"
+#define SDK_VERSION             @"0.12.10"
 
 #define BNC_PROD_ENV
 //#define BNC_STAGE_ENV

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

@@ -410,8 +410,8 @@ - (BOOL)continueUserActivity:(NSUserActivity *)userActivity {
     //check to see if a browser activity needs to be handled
     if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) {
         self.preferenceHelper.universalLinkUrl = [userActivity.webpageURL absoluteString];
-        [self initUserSessionAndCallCallback:YES];
         self.preferenceHelper.shouldWaitForInit = NO;
+        [self initUserSessionAndCallCallback:YES];
 
         id branchUniversalLinkDomains = [self.preferenceHelper getBranchUniversalLinkDomains];
         if ([branchUniversalLinkDomains isKindOfClass:[NSString class]] && [[userActivity.webpageURL absoluteString] containsString:branchUniversalLinkDomains]) {
@@ -448,8 +448,8 @@ - (BOOL)continueUserActivity:(NSUserActivity *)userActivity {
         }
     }
 
-    [self initUserSessionAndCallCallback:YES];
     self.preferenceHelper.shouldWaitForInit = NO;
+    [self initUserSessionAndCallCallback:YES];
 
     return spotlightIdentifier != nil;
 }
@@ -1165,7 +1165,10 @@ - (void)processNextQueueItem {
                     // First, gather all the requests to fail
                     NSMutableArray *requestsToFail = [[NSMutableArray alloc] init];
                     for (int i = 0; i < self.requestQueue.size; i++) {
-                        [requestsToFail addObject:[self.requestQueue peekAt:i]];
+                        BNCServerRequest *request = [self.requestQueue peekAt:i];
+                        if (request) {
+                            [requestsToFail addObject:request];
+                        }                        
                     }
 
                     // Next, remove all the requests that should not be replayed. Note, we do this before calling callbacks, in case any
@@ -1361,7 +1364,7 @@ + (NSString *)bundleIdentifier {
 }
 
 + (NSString *)kitDisplayVersion {
-	return @"0.12.9";
+	return @"0.12.10";
 }
 
 @end

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

@@ -38,8 +38,8 @@ typedef NS_ENUM(NSInteger, ContentIndexMode) {
 @property (nonatomic, assign) BOOL automaticallyListOnSpotlight;
 
 
-- (nullable instancetype)initWithCanonicalIdentifier:(nonnull NSString *)canonicalIdentifier;
-- (nullable instancetype)initWithTitle:(nonnull NSString *)title;
+- (nonnull instancetype)initWithCanonicalIdentifier:(nonnull NSString *)canonicalIdentifier;
+- (nonnull instancetype)initWithTitle:(nonnull NSString *)title;
 
 - (void)addMetadataKey:(nonnull NSString *)key value:(nonnull NSString *)value;
 

src/ios/dependencies/Branch-SDK/Requests/BranchLoadRewardsRequest.m

@@ -46,18 +46,26 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
     NSArray *responseKeys = [response.data allKeys];
     NSArray *storedKeys = [currentCreditDictionary allKeys];
 
-    if ([responseKeys count]) {
+    if ([responseKeys count] && ([response.data isKindOfClass:[NSDictionary class]] || [response.data isKindOfClass:[NSMutableDictionary class]])) {
+        
         for (NSString *key in response.data) {
-             NSInteger credits = [response.data[key] integerValue];
+            if (![key isKindOfClass:[NSString class]]) { continue; }
+            
+            NSInteger credits = [preferenceHelper getCreditCountForBucket:key];
+            if (response.data[key] && [response.data[key] respondsToSelector:@selector(integerValue)]) {
+                credits = [response.data[key] integerValue];
+            }
 
-             BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper preferenceHelper];
-             if (credits != [preferenceHelper getCreditCountForBucket:key]) {
-                 hasUpdated = YES;
-             }
+            BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper preferenceHelper];
+            if (credits != [preferenceHelper getCreditCountForBucket:key]) {
+                hasUpdated = YES;
+            }
 
-             [preferenceHelper setCreditCount:credits forBucket:key];
+            [preferenceHelper setCreditCount:credits forBucket:key];
         }
         for(NSString *key in storedKeys) {
+            if (![key isKindOfClass:[NSString class]]) { continue; }
+
             if(![response.data objectForKey:key]) {
                 [preferenceHelper removeCreditCountForBucket:key];
                 hasUpdated = YES;

src/ios/dependencies/Branch.framework/Versions/A/Branch

@@ -9,7 +9,7 @@
 #ifndef Branch_SDK_Config_h
 #define Branch_SDK_Config_h
 
-#define SDK_VERSION             @"0.12.9"
+#define SDK_VERSION             @"0.12.10"
 
 #define BNC_PROD_ENV
 //#define BNC_STAGE_ENV

src/ios/dependencies/Branch.framework/Versions/A/Headers/BNCConfig.h

@@ -38,8 +38,8 @@ typedef NS_ENUM(NSInteger, ContentIndexMode) {
 @property (nonatomic, assign) BOOL automaticallyListOnSpotlight;
 
 
-- (nullable instancetype)initWithCanonicalIdentifier:(nonnull NSString *)canonicalIdentifier;
-- (nullable instancetype)initWithTitle:(nonnull NSString *)title;
+- (nonnull instancetype)initWithCanonicalIdentifier:(nonnull NSString *)canonicalIdentifier;
+- (nonnull instancetype)initWithTitle:(nonnull NSString *)title;
 
 - (void)addMetadataKey:(nonnull NSString *)key value:(nonnull NSString *)value;