Merge pull request #628 from BranchMetrics/staging

Release 4.1.3

Author: bklastaitis-branch

package.json

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

src/android/io/branch/BranchSDK.java

@@ -45,16 +45,14 @@ 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 = "4.1.2";
+    private static final String BRANCH_PLUGIN_VERSION = "4.1.3";
 
     // Private Method Properties
     private ArrayList<BranchUniversalObjectWrapper> branchObjectWrappers;
     private Activity activity;
     private Branch instance;
     private String deepLinkUrl;
 
-    private SessionListener sessionListener;
-
     /**
      * Class Constructor
      */
@@ -87,8 +85,6 @@ protected void pluginInitialize() {
     public void onNewIntent(Intent intent) {
         intent.putExtra("branch_force_new_session", true);
         this.activity.setIntent(intent);
-
-        this.reInitSession();
     }
 
     /**
@@ -298,17 +294,7 @@ private void initSession(CallbackContext callbackContext) {
             this.deepLinkUrl = data.toString();
         }
 
-        this.sessionListener = new SessionListener(callbackContext);
-        this.instance.initSession(this.sessionListener, data, activity);
-    }
-
-    private void reInitSession() {
-        if (this.sessionListener == null) {
-            return;
-        }
-
-        this.activity = this.cordova.getActivity();
-        this.instance.reInitSession(this.activity, this.sessionListener);
+        this.instance.initSession(new SessionListener(callbackContext), data, activity);
     }
 
     /**

src/ios/BranchSDK.m

@@ -1,6 +1,6 @@
 #import "BranchSDK.h"
 
-NSString * const pluginVersion = @"4.1.2";
+NSString * const pluginVersion = @"4.1.3";
 
 @interface BranchSDK()
 

src/scripts/android/updateAndroidManifest.js

@@ -16,7 +16,7 @@
 
     // update manifest
     manifest.file = updateBranchMetaData(manifest.file, preferences);
-    manifest.file = updateBranchReferrerTracking(manifest.file);
+    manifest.file = removeDeprecatedInstalReferrerBroadcastReceiver(manifest.file);
     manifest.file = updateLaunchOptionToSingleTask(
       manifest.file,
       manifest.mainActivityIndex
@@ -111,41 +111,12 @@
     return manifest;
   }
 
-  // adds to <application> for install referrer tracking (optional)
-  //    <receiver android:name="io.branch.referral.InstallListener" android:exported="true">
-  //       <intent-filter>
-  //           <action android:name="com.android.vending.INSTALL_REFERRER" />
-  //       </intent-filter>
-  //    </receiver>
-  function updateBranchReferrerTracking(manifest) {
-    let receivers = manifest.manifest.application[0].receiver || [];
+  function removeDeprecatedInstalReferrerBroadcastReceiver(manifest) { 
+    let receivers = manifest.manifest.application[0].receiver || [];  
     const androidName = "io.branch.referral.InstallListener";
+    manifest.manifest.application[0].receiver = removeBasedOnAndroidName(receivers, androidName);
 
-    // remove old
-    receivers = removeBasedOnAndroidName(receivers, androidName);
-
-    // add new
-    manifest.manifest.application[0].receiver = receivers.concat([
-      {
-        $: {
-          "android:name": androidName,
-          "android:exported": true
-        },
-        "intent-filter": [
-          {
-            action: [
-              {
-                $: {
-                  "android:name": "com.android.vending.INSTALL_REFERRER"
-                }
-              }
-            ]
-          }
-        ]
-      }
-    ]);
-
-    return manifest;
+    return manifest;  
   }
 
   // adds to main <activity>: