@iternio/react-native-auto-play 0.3.5 → 0.3.6

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/AndroidAutoScreen.kt

@@ -9,6 +9,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
 import com.facebook.react.bridge.UiThreadUtil
+import java.util.concurrent.ConcurrentHashMap
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.template.AndroidAutoTemplate
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.template.GridTemplate
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.template.InformationTemplate
@@ -117,15 +118,18 @@ class AndroidAutoScreen(
     companion object {
         const val TAG = "AndroidAutoScreen"
 
-        private val screens = mutableMapOf<String, AndroidAutoScreen>()
+        private val screens = ConcurrentHashMap<String, AndroidAutoScreen>()
 
         fun getScreen(marker: String): AndroidAutoScreen? {
             return screens[marker]
         }
 
         fun getScreenManager(): ScreenManager? {
-            return screens[AndroidAutoSession.ROOT_SESSION]?.screenManager
-        }
+            val clusterSessions = AndroidAutoSession.getClusterSessions().toSet()
+            return screens.entries
+                .firstOrNull { !clusterSessions.contains(it.key) }
+                ?.value?.screenManager
+         }
 
         fun invalidateScreens() {
             for (screen in screens) {
@@ -143,4 +147,4 @@ class AndroidAutoScreen(
             }
         }
     }
-}
+}

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/AndroidAutoSession.kt

@@ -23,6 +23,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.util.UUID
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
 
 class AndroidAutoSession(sessionInfo: SessionInfo, private val reactApplication: ReactApplication) :
     Session() {
@@ -246,9 +248,9 @@ class AndroidAutoSession(sessionInfo: SessionInfo, private val reactApplication:
         const val ROOT_SESSION = "AutoPlayRoot"
 
         private lateinit var reactContext: ReactContext
-        private val sessions = mutableMapOf<String, ScreenContext>()
+        private val sessions = ConcurrentHashMap<String, ScreenContext>()
 
-        private val clusterSessions = mutableListOf<String>()
+        private val clusterSessions = CopyOnWriteArrayList<String>()
 
         fun getIsConnected(): Boolean {
             return sessions.containsKey(ROOT_SESSION)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iternio/react-native-auto-play",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "Android Auto and Apple CarPlay for react-native",
   "main": "lib/index",
   "module": "lib/index",