Merge pull request #617 from BranchMetrics/SDK-794/release_with_sdk_432

Sdk 794/release with sdk 432

Author: bklastaitis-branch

.gitignore

@@ -8,3 +8,5 @@ package-lock.json
 npm-debug.log*
 yarn-error.log*
 .vscode
+.idea
+src/android/.idea

plugin.xml

@@ -62,7 +62,7 @@ SOFTWARE.
     <!-- Manifest configuration is done via a js script.  We should move it to this config in the future. -->
 
     <source-file src="src/android/io/branch/BranchSDK.java" target-dir="src/io/branch" />
-    <framework src="io.branch.sdk.android:library:4.2.1"/>
+    <framework src="io.branch.sdk.android:library:4.3.2"/>
   </platform>
 
   <!-- iOS -->

src/android/io/branch/BranchSDK.java

@@ -20,6 +20,8 @@
 
 import io.branch.indexing.BranchUniversalObject;
 import io.branch.referral.Branch;
+import io.branch.referral.BranchUtil;
+import io.branch.referral.PrefHelper;
 import io.branch.referral.BranchError;
 import io.branch.referral.BranchViewHandler;
 import io.branch.referral.SharingHelper;
@@ -31,8 +33,9 @@
 import io.branch.referral.util.ProductCategory;
 import io.branch.referral.util.ShareSheetStyle;
 
-import io.branch.referral.util.BranchCrossPlatformId;
-import io.branch.referral.util.BranchLastAttributedTouchData;
+import io.branch.referral.ServerRequestGetLATD.BranchLastAttributedTouchDataListener;
+import io.branch.referral.ServerRequestGetCPID.BranchCrossPlatformIdListener;
+import io.branch.referral.util.BranchCPID;
 
 public class BranchSDK extends CordovaPlugin {
 
@@ -68,17 +71,18 @@ public BranchSDK() {
     protected void pluginInitialize() {
 
         this.activity = this.cordova.getActivity();
-
         Branch.disableInstantDeepLinking(true);
-        Branch.getAutoInstance(this.activity.getApplicationContext());
-
+        BranchUtil.setPluginType(BranchUtil.PluginType.CordovaIonic);
+        if (this.instance == null) {
+            this.instance = Branch.getAutoInstance(this.activity.getApplicationContext());
+        }
     }
 
     /**
      * Called when the activity receives a new intent.
      */
     public void onNewIntent(Intent intent) {
-
+        intent.putExtra("branch_force_new_session", true);
         this.activity.setIntent(intent);
 
         this.reInitSession();
@@ -292,7 +296,6 @@ private void initSession(CallbackContext callbackContext) {
         }
 
         this.sessionListener = new SessionListener(callbackContext);
-        this.instance = Branch.getAutoInstance(this.activity.getApplicationContext());
         this.instance.initSession(this.sessionListener, data, activity);
     }
 
@@ -613,10 +616,8 @@ private void setCookieBasedMatching(String linkDomain, CallbackContext callbackC
 
         this.activity = this.cordova.getActivity();
 
-        Branch instance = Branch.getAutoInstance(this.activity.getApplicationContext());
-
         if (linkDomain != null) {
-            instance.enableCookieBasedMatching(linkDomain);
+            Branch.enableCookieBasedMatching(linkDomain);
         }
 
         callbackContext.success("Success");
@@ -631,7 +632,7 @@ private void setCookieBasedMatching(String linkDomain, CallbackContext callbackC
      */
     private void setDebug(boolean isEnable, CallbackContext callbackContext) {
         this.activity = this.cordova.getActivity();
-        Branch.getAutoInstance(this.activity.getApplicationContext()).setDebug();
+        Branch.enableDebugMode();
         callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, isEnable));
     }
 
@@ -645,7 +646,8 @@ private void setDebug(boolean isEnable, CallbackContext callbackContext) {
      */
     private void disableTracking(boolean isEnable, CallbackContext callbackContext) {
         this.activity = this.cordova.getActivity();
-        Branch.getAutoInstance(this.activity.getApplicationContext()).disableTracking(isEnable);
+
+        this.instance.disableTracking(isEnable);
         callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, isEnable));
     }
 
@@ -892,15 +894,15 @@ public BranchUniversalObjectWrapper(BranchUniversalObject branchUniversalObj) {
     //----------- INNER CLASS LISTENERS ------------//
     //////////////////////////////////////////////////
 
-    protected class BranchCPIDListener implements BranchCrossPlatformId.BranchCrossPlatformIdListener {
+    protected class BranchCPIDListener implements BranchCrossPlatformIdListener {
         private CallbackContext _callbackContext;
 
         public BranchCPIDListener(CallbackContext callbackContext) {
             this._callbackContext = callbackContext;
         }
 
         @Override
-        public void onDataFetched(BranchCrossPlatformId.BranchCPID branchCPID, BranchError error) {
+        public void onDataFetched(BranchCPID branchCPID, BranchError error) {
             if (error != null) {
                 Log.d(LCAT, "CPID unavailable");
                 this._callbackContext.error("CPID unavailable");
@@ -925,7 +927,7 @@ public void onDataFetched(BranchCrossPlatformId.BranchCPID branchCPID, BranchErr
         }
     }
 
-    protected class BranchLATDListener implements BranchLastAttributedTouchData.BranchLastAttributedTouchDataListener {
+    protected class BranchLATDListener implements BranchLastAttributedTouchDataListener {
         private CallbackContext _callbackContext;
 
         public BranchLATDListener(CallbackContext callbackContext) {