Release 0.16.2.

Branch.framework/Versions/A/Headers/BNCCommerceEvent.h

@@ -37,6 +37,203 @@ extern BNCProductCategory BNCProductCategorySportingGoods;
 extern BNCProductCategory BNCProductCategoryToysGames;
 extern BNCProductCategory BNCProductCategoryVehiclesParts;
 
+#pragma mark - BNCCurrency
+
+typedef NSString*const BNCCurrency;
+
+extern BNCCurrency BNCCurrencyAED;
+extern BNCCurrency BNCCurrencyAFN;
+extern BNCCurrency BNCCurrencyALL;
+extern BNCCurrency BNCCurrencyAMD;
+extern BNCCurrency BNCCurrencyANG;
+extern BNCCurrency BNCCurrencyAOA;
+extern BNCCurrency BNCCurrencyARS;
+extern BNCCurrency BNCCurrencyAUD;
+extern BNCCurrency BNCCurrencyAWG;
+extern BNCCurrency BNCCurrencyAZN;
+extern BNCCurrency BNCCurrencyBAM;
+extern BNCCurrency BNCCurrencyBBD;
+
+extern BNCCurrency BNCCurrencyBDT;
+extern BNCCurrency BNCCurrencyBGN;
+extern BNCCurrency BNCCurrencyBHD;
+extern BNCCurrency BNCCurrencyBIF;
+extern BNCCurrency BNCCurrencyBMD;
+extern BNCCurrency BNCCurrencyBND;
+extern BNCCurrency BNCCurrencyBOB;
+extern BNCCurrency BNCCurrencyBOV;
+extern BNCCurrency BNCCurrencyBRL;
+extern BNCCurrency BNCCurrencyBSD;
+extern BNCCurrency BNCCurrencyBTN;
+extern BNCCurrency BNCCurrencyBWP;
+
+extern BNCCurrency BNCCurrencyBYN;
+extern BNCCurrency BNCCurrencyBYR;
+extern BNCCurrency BNCCurrencyBZD;
+extern BNCCurrency BNCCurrencyCAD;
+extern BNCCurrency BNCCurrencyCDF;
+extern BNCCurrency BNCCurrencyCHE;
+extern BNCCurrency BNCCurrencyCHF;
+extern BNCCurrency BNCCurrencyCHW;
+extern BNCCurrency BNCCurrencyCLF;
+extern BNCCurrency BNCCurrencyCLP;
+extern BNCCurrency BNCCurrencyCNY;
+extern BNCCurrency BNCCurrencyCOP;
+
+extern BNCCurrency BNCCurrencyCOU;
+extern BNCCurrency BNCCurrencyCRC;
+extern BNCCurrency BNCCurrencyCUC;
+extern BNCCurrency BNCCurrencyCUP;
+extern BNCCurrency BNCCurrencyCVE;
+extern BNCCurrency BNCCurrencyCZK;
+extern BNCCurrency BNCCurrencyDJF;
+extern BNCCurrency BNCCurrencyDKK;
+extern BNCCurrency BNCCurrencyDOP;
+extern BNCCurrency BNCCurrencyDZD;
+extern BNCCurrency BNCCurrencyEGP;
+extern BNCCurrency BNCCurrencyERN;
+
+extern BNCCurrency BNCCurrencyETB;
+extern BNCCurrency BNCCurrencyEUR;
+extern BNCCurrency BNCCurrencyFJD;
+extern BNCCurrency BNCCurrencyFKP;
+extern BNCCurrency BNCCurrencyGBP;
+extern BNCCurrency BNCCurrencyGEL;
+extern BNCCurrency BNCCurrencyGHS;
+extern BNCCurrency BNCCurrencyGIP;
+extern BNCCurrency BNCCurrencyGMD;
+extern BNCCurrency BNCCurrencyGNF;
+extern BNCCurrency BNCCurrencyGTQ;
+extern BNCCurrency BNCCurrencyGYD;
+
+extern BNCCurrency BNCCurrencyHKD;
+extern BNCCurrency BNCCurrencyHNL;
+extern BNCCurrency BNCCurrencyHRK;
+extern BNCCurrency BNCCurrencyHTG;
+extern BNCCurrency BNCCurrencyHUF;
+extern BNCCurrency BNCCurrencyIDR;
+extern BNCCurrency BNCCurrencyILS;
+extern BNCCurrency BNCCurrencyINR;
+extern BNCCurrency BNCCurrencyIQD;
+extern BNCCurrency BNCCurrencyIRR;
+extern BNCCurrency BNCCurrencyISK;
+extern BNCCurrency BNCCurrencyJMD;
+
+extern BNCCurrency BNCCurrencyJOD;
+extern BNCCurrency BNCCurrencyJPY;
+extern BNCCurrency BNCCurrencyKES;
+extern BNCCurrency BNCCurrencyKGS;
+extern BNCCurrency BNCCurrencyKHR;
+extern BNCCurrency BNCCurrencyKMF;
+extern BNCCurrency BNCCurrencyKPW;
+extern BNCCurrency BNCCurrencyKRW;
+extern BNCCurrency BNCCurrencyKWD;
+extern BNCCurrency BNCCurrencyKYD;
+extern BNCCurrency BNCCurrencyKZT;
+extern BNCCurrency BNCCurrencyLAK;
+
+extern BNCCurrency BNCCurrencyLBP;
+extern BNCCurrency BNCCurrencyLKR;
+extern BNCCurrency BNCCurrencyLRD;
+extern BNCCurrency BNCCurrencyLSL;
+extern BNCCurrency BNCCurrencyLYD;
+extern BNCCurrency BNCCurrencyMAD;
+extern BNCCurrency BNCCurrencyMDL;
+extern BNCCurrency BNCCurrencyMGA;
+extern BNCCurrency BNCCurrencyMKD;
+extern BNCCurrency BNCCurrencyMMK;
+extern BNCCurrency BNCCurrencyMNT;
+extern BNCCurrency BNCCurrencyMOP;
+
+extern BNCCurrency BNCCurrencyMRO;
+extern BNCCurrency BNCCurrencyMUR;
+extern BNCCurrency BNCCurrencyMVR;
+extern BNCCurrency BNCCurrencyMWK;
+extern BNCCurrency BNCCurrencyMXN;
+extern BNCCurrency BNCCurrencyMXV;
+extern BNCCurrency BNCCurrencyMYR;
+extern BNCCurrency BNCCurrencyMZN;
+extern BNCCurrency BNCCurrencyNAD;
+extern BNCCurrency BNCCurrencyNGN;
+extern BNCCurrency BNCCurrencyNIO;
+extern BNCCurrency BNCCurrencyNOK;
+
+extern BNCCurrency BNCCurrencyNPR;
+extern BNCCurrency BNCCurrencyNZD;
+extern BNCCurrency BNCCurrencyOMR;
+extern BNCCurrency BNCCurrencyPAB;
+extern BNCCurrency BNCCurrencyPEN;
+extern BNCCurrency BNCCurrencyPGK;
+extern BNCCurrency BNCCurrencyPHP;
+extern BNCCurrency BNCCurrencyPKR;
+extern BNCCurrency BNCCurrencyPLN;
+extern BNCCurrency BNCCurrencyPYG;
+extern BNCCurrency BNCCurrencyQAR;
+extern BNCCurrency BNCCurrencyRON;
+
+extern BNCCurrency BNCCurrencyRSD;
+extern BNCCurrency BNCCurrencyRUB;
+extern BNCCurrency BNCCurrencyRWF;
+extern BNCCurrency BNCCurrencySAR;
+extern BNCCurrency BNCCurrencySBD;
+extern BNCCurrency BNCCurrencySCR;
+extern BNCCurrency BNCCurrencySDG;
+extern BNCCurrency BNCCurrencySEK;
+extern BNCCurrency BNCCurrencySGD;
+extern BNCCurrency BNCCurrencySHP;
+extern BNCCurrency BNCCurrencySLL;
+extern BNCCurrency BNCCurrencySOS;
+
+extern BNCCurrency BNCCurrencySRD;
+extern BNCCurrency BNCCurrencySSP;
+extern BNCCurrency BNCCurrencySTD;
+extern BNCCurrency BNCCurrencySYP;
+extern BNCCurrency BNCCurrencySZL;
+extern BNCCurrency BNCCurrencyTHB;
+extern BNCCurrency BNCCurrencyTJS;
+extern BNCCurrency BNCCurrencyTMT;
+extern BNCCurrency BNCCurrencyTND;
+extern BNCCurrency BNCCurrencyTOP;
+extern BNCCurrency BNCCurrencyTRY;
+extern BNCCurrency BNCCurrencyTTD;
+
+extern BNCCurrency BNCCurrencyTWD;
+extern BNCCurrency BNCCurrencyTZS;
+extern BNCCurrency BNCCurrencyUAH;
+extern BNCCurrency BNCCurrencyUGX;
+extern BNCCurrency BNCCurrencyUSD;
+extern BNCCurrency BNCCurrencyUSN;
+extern BNCCurrency BNCCurrencyUYI;
+extern BNCCurrency BNCCurrencyUYU;
+extern BNCCurrency BNCCurrencyUZS;
+extern BNCCurrency BNCCurrencyVEF;
+extern BNCCurrency BNCCurrencyVND;
+extern BNCCurrency BNCCurrencyVUV;
+
+extern BNCCurrency BNCCurrencyWST;
+extern BNCCurrency BNCCurrencyXAF;
+extern BNCCurrency BNCCurrencyXAG;
+extern BNCCurrency BNCCurrencyXAU;
+extern BNCCurrency BNCCurrencyXBA;
+extern BNCCurrency BNCCurrencyXBB;
+extern BNCCurrency BNCCurrencyXBC;
+extern BNCCurrency BNCCurrencyXBD;
+extern BNCCurrency BNCCurrencyXCD;
+extern BNCCurrency BNCCurrencyXDR;
+extern BNCCurrency BNCCurrencyXFU;
+extern BNCCurrency BNCCurrencyXOF;
+
+extern BNCCurrency BNCCurrencyXPD;
+extern BNCCurrency BNCCurrencyXPF;
+extern BNCCurrency BNCCurrencyXPT;
+extern BNCCurrency BNCCurrencyXSU;
+extern BNCCurrency BNCCurrencyXTS;
+extern BNCCurrency BNCCurrencyXUA;
+extern BNCCurrency BNCCurrencyXXX;
+extern BNCCurrency BNCCurrencyYER;
+extern BNCCurrency BNCCurrencyZAR;
+extern BNCCurrency BNCCurrencyZMW;
+
 #pragma mark - BNCProduct
 
 @interface BNCProduct : NSObject
@@ -53,7 +250,7 @@ extern BNCProductCategory BNCProductCategoryVehiclesParts;
 
 @interface BNCCommerceEvent : NSObject
 @property (nonatomic, strong) NSDecimalNumber *revenue;
-@property (nonatomic, strong) NSString *currency;
+@property (nonatomic, strong) BNCCurrency currency;
 @property (nonatomic, strong) NSString *transactionID;
 @property (nonatomic, strong) NSDecimalNumber *shipping;
 @property (nonatomic, strong) NSDecimalNumber *tax;

Branch.framework/Versions/A/Headers/BNCPreferenceHelper.h

@@ -11,9 +11,10 @@
 #define FILE_NAME   [[NSString stringWithUTF8String:__FILE__] lastPathComponent]
 #define LINE_NUM    __LINE__
 
+NSURL* /* _Nonnull */ BNCURLForBranchDirectory(void);
+
 @interface BNCPreferenceHelper : NSObject
 
-@property (strong, nonatomic) NSString *branchKey;
 @property (strong, nonatomic) NSString *lastRunBranchKey;
 @property (strong, nonatomic) NSDate   *lastStrongMatchDate;
 @property (strong, nonatomic) NSString *appVersion;
@@ -29,7 +30,6 @@
 @property (strong, nonatomic) NSString *installParams;
 @property (assign, nonatomic) BOOL isDebug;
 @property (assign, nonatomic) BOOL shouldWaitForInit;
-@property (assign, nonatomic) BOOL suppressWarningLogs;
 @property (assign, nonatomic) BOOL checkedFacebookAppLinks;
 @property (assign, nonatomic) BOOL checkedAppleSearchAdAttribution;
 @property (assign, nonatomic) NSInteger retryCount;
@@ -44,14 +44,11 @@
 @property (strong) NSString *branchAPIURL;
 
 + (BNCPreferenceHelper *)preferenceHelper;
-+ (NSURL*) URLForBranchDirectory;
 
 - (NSString *)getAPIBaseURL;
 - (NSString *)getAPIURL:(NSString *)endpoint;
 - (NSString *)getEndpointFromURL:(NSString *)url;
 
-- (NSString *)getBranchKey:(BOOL)isLive;
-
 - (void)clearUserCreditsAndCounts;
 - (void)clearUserCredits;
 
@@ -74,9 +71,6 @@
 - (NSMutableDictionary *)instrumentationDictionary;
 - (void)clearInstrumentationDictionary;
 
-- (void)log:(NSString *)filename line:(int)line message:(NSString *)format, ...;
-- (void)logWarning:(NSString *)message;
-
 - (void)saveBranchAnalyticsData:(NSDictionary *)analyticsData;
 - (void)clearBranchAnalyticsData;
 - (NSMutableDictionary *)getBranchAnalyticsData;

Branch.framework/Versions/A/Headers/Branch.h

@@ -134,17 +134,18 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
 /// @name Global Instance Accessors
 ///--------------------------------
 
-/**
- Gets the global, live Branch instance.
- */
-+ (Branch *)getInstance;
-
 /**
  Gets the global, test Branch instance.
- 
+
  @warning This method is not meant to be used in production!
+*/
++ (Branch *) getTestInstance __attribute__((deprecated(("Use `Branch.useTestBranchKey = YES;` instead."))));
+
+
+/**
+ Gets the global, live Branch instance.
  */
-+ (Branch *)getTestInstance;
++ (Branch *)getInstance;
 
 /**
  Gets the global Branch instance, configures using the specified key
@@ -154,6 +155,33 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  */
 + (Branch *)getInstance:(NSString *)branchKey;
 
+/// TODO: Document:
+/**
+    Sets Branch to use the test `key_test_...` Branch key found in the Info.plist.
+    This can only be set before `[Branch getInstance...]` is called.
+    
+ @param useTestKey If YES then Branch to use the Branch test found in your app's Info.plist.
+*/
++ (void) setUseTestBranchKey:(BOOL)useTestKey;
+
+/// @return Returns true if the Branch test key should be used.
++ (BOOL) useTestBranchKey;
+
+/**
+ Directly sets the Branch key to be used.  Branch usually reads the Branch key from your app's
+ Info.plist file which is recommended and more convenient.  But the Branch key can also be set 
+ with this method. See the documentation at
+   https://dev.branch.io/getting-started/sdk-integration-guide/guide/ios/#configure-xcode-project
+ for information about configuring your app with Branch keys.
+ 
+ You can only set the Branch key once per app run.
+
+ @param branchKey The Branch key to use.
+*/
++ (void) setBranchKey:(NSString*)branchKey;
+
+/// @return Returns the current Branch key.
++ (NSString*) branchKey;
 
 #pragma mark - BranchActivityItemProvider methods
 
@@ -338,12 +366,23 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  */
 - (BOOL)handleDeepLink:(NSURL *)url;
 
+
+/**
+ Have Branch end the current deep link session and start a new session with the provided URL.
+
+ @param url     The URL to use to start the new session.
+ @return        Returns true if the passed URL can be handled by Branch.
+ */
+
+-(BOOL)handleDeepLinkWithNewSession:(NSURL *)url;
+
 /**
  Allow Branch to handle restoration from an NSUserActivity, returning whether or not it was
  from a Branch link.
  
  @param userActivity The NSUserActivity that caused the app to be opened.
  */
+
 - (BOOL)continueUserActivity:(NSUserActivity *)userActivity;
 
 /**
@@ -399,7 +438,14 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
 /// @name Deep Link Controller
 ///---------------------------
 
-- (void)registerDeepLinkController:(UIViewController <BranchDeepLinkingController> *)controller forKey:(NSString *)key;
+- (void)registerDeepLinkController:(UIViewController <BranchDeepLinkingController> *)controller forKey:(NSString *)key __attribute__((deprecated(("This API is deprecated. Please use registerDeepLinkController: forKey: withOption:"))));
+
+/**
+ Allow Branch to handle a view controller with options to push, present or show.
+ Note:
+ * If push option is used and the rootviewcontroller of window is not of type UINavigationViewController, than the sharing View controller would be presented automatically
+ */
+- (void)registerDeepLinkController:(UIViewController <BranchDeepLinkingController> *)controller forKey:(NSString *)key withPresentation:(BNCViewControllerPresentationOption)option;
 
 #pragma mark - Configuration methods
 

Branch.framework/Versions/A/Headers/BranchDeepLinkingController.h

@@ -5,13 +5,21 @@
 //  Created by Graham Mueller on 6/18/15.
 //  Copyright (c) 2015 Branch Metrics. All rights reserved.
 //
-
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 @protocol BranchDeepLinkingControllerCompletionDelegate <NSObject>
 
-- (void)deepLinkingControllerCompleted;
+- (void)deepLinkingControllerCompleted __attribute__((deprecated(("This API is deprecated. Instead, use deepLinkingControllerCompletedFrom: viewController"))));;
+- (void)deepLinkingControllerCompletedFrom:(UIViewController*) viewController;
 
 @end
 
+typedef NS_ENUM(NSInteger, BNCViewControllerPresentationOption) {
+    BNCViewControllerOptionShow,
+    BNCViewControllerOptionPush,
+    BNCViewControllerOptionPresent
+};
+
 @protocol BranchDeepLinkingController <NSObject>
 
 - (void)configureControlWithData:(NSDictionary *)data;