diff --git a/RondoApp/build.gradle b/RondoApp/build.gradle index 1e0dd8d..a4f0e1d 100644 --- a/RondoApp/build.gradle +++ b/RondoApp/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'realm-android' apply plugin: 'com.google.gms.google-services' apply plugin: 'com.huawei.agconnect' -def LEANPLUM_SDK_VERSION = System.getenv("LEANPLUM_SDK_VERSION") ?: "7.1.1" +def LEANPLUM_SDK_VERSION = System.getenv("LEANPLUM_SDK_VERSION") ?: "7.1.2-beta1" def LEANPLUM_CT_SDK_VERSION = System.getenv("LEANPLUM_CT_SDK_VERSION") ?: "4.7.4" ext { diff --git a/RondoApp/src/main/java/com/leanplum/rondo/MessagesActivity.java b/RondoApp/src/main/java/com/leanplum/rondo/MessagesActivity.java index c41ba37..8b51634 100644 --- a/RondoApp/src/main/java/com/leanplum/rondo/MessagesActivity.java +++ b/RondoApp/src/main/java/com/leanplum/rondo/MessagesActivity.java @@ -29,7 +29,7 @@ protected void onCreate(Bundle savedInstanceState) { final ListView listview = findViewById(R.id.listview); String[] values = new String[] { "alert", "centerPopup", "confirm", - "interstitial", "richInterstitial", "webInterstitial", "banner", + "interstitial", "richInterstitial", "imageInterstitial", "webInterstitial", "banner", LOG_IMPRESSIONS, LOG_TRIGGERS}; final ArrayList list = new ArrayList(); diff --git a/RondoApp/src/main/java/com/leanplum/rondo/QueueActivity.kt b/RondoApp/src/main/java/com/leanplum/rondo/QueueActivity.kt index 01598a5..9012aac 100644 --- a/RondoApp/src/main/java/com/leanplum/rondo/QueueActivity.kt +++ b/RondoApp/src/main/java/com/leanplum/rondo/QueueActivity.kt @@ -27,6 +27,7 @@ class QueueActivity : AppCompatActivity() { } private fun initCheckBoxes() { + asyncHandlersView().isChecked = LeanplumActions.useWorkerThreadForDecisionHandlers pauseQueueView().isChecked = LeanplumActions.isQueuePaused() disableQueueView().isChecked = !LeanplumActions.isQueueEnabled() dismissOnPushOpenedView().isChecked = ActionManager.getInstance().dismissOnPushOpened @@ -124,6 +125,10 @@ class QueueActivity : AppCompatActivity() { val checked: Boolean = (view as CompoundButton).isChecked when (view) { + asyncHandlersView() -> { + LeanplumActions.useWorkerThreadForDecisionHandlers = checked + initCheckBoxes() + } pauseQueueView() -> { LeanplumActions.setQueuePaused(checked) initCheckBoxes() @@ -148,6 +153,7 @@ class QueueActivity : AppCompatActivity() { } } + fun asyncHandlersView() = findViewById(R.id.asyncHandlers) fun pauseQueueView() = findViewById(R.id.pauseQueue) fun disableQueueView() = findViewById(R.id.disableQueue) fun dismissOnPushOpenedView() = findViewById(R.id.dismissOnPushOpened) diff --git a/RondoApp/src/main/java/com/leanplum/rondo/QueueActivityModel.kt b/RondoApp/src/main/java/com/leanplum/rondo/QueueActivityModel.kt index e9e97ab..1f6451e 100644 --- a/RondoApp/src/main/java/com/leanplum/rondo/QueueActivityModel.kt +++ b/RondoApp/src/main/java/com/leanplum/rondo/QueueActivityModel.kt @@ -6,8 +6,9 @@ import com.leanplum.actions.MessageDisplayChoice import com.leanplum.actions.MessageDisplayController import com.leanplum.actions.MessageDisplayListener import com.leanplum.actions.internal.ActionsTrigger -import com.leanplum.actions.internal.triggerDelayedMessages import com.leanplum.internal.ActionManager +import com.leanplum.internal.Log +import com.leanplum.internal.Util import org.json.JSONArray import org.json.JSONObject @@ -19,7 +20,10 @@ object MessageDisplayControllerObject : MessageDisplayController { var displayChoice: MessageDisplayChoice? = null var prioritizationChoice: PrioritizationType? = null - override fun shouldDisplayMessage(action: ActionContext): MessageDisplayChoice? = displayChoice + override fun shouldDisplayMessage(action: ActionContext): MessageDisplayChoice? = + displayChoice.also { + Log.d("ShouldDisplayMessage running on main thread: ${Util.isMainThread()}") + } override fun prioritizeMessages( actions: List, @@ -28,6 +32,8 @@ object MessageDisplayControllerObject : MessageDisplayController { PrioritizationType.ONLY_FIRST -> listOf(actions.first()) PrioritizationType.ALL_REVERSED -> actions.reversed() else -> actions + }.also { + Log.d("MessagePrioritization running on main thread: ${Util.isMainThread()}") } } @@ -41,18 +47,21 @@ object MessageDisplayListenerObject : MessageDisplayListener { if (trackDisplayEvents) { trackedEventsJson.addAction(action, "onMessageDisplayed") } + Log.d("onMessageDisplayed running on main thread: ${Util.isMainThread()}") } override fun onMessageDismissed(action: ActionContext) { if (trackDismissEvents) { trackedEventsJson.addAction(action, "onMessageDismissed") } + Log.d("onMessageDismissed running on main thread: ${Util.isMainThread()}") } override fun onActionExecuted(name: String, action: ActionContext) { if (trackExecuteEvents) { trackedEventsJson.addAction(action, "onActionExecuted") } + Log.d("onActionExecuted running on main thread: ${Util.isMainThread()}") } } diff --git a/RondoApp/src/main/res/layout/activity_queue.xml b/RondoApp/src/main/res/layout/activity_queue.xml index cedbdea..d5852cc 100644 --- a/RondoApp/src/main/res/layout/activity_queue.xml +++ b/RondoApp/src/main/res/layout/activity_queue.xml @@ -10,6 +10,12 @@ android:layout_height="wrap_content" android:orientation="vertical"> +