Merge pull request #632 from engineerapart/3.x-maintenance

Update iOS SDK in 3.x maintenance branch

Author: echo-branch

package.json

@@ -2,7 +2,7 @@
   "name": "branch-cordova-sdk",
   "description": "Branch Metrics Cordova SDK",
   "main": "src/index.js",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
   "repository": {
     "type": "git",

plugin.xml

@@ -24,7 +24,7 @@ SOFTWARE.
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
   id="branch-cordova-sdk"
-  version="3.2.0">
+  version="3.4.0">
 
   <!-- Description -->
   <name>branch-cordova-sdk</name>
@@ -73,24 +73,26 @@ SOFTWARE.
       </feature>
     </config-file>
 
-    <framework src="iAd.framework" />
     <framework src="SafariServices.framework" />
-    <framework src="AdSupport.framework" />
     <framework src="CoreSpotlight.framework" />
+    <framework src="iAd.framework" />
+    <framework src="AdSupport.framework" />
     <framework src="MobileCoreServices.framework" />
+    <framework src="SystemConfiguration.framework" />
+    <framework src="CoreTelephony.framework" />
+    <framework src="WebKit.framework" />
 
     <header-file src="src/ios/BranchNPM.h" />
     <header-file src="src/ios/BranchSDK.h" />
     <source-file src="src/ios/BranchSDK.m" />
     <source-file src="src/ios/AppDelegate+BranchSdk.m" />
 
-    <header-file src="src/ios/dependencies/Fabric/ANSCompatibility.h" />
-    <header-file src="src/ios/dependencies/Fabric/Answers.h" />
-    <header-file src="src/ios/dependencies/Fabric/FABAttributes.h" />
-    <header-file src="src/ios/dependencies/Fabric/FABKitProtocol.h" />
-    <header-file src="src/ios/dependencies/Fabric/Fabric+FABKits.h" />
-    <header-file src="src/ios/dependencies/Fabric/Fabric.h" />
-
+    <header-file src="src/ios/dependencies/Branch-SDK/BNCAppleAdClient.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BNCAppleAdClient.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BNCAppleReceipt.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BNCAppleReceipt.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BNCAppleSearchAds.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BNCAppleSearchAds.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCApplication.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCApplication.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCAvailability.h" />
@@ -110,43 +112,53 @@ SOFTWARE.
     <source-file src="src/ios/dependencies/Branch-SDK/BNCDeepLinkViewControllerInstance.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCDeviceInfo.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCDeviceInfo.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BNCDeviceSystem.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BNCDeviceSystem.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCEncodingUtils.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCEncodingUtils.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BNCError.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCError.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BNCFabricAnswers.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCFabricAnswers.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BNCFacebookAppLinks.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BNCFacebookAppLinks.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCFieldDefines.h" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BNCJSONUtility.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BNCJSONUtility.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCKeyChain.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCKeyChain.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCLinkCache.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCLinkCache.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCLinkData.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCLinkData.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BNCLocale.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BNCLocale.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCLocalization.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCLocalization.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCLog.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCLog.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BNCNetworkInterface.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BNCNetworkInterface.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCPreferenceHelper.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCPreferenceHelper.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BNCReachability.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BNCReachability.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCSpotlightService.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCSpotlightService.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BNCStrongMatchHelper.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCStrongMatchHelper.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCSystemObserver.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCSystemObserver.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BNCTelephony.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BNCTelephony.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCThreads.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCThreads.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BNCTuneUtility.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BNCTuneUtility.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCURLBlackList.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCURLBlackList.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Branch+Validator.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Branch+Validator.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BNCUserAgentCollector.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BNCUserAgentCollector.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/Branch.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/Branch.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Branch+Validator.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Branch+Validator.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BranchActivityItemProvider.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BranchActivityItemProvider.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BranchCSSearchableItemAttributeSet.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BranchCSSearchableItemAttributeSet.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BranchConstants.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BranchConstants.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BranchContentDiscoverer.h" />
@@ -155,21 +167,25 @@ SOFTWARE.
     <source-file src="src/ios/dependencies/Branch-SDK/BranchContentDiscoveryManifest.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BranchContentPathProperties.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BranchContentPathProperties.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BranchCrossPlatformID.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BranchCrossPlatformID.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BranchCSSearchableItemAttributeSet.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BranchCSSearchableItemAttributeSet.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BranchDeepLinkingController.h" />
     <header-file src="src/ios/dependencies/Branch-SDK/BranchDelegate.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BranchDelegate.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BranchEvent.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BranchEvent.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BranchLastAttributedTouchData.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BranchLastAttributedTouchData.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BranchLinkProperties.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BranchLinkProperties.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BranchShareLink.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BranchShareLink.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BranchUniversalObject.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BranchUniversalObject.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BranchView.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BranchView.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BranchViewHandler.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BranchViewHandler.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/NSError+Branch.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/NSError+Branch.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/NSMutableDictionary+Branch.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/NSMutableDictionary+Branch.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/NSString+Branch.h" />
@@ -191,10 +207,14 @@ SOFTWARE.
 
     <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchCloseRequest.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchCloseRequest.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchCPIDRequest.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchCPIDRequest.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchInstallRequest.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchInstallRequest.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchLATDRequest.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchLATDRequest.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchLoadRewardsRequest.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchLoadRewardsRequest.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchLogoutRequest.h" />

src/android/io/branch/BranchSDK.java

@@ -40,7 +40,7 @@ static class BranchLinkProperties extends io.branch.referral.util.LinkProperties
     // Standard Debugging Variables
     private static final String LCAT = "CordovaBranchSDK";
         // todo pick up plugin version dynamically
-    private static final String BRANCH_PLUGIN_VERSION = "3.3.0";
+    private static final String BRANCH_PLUGIN_VERSION = "3.4.0";
 
     // Private Method Properties
     private ArrayList<BranchUniversalObjectWrapper> branchObjectWrappers;

src/index.js

@@ -1,7 +1,7 @@
 var exec = require("cordova/exec");
 var deviceVendor =
   typeof window.clientInformation != "undefined" &&
-  typeof window.clientInformation.vendor != "undefined"
+    typeof window.clientInformation.vendor != "undefined"
     ? window.clientInformation.vendor
     : "unknownVendor";
 
@@ -39,7 +39,7 @@ function execute(method, params) {
 
   if (method == "getStandardEvents") {
     return new Promise(function promise(resolve, reject) {
-      resolve(standardEvent);  
+      resolve(standardEvent);
     });
   }
 
@@ -125,9 +125,11 @@ Branch.prototype.delayInitToCheckForSearchAds = function delayInitToCheckForSear
 Branch.prototype.setAppleSearchAdsDebugMode = function setAppleSearchAdsDebugMode(
   isEnabled
 ) {
-  var value = typeof isEnabled !== "boolean" ? false : isEnabled;
-
-  return execute("setAppleSearchAdsDebugMode", [value]);
+  // This function no longer exists in the SDK but we don't want
+  // to break any apps still using the 3.x releases.
+  return new Promise(function promise(resolve, reject) {
+    resolve(false);
+  });
 };
 
 Branch.prototype.getFirstReferringParams = function getFirstReferringParams() {

src/ios/AppDelegate+BranchSdk.m

@@ -8,6 +8,9 @@
 #import <Branch/Branch.h>
 #endif
 
+// Provides Ionic Capacitor compatibility
+#import <Cordova/CDVPlugin.h>
+
 @interface AppDelegate (BranchSDK)
 
 - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray * _Nullable))restorationHandler;

src/ios/Branch.framework/Branch

@@ -0,0 +1 @@
+Versions/Current/Branch

src/ios/Branch.framework/Branch

@@ -0,0 +1 @@
+Versions/Current/Headers