Merge branch 'master' into release/7.1.2

Author: hborisoff

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

@@ -24,6 +24,7 @@
 import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
+import com.leanplum.actions.LeanplumActions;
 import com.leanplum.actions.internal.ActionDidExecute;
 import com.leanplum.actions.internal.ActionManagerDefinitionKt;
 import com.leanplum.actions.internal.ActionManagerTriggeringKt;
@@ -37,6 +38,7 @@
 import com.leanplum.internal.JsonConverter;
 import com.leanplum.internal.LeanplumInternal;
 import com.leanplum.internal.Log;
+import com.leanplum.internal.OperationQueue;
 import com.leanplum.internal.VarCache;
 
 import org.json.JSONException;
@@ -386,7 +388,15 @@ private void performChainedAction(String name, Map<String, Object> args) {
           if (success) {
             executeChainedMessage(chainedMessageId, name);
           }
-          ActionManager.getInstance().setPaused(previousPauseState); // will resume queue
+          if (LeanplumActions.getUseWorkerThreadForDecisionHandlers()) {
+            OperationQueue.sharedInstance().addActionOperation(() -> {
+              OperationQueue.sharedInstance().addUiOperation(() -> {
+                ActionManager.getInstance().setPaused(previousPauseState); // will resume queue
+              });
+            });
+          } else {
+            ActionManager.getInstance().setPaused(previousPauseState); // will resume queue
+          }
         });
       } else {
         executeChainedMessage(chainedMessageId, name);

AndroidSDKCore/src/main/java/com/leanplum/actions/internal/ActionManagerTriggering.kt

@@ -64,16 +64,23 @@ private fun ActionManager.triggerImpl(
 
   // By default, add only one message to queue if `prioritizeMessages` is not implemented
   // This ensures backwards compatibility
+  Log.d("[ActionManager][${Util.getThread()}]: will call prioritizeMessages if controller is available")
   val orderedContexts =
     messageDisplayController?.prioritizeMessages(contexts, trigger) ?: listOf(contexts.first())
 
   val actions: List<Action> = orderedContexts.map { context -> Action.create(context) }
 
-  Log.d("[ActionManager][${Util.getThread()}]: triggering with priority: ${priority.name} and actions: $orderedContexts")
-
-  when (priority) {
-    Priority.HIGH -> insertActions(actions)
-    Priority.DEFAULT -> appendActions(actions)
+  val triggerOperation = {
+    Log.d("[ActionManager][${Util.getThread()}]: triggering with priority: ${priority.name} and actions: $orderedContexts")
+    when (priority) {
+      Priority.HIGH -> insertActions(actions)
+      Priority.DEFAULT -> appendActions(actions)
+    }
+  }
+  if (LeanplumActions.useWorkerThreadForDecisionHandlers) {
+    OperationQueue.sharedInstance().addUiOperation(triggerOperation) // synchronizing push and pop with UI thread
+  } else {
+    triggerOperation.invoke()
   }
 }