use reInitSession from onNewIntent, so it matches core SDK. Fix intra-app linking from SomeActivity to LauncherActivity where both onNewIntent and onStart get called.

Author: bklastaitis-branch

AdobeBranchExample/src/main/java/io/branch/adobe/demo/ProductActivity.java

@@ -64,7 +64,7 @@ protected void onStart() {
     public void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         this.setIntent(intent);
-        AdobeBranch.initSession(branchInitSessionCallback, getIntent().getData(), this, 0);
+        AdobeBranch.reInitSession(this, branchInitSessionCallback);
     }
 
     private void initList() {

AdobeBranchExtension/src/main/java/io/branch/adobe/extension/AdobeBranch.java

@@ -16,6 +16,7 @@
 
 import io.branch.referral.Branch;
 import io.branch.referral.BranchUtil;
+import io.branch.referral.Defines;
 
 /**
  * AdobeBranch Extension.
@@ -94,6 +95,21 @@ public static boolean initSession(final Branch.BranchReferralInitListener callba
         return false;
     }
 
+    /**
+     * ReInitialize session. Called from onNewIntent, will only reInitialize if the intent contains a boolean extra "branch_force_new_session"=true
+     */
+    public static boolean reInitSession(@NonNull Activity activity, Branch.BranchReferralInitListener callback) {
+        Branch branch = Branch.getInstance();
+        if (branch != null && branch.reInitSession(activity, callback)) {
+            // this ensures that if user intra-app links from SomeActivity to LauncherActivity,
+            // and both, initSession and reInitSession, are used in LauncherActivity, then only the
+            // reInitSession callback returns referring params while the other one returns error, "SDK already initialized".
+            activity.getIntent().removeExtra(Defines.Jsonkey.ForceNewBranchSession.getKey());
+            return true;
+        }
+        return false;
+    }
+
     /**
      * Register a whitelist of Event Types and Event Sources to send to Branch.
      * @param additionalEvents Additional events to listen for.