Merge branch 'antonis/capture-app-start-errors-v8' into antonis/test-capture-app-start-errors-android

Author: antonis

packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryStartTest.kt

@@ -58,6 +58,15 @@ class RNSentryStartTest {
         assertEquals("http://localhost:8969/teststream", actualOptions.spotlightConnectionUrl)
     }
 
+    @Test
+    fun `when the spotlight option is enabled without defaultSidecarUrl, the spotlight is enabled and does not crash`() {
+        val options = JavaOnlyMap.of("spotlight", true)
+        val actualOptions = SentryAndroidOptions()
+        RNSentryStart.getSentryAndroidOptions(actualOptions, options, logger)
+        assert(actualOptions.isEnableSpotlight)
+        assertNull(actualOptions.spotlightConnectionUrl)
+    }
+
     @Test
     fun `when the spotlight option is disabled, the spotlight SentryAndroidOption is set to false`() {
         val options = JavaOnlyMap.of("spotlight", false)

packages/core/android/src/main/java/io/sentry/react/RNSentryStart.java

@@ -148,7 +148,9 @@ static void getSentryAndroidOptions(
     if (rnOptions.hasKey("spotlight")) {
       if (rnOptions.getType("spotlight") == ReadableType.Boolean) {
         options.setEnableSpotlight(rnOptions.getBoolean("spotlight"));
-        options.setSpotlightConnectionUrl(rnOptions.getString("defaultSidecarUrl"));
+        if (rnOptions.hasKey("defaultSidecarUrl")) {
+          options.setSpotlightConnectionUrl(rnOptions.getString("defaultSidecarUrl"));
+        }
       } else if (rnOptions.getType("spotlight") == ReadableType.String) {
         options.setEnableSpotlight(true);
         options.setSpotlightConnectionUrl(rnOptions.getString("spotlight"));