Fix impression for embedded actions (#507)

* Fix impression for embedded actions

Bellow commits are fixing several Travis build issues:

* Trigger Build

* Debug failing build

* Debug build

* Trying to fix build

* Try temporary fix for the build

* Print debug log

* Try fix build

* Fix unit tests because of robolectric network issues

* Try fix travis

* List all jdks

* Pick open jdk

* Shorten logs

* Print logs

* Add m2 caching

* Remove detailed logs

* Enable all tests

* Clear travis debug

Author: hborisoff

.travis.yml

@@ -21,15 +21,27 @@ android:
   components:
     - tools
 
-jdk:
-  - oraclejdk11
+# Uncomment and remove lines in before_install when issue with JDK is resolved
+# Check thread here: https://travis-ci.community/t/installing-oraclejdk-11-failed/13050/10
+# jdk:
+  # - oraclejdk11
 
 licenses:
   - 'android-sdk-preview-license-.+'
   - 'android-sdk-license-.+'
   - 'google-gdk-license-.+'
 
+cache:
+  directories:
+  # cache is used for the Robolectric dependencies that are frequently failing to download
+  - .autoconf
+  - $HOME/.m2
+
 before_install:
+  - curl -s "https://get.sdkman.io" | bash
+  - source "$HOME/.sdkman/bin/sdkman-init.sh"
+  - sdk install java 11.0.12-open
+  - sdk use java 11.0.12-open
   # Install cmdline-tools (older tools doesn't support Java 11)
   - wget -q "https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip" -O android-commandline-tools-linux.zip
   - mkdir -p ${ANDROID_HOME}/cmdline-tools

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

@@ -197,19 +197,28 @@ private fun ActionManager.performActionsImpl() {
 private fun ActionManager.recordImpression(action: Action) {
   try {
     val ctx = action.context
-    if (action.actionType == Action.ActionType.CHAINED) {
-      // We do not want to count occurrences for action kind, because in multi message
-      // campaigns the Open URL action is not a message. Also if the user has defined
-      // actions of type Action we do not want to count them.
-      val actionKind = definitions.findDefinition(ctx.actionName())?.kind
-      if (actionKind == Leanplum.ACTION_KIND_ACTION) {
-        recordChainedActionImpression(ctx.messageId)
-      } else {
+    when (action.actionType) {
+
+      Action.ActionType.CHAINED -> {
+        // We do not want to count occurrences for action kind, because in multi message
+        // campaigns the Open URL action is not a message. Also if the user has defined
+        // actions of type Action we do not want to count them.
+
+        val actionKind = definitions.findDefinition(ctx.actionName())?.kind
+        if (actionKind == Leanplum.ACTION_KIND_ACTION) {
+          recordChainedActionImpression(ctx.messageId)
+        } else {
+          recordMessageImpression(ctx.messageId)
+        }
+      }
+
+      Action.ActionType.SINGLE -> {
         recordMessageImpression(ctx.messageId)
       }
 
-    } else {
-      recordMessageImpression(action.context.messageId)
+      Action.ActionType.EMBEDDED -> {
+        // do nothing
+      }
     }
   } catch (t: Throwable) {
     Log.exception(t)

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

@@ -46,7 +46,7 @@
  * @author Sayaan Saha
  */
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = VERSION_CODES.P) // temporarily fix issue with Robolectric and Android SDK 29
+@Config(sdk = 16)
 public class LeanplumInboxMessageTest {
 
   private LeanplumInboxMessage createMessageTestData(

AndroidSDKTests/src/test/java/com/leanplum/internal/JsonConverterTest.java

@@ -22,6 +22,8 @@
 
 import com.leanplum.__setup.LeanplumTestApp;
 
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -42,7 +44,7 @@
 @SuppressWarnings("unused")
 @RunWith(RobolectricTestRunner.class)
 @Config(
-    sdk = 21,
+    sdk = 16,
     application = LeanplumTestApp.class
 )
 @PowerMockIgnore({
@@ -70,9 +72,9 @@ public class JsonConverterTest {
       "\"map\":{\"a\":1,\"b\":2,\"array\":[1,2,3]},\"array\":[1,\"string\",{\"a\":\"b\"}]}";
 
   @Test
-  public void testToJson() {
+  public void testToJson() throws JSONException {
     assertNull(JsonConverter.toJson(null));
-    assertEquals(json, JsonConverter.toJson(map));
+    assertEquals(new JSONObject(json).toString(), JsonConverter.toJson(map));
   }
 
   @Test