From 3402c6d3d8c711ae0511f4c17b23a2860f54f392 Mon Sep 17 00:00:00 2001
From: emawby <emawby@gmail.com>
Date: Fri, 22 Sep 2023 15:13:42 -0700
Subject: [PATCH] Fix concurrent modification exception in Model.kt

---
 .../core/src/main/java/com/onesignal/common/modeling/Model.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/Model.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/Model.kt
index 6000a7c7d..9b4e24572 100644
--- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/Model.kt
+++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/Model.kt
@@ -5,6 +5,7 @@ import com.onesignal.common.events.IEventNotifier
 import org.json.JSONArray
 import org.json.JSONObject
 import java.math.BigDecimal
+import java.util.*
 
 /**
  * The base class for a [Model].  A model is effectively a map of data, each key in the map being
@@ -61,7 +62,7 @@ open class Model(
         get() = getStringProperty(::id.name)
         set(value) { setStringProperty(::id.name, value) }
 
-    protected val data: MutableMap<String, Any?> = mutableMapOf()
+    protected val data: MutableMap<String, Any?> = Collections.synchronizedMap(mutableMapOf())
     private val _changeNotifier = EventProducer<IModelChangedHandler>()
 
     init {