Merge pull request #107 from superwall/develop

1.1.4
superwall · May 9, 2024 · a934038 · a934038
2 parents b80c042 + 2777268
commit a934038
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 The changelog for `Superwall`. Also see the [releases](https://github.com/superwall/Superwall-Android/releases) on GitHub.
 
+## 1.1.4
+
+### Fixes
+
+- Fixes thread safety crash when multiple threads attempted to initialize the `JavaScriptSandbox` 
+internally.
+
 ## 1.1.3
 
 ### Enhancements

diff --git a/superwall/build.gradle.kts b/superwall/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
     id("signing")
 }
 
-version = "1.1.3"
+version = "1.1.4"
 
 android {
     compileSdk = 33

diff --git a/...superwall/sdk/paywall/presentation/rule_logic/expression_evaluator/ExpressionEvaluator.kt b/...superwall/sdk/paywall/presentation/rule_logic/expression_evaluator/ExpressionEvaluator.kt
@@ -22,6 +22,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.guava.await
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.newSingleThreadContext
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import org.json.JSONObject
 
@@ -38,6 +40,7 @@ class ExpressionEvaluator(
     private val factory: RuleAttributesFactory
 ): ExpressionEvaluating {
     private val singleThreadContext = newSingleThreadContext(name = "ExpressionEvaluator")
+    private val mutex = Mutex()
 
     companion object {
         private var jsSandbox: JavaScriptSandbox? = null
@@ -47,8 +50,10 @@ class ExpressionEvaluator(
     init {
         if (JavaScriptSandbox.isSupported()) {
             CoroutineScope(singleThreadContext).launch {
-                if (jsSandbox == null) {
-                    jsSandbox = JavaScriptSandbox.createConnectedInstanceAsync(context).await()
+                mutex.withLock {
+                    if (jsSandbox == null) {
+                        jsSandbox = JavaScriptSandbox.createConnectedInstanceAsync(context).await()
+                    }
                 }
             }
         } else {