Merge pull request #692 from BranchMetrics/Staging

Merge Staging to Master for release v3.1.1

Author: csalmi-branch

Branch-SDK/src/io/branch/referral/Branch.java

@@ -338,7 +338,10 @@ private enum INTENT_STATE {
         PENDING,
         READY
     }
-    
+
+    // INTENG-4676 Save the last callback
+    private WeakReference<BranchReferralInitListener> deferredInitListener_;
+
     private INTENT_STATE intentState_ = INTENT_STATE.PENDING;
     private boolean handleDelayedNewIntents_ = false;
 
@@ -350,7 +353,7 @@ private enum INTENT_STATE {
 
     /* The current activity instance for the application.*/
     WeakReference<Activity> currentActivityReference_;
-    
+
     /* Specifies the choice of user for isReferrable setting. used to determine the link click is referrable or not. See getAutoSession for usage */
     private enum CUSTOM_REFERRABLE_SETTINGS {
         USE_DEFAULT, REFERRABLE, NON_REFERRABLE
@@ -1338,6 +1341,9 @@ private void initUserSessionInternal(BranchReferralInitListener callback, Activi
         if (activity != null) {
             currentActivityReference_ = new WeakReference<>(activity);
         }
+        if (callback != null) {
+            deferredInitListener_ = new WeakReference<BranchReferralInitListener>(callback);
+        }
         //If already initialised
         if ((hasUser() && hasSession() && initState_ == SESSION_STATE.INITIALISED)) {
             reportInitSession(callback);
@@ -2720,8 +2726,12 @@ private void startSession(Activity activity) {
         if (activity.getIntent() != null) {
             intentData = activity.getIntent().getData();
         }
+        BranchReferralInitListener deferredCallback = null;
+        if (deferredInitListener_ != null) {
+            deferredCallback = deferredInitListener_.get();
+        }
         isInitReportedThroughCallBack = false;
-        initSessionWithData(intentData, activity); // indicate  starting of session.
+        initSession(deferredCallback, intentData, activity); // indicate  starting of session.
     }
 
     /*
@@ -2738,12 +2748,17 @@ private boolean checkIntentForSessionRestart(Intent intent) {
         boolean isRestartSessionRequested = false;
         if (intent != null) {
             try {
-                isRestartSessionRequested = intent.getBooleanExtra(Defines.Jsonkey.ForceNewBranchSession.getKey(), false);
-            } catch (Throwable ignore) {
-            }
-            if (isRestartSessionRequested) {
-                intent.putExtra(Defines.Jsonkey.ForceNewBranchSession.getKey(), false);
-            }
+                // Force new session parameters
+                if (intent.getBooleanExtra(Defines.Jsonkey.ForceNewBranchSession.getKey(), false)) {
+                    isRestartSessionRequested = true;
+                    intent.putExtra(Defines.Jsonkey.ForceNewBranchSession.getKey(), false);
+                    // Also check if there is a new, unconsumed push notification intent which would indicate it's coming
+                    // from foreground
+                } else if (intent.getStringExtra(Defines.Jsonkey.AndroidPushNotificationKey.getKey()) != null &&
+                    !intent.getBooleanExtra(Defines.Jsonkey.BranchLinkUsed.getKey(), false)) {
+                    isRestartSessionRequested = true;
+                }
+            } catch (Throwable ignore) { }
         }
         return isRestartSessionRequested;
     }

ChangeLog.md

@@ -1,4 +1,7 @@
 # Branch Android SDK change log
+- v3.1.1
+  * Added support for push notifications while the application is in the foreground
+
 - v3.1.0
   * Fixed a synchronization issue around the event queue saving preferences while in a synchronized block.
   * Added new standard events for parity with Tune.

gradle.properties

@@ -1,5 +1,5 @@
-VERSION_NAME=3.1.0
-VERSION_CODE=030100
+VERSION_NAME=3.1.1
+VERSION_CODE=030101
 GROUP=io.branch.sdk.android
 
 POM_DESCRIPTION=Use the Branch SDK (branch.io) to create and power the links that point back to your apps for all of these things and more. Branch makes it incredibly simple to create powerful deep links that can pass data across app install and open while handling all edge cases (using on desktop vs. mobile vs. already having the app installed, etc). Best of all, it is really simple to start using the links for your own app: only 2 lines of code to register the deep link router and one more line of code to create the links with custom data.