Merge branch 'master' into release/5.3.3

Author: e7mac

AndroidSDKCore/src/main/java/com/leanplum/Leanplum.java

@@ -501,15 +501,12 @@ static synchronized void start(final Context context, final String userId,
       final Map<String, ?> attributes, StartCallback response, final Boolean isBackground) {
     try {
       OsHandler.getInstance();
-
-      if (context instanceof Activity) {
-        LeanplumActivityHelper.currentActivity = (Activity) context;
-      }
+      LeanplumActivityHelper.setCurrentActivity(context);
 
       // Detect if app is in background automatically if isBackground is not set.
       final boolean actuallyInBackground;
       if (isBackground == null) {
-        actuallyInBackground = LeanplumActivityHelper.currentActivity == null ||
+        actuallyInBackground = LeanplumActivityHelper.getCurrentActivity() == null ||
             LeanplumActivityHelper.isActivityPaused();
       } else {
         actuallyInBackground = isBackground;
@@ -858,9 +855,9 @@ protected Void doInBackground(Void... params) {
             if (Constants.isDevelopmentModeEnabled) {
 
               final Context currentContext = (
-                  LeanplumActivityHelper.currentActivity != context &&
-                      LeanplumActivityHelper.currentActivity != null) ?
-                  LeanplumActivityHelper.currentActivity
+                  LeanplumActivityHelper.getCurrentActivity() != context &&
+                      LeanplumActivityHelper.getCurrentActivity() != null) ?
+                  LeanplumActivityHelper.getCurrentActivity()
                   : context;
 
               // Register device.

AndroidSDKCore/src/main/java/com/leanplum/LeanplumActivityHelper.java

@@ -24,6 +24,7 @@
 import android.app.Activity;
 import android.app.Application;
 import android.app.Application.ActivityLifecycleCallbacks;
+import android.content.Context;
 import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
@@ -60,7 +61,7 @@ public class LeanplumActivityHelper {
    */
   private static boolean registeredCallbacks;
 
-  static Activity currentActivity;
+  private static Activity currentActivity;
 
   private final Activity activity;
   private LeanplumResources res;
@@ -80,6 +81,18 @@ public LeanplumActivityHelper(Activity activity) {
     Parser.parseVariables(activity);
   }
 
+  /**
+   * Set activity and run pending actions
+   */
+  public static void setCurrentActivity(Context context) {
+    if (context instanceof Activity) {
+      currentActivity = (Activity) context;
+
+      // run pending actions if any upon start
+      LeanplumInternal.addStartIssuedHandler(runPendingActionsRunnable);
+    }
+  }
+
   /**
    * Retrieves the currently active activity.
    */
@@ -158,6 +171,8 @@ public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
 
     });
     registeredCallbacks = true;
+    // run pending actions if any upon start
+    LeanplumInternal.addStartIssuedHandler(runPendingActionsRunnable);
   }
 
   public LeanplumResources getLeanplumResources() {

AndroidSDKCore/src/main/java/com/leanplum/internal/RequestOld.java

@@ -477,6 +477,12 @@ private void sendNow() {
     if (Constants.isTestMode) {
       return;
     }
+
+    // always save request first
+    sendEventually();
+
+    // in case appId and accessKey are set later, request is already saved and will be
+    // sent when variables are set.
     if (appId == null) {
       Log.e("Cannot send request. appId is not set.");
       return;
@@ -486,9 +492,6 @@ private void sendNow() {
       return;
     }
 
-    // We need to save request first.
-    sendEventually();
-
     Leanplum.countAggregator().incrementCount("send_now");
 
     // Try to send all saved requests.

AndroidSDKPush/src/main/java/com/leanplum/LeanplumPushService.java

@@ -33,7 +33,6 @@
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.core.app.NotificationCompat;
 
 import com.leanplum.callbacks.VariablesChangedCallback;
 import com.leanplum.internal.ActionManager;
@@ -58,6 +57,9 @@
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import androidx.core.app.NotificationCompat;
 
 /**
  * Leanplum push notification service class, handling initialization, opening, showing, integration
@@ -239,7 +241,7 @@ private static String getMessageId(Bundle message) {
   }
 
   static void handleNotification(final Context context, final Bundle message) {
-    if (LeanplumActivityHelper.currentActivity != null
+    if (LeanplumActivityHelper.getCurrentActivity() != null
         && !LeanplumActivityHelper.isActivityPaused
         && (message.containsKey(Keys.PUSH_MESSAGE_ID_MUTE_WITH_ACTION)
         || message.containsKey(Keys.PUSH_MESSAGE_ID_MUTE))) {
@@ -369,30 +371,26 @@ private static void showNotification(Context context, final Bundle message) {
       if (ActionContext.shouldForceContentUpdateForChainedMessage(
           JsonConverter.fromJson(message.getString(Keys.PUSH_MESSAGE_ACTION)))) {
 
+        // try to fetch referenced chained message and wait a bit for result
         final CountDownLatch countDownLatch = new CountDownLatch(1);
-
-        final int currentNotificationId = notificationId;
-        final Notification.Builder currentNotificationBuilder = notificationBuilder;
-        final NotificationCompat.Builder currentNotificationCompatBuilder = notificationCompatBuilder;
         Leanplum.forceContentUpdate(new VariablesChangedCallback() {
           @Override
           public void variablesChanged() {
-            if (currentNotificationBuilder != null) {
-              notificationManager.notify(currentNotificationId, currentNotificationBuilder.build());
-            } else {
-              notificationManager.notify(currentNotificationId, currentNotificationCompatBuilder.build());
-            }
             countDownLatch.countDown();
           }
         });
-        countDownLatch.await();
+
+        // continue after 3 seconds and post the notification
+        countDownLatch.await(3, TimeUnit.SECONDS);
+      }
+
+      // always post notification
+      if (notificationBuilder != null) {
+        notificationManager.notify(notificationId, notificationBuilder.build());
       } else {
-        if (notificationBuilder != null) {
-          notificationManager.notify(notificationId, notificationBuilder.build());
-        } else {
-          notificationManager.notify(notificationId, notificationCompatBuilder.build());
-        }
+        notificationManager.notify(notificationId, notificationCompatBuilder.build());
       }
+
     } catch (NullPointerException e) {
       Log.e("Unable to show push notification.", e);
     } catch (Throwable t) {
@@ -418,7 +416,7 @@ static void openNotification(Context context, Intent intent) {
     // Start activity.
     Class<? extends Activity> callbackClass = LeanplumPushService.getCallbackClass();
     boolean shouldStartActivity = true;
-    Activity currentActivity = LeanplumActivityHelper.currentActivity;
+    Activity currentActivity = LeanplumActivityHelper.getCurrentActivity();
     if (currentActivity != null && !LeanplumActivityHelper.isActivityPaused) {
       if (callbackClass == null) {
         shouldStartActivity = false;

AndroidSDKTests/src/test/java/com/leanplum/LeanplumActivityHelperTest.java

@@ -56,7 +56,7 @@ public void run() {
     assertTrue(isRunnableQueued(runnable));
 
     FakeActivity fakeActivity = new FakeActivity();
-    LeanplumActivityHelper.currentActivity = fakeActivity;
+    LeanplumActivityHelper.setCurrentActivity(fakeActivity);
 
     // Test activity is finishing.
     final CountDownLatch latch2 = new CountDownLatch(1);