@iternio/react-native-auto-play 0.3.4 → 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/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/AndroidAutoTelemetryHolder.kt

@@ -55,100 +55,60 @@ class AndroidAutoTelemetryHolder {
         }
 
     fun updateBatteryLevel(value: Float) = synchronized(lock) {
-        if (batteryLevel == value) {
-            return
-        }
-
         batteryLevel = value
         batteryLevelTimestamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
     }
 
     fun updateFuelLevel(value: Float) = synchronized(lock) {
-        if (fuelLevel == value) {
-            return
-        }
-
         fuelLevel = value
         fuelLevelTimestamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
     }
 
     fun updateRange(value: Float) = synchronized(lock) {
-        if (range == value) {
-            return
-        }
-
         range = value
         rangeTimestamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
     }
 
     fun updateSpeed(value: Float?) = synchronized(lock) {
-        if (speed == value) {
-            return
-        }
-
         speed = value
         speedTimestamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
     }
 
     fun updateOdometer(value: Float?) = synchronized(lock) {
-        if (odometer == value) {
-            return
-        }
-
         odometer = value
         odometerTimestamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
     }
 
     fun updateSelectedGear(value: Int?) = synchronized(lock) {
-        if (value == selectedGear) {
-            return
-        }
-
         selectedGear = value
         selectedGearTimestamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
     }
 
     fun updateEnvOutsideTemperature(value: Float?) = synchronized(lock) {
-        if (value == envOutsideTemperature) {
-            return
-        }
-
         envOutsideTemperature = value
         envOutsideTemperatureTimestamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
     }
 
     fun updateEvChargePortConnected(value: Boolean?) = synchronized(lock) {
-        if (value == evChargePortConnected) {
-            return
-        }
-
         evChargePortConnected = value
         evChargePortConnectedTimestamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
     }
 
     fun updateEvBatteryInstantaneousChargeRate(value: Float?) = synchronized(lock) {
-        if (value == evBatteryInstantaneousChargeRate) {
-            return
-        }
-
         evBatteryInstantaneousChargeRate = value
         evBatteryInstantaneousChargeRateTimeStamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
     }
 
     fun updateParkingBrakeOn(value: Boolean?) = synchronized(lock) {
-        if (value == parkingBrakeOn) {
-            return
-        }
-
         parkingBrakeOn = value
         parkingBrakeOnTimestamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
@@ -156,6 +116,10 @@ class AndroidAutoTelemetryHolder {
 
     fun updateBatteryLevel(levelWh: Float, capacityWh: Float) = synchronized(lock) {
         if (soe == levelWh) {
+            soeTimestamp = (System.currentTimeMillis() / 1000L).toInt()
+            batteryLevelTimestamp = soeTimestamp
+
+            isDirty = true
             return
         }
 

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

@@ -34,7 +34,10 @@ class SignInWithGoogleActivity : ComponentActivity() {
         val googleSignInClient = GoogleSignIn.getClient(
             this,
             GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-                .requestServerAuthCode(serverClientId).requestEmail().build()
+                .requestServerAuthCode(serverClientId)
+                .requestEmail()
+                .requestIdToken(serverClientId)
+                .build()
         )
         activityResultLauncher.launch(googleSignInClient.signInIntent)
     }

package/package.json

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