Aa fix crash template creation (#2)

* FIx missing even didPressMenuItem * add checker to avoid crash when uninitialized * fix loading AA screen
Zetifi · Jun 24, 2024 · e1fcf67 · e1fcf67
1 parent be9629a
commit e1fcf67
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/packages/react-native-carplay/android/src/main/java/org/birkir/carplay/CarPlayModule.kt b/packages/react-native-carplay/android/src/main/java/org/birkir/carplay/CarPlayModule.kt
@@ -187,6 +187,10 @@ class CarPlayModule internal constructor(private val reactContext: ReactApplicat
 
   @ReactMethod
   fun toast(text: String, duration: Int) {
+    if (!::carContext.isInitialized) {
+      Log.e(TAG, "carContext is not initialized. Cannot show toast.")
+      return
+    }
     CarToast.makeText(carContext, text, duration).show()
   }
 
@@ -271,6 +275,10 @@ class CarPlayModule internal constructor(private val reactContext: ReactApplicat
   }
 
   private fun createScreen(templateId: String): CarScreen? {
+    if (!::carContext.isInitialized) {
+      Log.e(TAG, "carContext not initialized")
+      return null
+    }
     val config = carTemplates[templateId];
     if (config != null) {
       val screen = CarScreen(carContext)

diff --git a/packages/react-native-carplay/android/src/main/java/org/birkir/carplay/CarPlaySession.kt b/packages/react-native-carplay/android/src/main/java/org/birkir/carplay/CarPlaySession.kt
@@ -42,7 +42,7 @@ class CarPlaySession(private val reactInstanceManager: ReactInstanceManager) : S
           invokeStartTask(reactInstanceManager.currentReactContext!!);
         }
       }
-    }, IntentFilter("org.birkir.carplay.APP_RELOAD"))
+    }, IntentFilter("org.birkir.carplay.APP_RELOAD"), Context.RECEIVER_EXPORTED)
 
     // Run JS
     runJsApplication()