Fix concurrency exception for the action definitions. (#534)

Author: hborisoff

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

@@ -64,37 +64,51 @@ data class Definitions(
   val actionDefinitions: MutableList<ActionDefinition> = mutableListOf(),
   var devModeActionDefinitionsFromServer: Map<String, Any?>? = null
 ) {
+  @Synchronized
   fun findDefinition(definitionName: String?): ActionDefinition? {
     return actionDefinitions.firstOrNull { it.name == definitionName }
   }
+
+  @Synchronized
+  fun addDefinition(definition: ActionDefinition) {
+    val idx = actionDefinitions.indexOfFirst { it.name == definition.name }
+    if (idx >= 0) {
+      actionDefinitions[idx] = definition
+    } else {
+      actionDefinitions.add(definition)
+    }
+  }
+
+  @Synchronized
+  fun getActionDefinitionMaps(): Map<String, Any?> {
+    val result: MutableMap<String, Map<String, Any?>> = mutableMapOf()
+    actionDefinitions.forEach {
+      result[it.name] = it.definitionMap
+    }
+    return result
+  }
+
+  @Synchronized
+  fun clear() {
+    actionDefinitions.clear();
+  }
 }
 
 fun ActionManager.getActionDefinitionMap(actionName: String?): Map<String, Any?>? {
   val defMap = definitions.findDefinition(actionName)?.definitionMap
   return defMap
 }
 
-fun ActionManager.getActionDefinitionMaps(): Map<String, Any?> {
-  val result: MutableMap<String, Map<String, Any?>> = mutableMapOf()
-  definitions.actionDefinitions.forEach {
-    result.put(it.name, it.definitionMap)
-  }
-  return result
-}
-
 fun ActionManager.defineAction(definition: ActionDefinition) {
-  with (definitions.actionDefinitions) {
-    firstOrNull { it.name == definition.name }?.also { remove(it) }
-    add(definition)
-  }
+  definitions.addDefinition(definition)
 }
 
 fun ActionManager.setDevModeActionDefinitionsFromServer(serverDefs: Map<String, Any?>?) {
   definitions.devModeActionDefinitionsFromServer = serverDefs
 }
 
 fun ActionManager.areLocalAndServerDefinitionsEqual(): Boolean {
-  val localDefinitions = getActionDefinitionMaps()
+  val localDefinitions = definitions.getActionDefinitionMaps()
   val serverDefinitions = definitions.devModeActionDefinitionsFromServer
   return areActionDefinitionsEqual(localDefinitions, serverDefinitions)
 }

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

@@ -577,7 +577,7 @@ public static void applyVariableDiffs(
         Map<String, Object> actionArgs = CollectionUtil.uncheckedCast(messageConfig.get(Constants
             .Keys.VARS));
         Map<String, Object> actionDefinitions =
-            ActionManagerDefinitionKt.getActionDefinitionMaps(ActionManager.getInstance());
+            ActionManager.getInstance().getDefinitions().getActionDefinitionMaps();
         Map<String, Object> defaultArgs = Util.multiIndex(actionDefinitions,
             newConfig.get(Constants.Params.ACTION), "values");
         Map<String, Object> vars = CollectionUtil.uncheckedCast(mergeHelper(defaultArgs,
@@ -666,7 +666,7 @@ private static boolean sendContentIfChanged(boolean variables, boolean actions)
       changed = true;
     }
     Map<String, Object> actionDefinitions =
-        ActionManagerDefinitionKt.getActionDefinitionMaps(ActionManager.getInstance());
+        ActionManager.getInstance().getDefinitions().getActionDefinitionMaps();
 
     boolean areLocalAndServerDefinitionsEqual =
         ActionManagerDefinitionKt.areLocalAndServerDefinitionsEqual(ActionManager.getInstance());
@@ -901,7 +901,7 @@ public static void reset() {
     fileStreams.clear();
     valuesFromClient.clear();
     defaultKinds.clear();
-    ActionManager.getInstance().getDefinitions().getActionDefinitions().clear();
+    ActionManager.getInstance().getDefinitions().clear();
     diffs.clear();
     messageDiffs.clear();
     regions.clear();

AndroidSDKTests/src/test/java/com/leanplum/actions/internal/ActionManagerExecutionTest.kt

@@ -41,7 +41,7 @@ class ActionManagerExecutionTest : AbstractTest() {
     ActionManager.getInstance().currentAction = null
     ActionManager.getInstance().messageDisplayController = null
     ActionManager.getInstance().messageDisplayListener = null
-    ActionManager.getInstance().definitions.actionDefinitions.clear()
+    ActionManager.getInstance().definitions.clear()
     ActionManager.getInstance().scheduler = ActionScheduler()
     LeanplumActions.setDismissOnPushOpened(true)
   }