Merge pull request #14 from BranchMetrics/SDK-874/broken-auto-init

Sdk 874/broken auto init

Author: bklastaitis-branch

.gitignore

@@ -9,3 +9,6 @@
 gradle/
 gradlew
 gradlew.bat
+
+AdobeBranchExample/.idea
+AdobeBranchExample/local.properties

AdobeBranchExample/src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@
         <activity
             android:name=".ProductActivity"
             android:label="@string/app_name"
+            android:launchMode="singleTask"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -25,9 +26,7 @@
 
             <!-- Branch URI Scheme -->
             <intent-filter>
-                <data
-                    android:host="open"
-                    android:scheme="adobe-branch" />
+                <data android:scheme="adobe-branch" />
 
                 <action android:name="android.intent.action.VIEW" />
 

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

@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListAdapter;
@@ -57,13 +57,14 @@ public void onClick(View view) {
     @Override
     protected void onStart() {
         super.onStart();
-        initBranchSession();
+        AdobeBranch.initSession(branchInitSessionCallback, getIntent().getData(), this);
     }
 
     @Override
     public void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         this.setIntent(intent);
+        AdobeBranch.reInitSession(this, branchInitSessionCallback);
     }
 
     private void initList() {
@@ -88,16 +89,16 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
         }
     }
 
-    private void initBranchSession() {
-        AdobeBranch.initSession(new Branch.BranchReferralInitListener() {
+    private Branch.BranchReferralInitListener branchInitSessionCallback = new Branch.BranchReferralInitListener() {
             @Override
             public void onInitFinished(JSONObject referringParams, BranchError error) {
+                PrefHelper.Debug("initBranchSession, referringParams = " + referringParams + ", error = " + error);
                 if (referringParams == null) return;
                 try {
                     // You would think that there was an easier way to figure this out than looking at LinkProperties code
                     if (referringParams.has("+clicked_branch_link") && referringParams.getBoolean("+clicked_branch_link")) {
                         String idString = referringParams.optString(SwagActivity.SWAG_ID);
-                        if (idString != null) {
+                        if (!TextUtils.isEmpty(idString)) {
                             int swagId = Integer.parseInt(idString);
 
                             // Launch the Swag Activity
@@ -111,8 +112,8 @@ public void onInitFinished(JSONObject referringParams, BranchError error) {
                     // internal error; id is not a number.
                 }
             }
-        }, getIntent().getData(), this);
-    }
+        };
+
 
     private void shareProduct() {
         BranchUniversalObject buo = new BranchUniversalObject();

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.
@@ -43,8 +44,6 @@ public class AdobeBranch {
      * @return An initialized {@link Branch} object
      */
     public static Branch getAutoInstance(@NonNull Context context) {
-        BranchUtil.setPluginType(BranchUtil.PluginType.AdobeLaunch);
-        BranchUtil.setPluginVersion(BuildConfig.VERSION_NAME);
         return Branch.getAutoInstance(context);
     }
 
@@ -80,11 +79,13 @@ public static boolean initSession(Branch.BranchReferralInitListener callback, Ur
     public static boolean initSession(final Branch.BranchReferralInitListener callback, final Uri data, final Activity activity, int delay) {
         final Branch branch = Branch.getInstance();
         if (branch != null) {
+            BranchUtil.setPluginType(BranchUtil.PluginType.AdobeLaunch);// prevents early auto-initialization
             if (delay == 0) {
                 branch.initSession(callback, data, activity);
             } else {
                 new Handler().postDelayed(new Runnable() {
                     @Override public void run() {
+                        BranchUtil.setPluginType(null);// re-enables auto-initialization for when app is launched from recent apps list
                         branch.initSession(callback, data, activity);
                     }
                 }, delay);
@@ -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.