expo-modules-core 1.5.12 → 1.5.13

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 1.5.13 — 2024-01-10
+
+### 🐛 Bug fixes
+
+- Fixed random `NullPointerExceptions` when calling `Updates.reloadAsync` on Android. ([#24442](https://github.com/expo/expo/pull/24442) by [@lukmccall](https://github.com/lukmccall))
+
 ## 1.5.12 — 2023-11-17
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '1.5.12'
+version = '1.5.13'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -160,7 +160,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.5.12"
+    versionName "1.5.13"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

package/android/src/main/java/expo/modules/kotlin/jni/JavaCallback.kt

@@ -5,24 +5,36 @@ import com.facebook.react.bridge.WritableNativeArray
 import com.facebook.react.bridge.WritableNativeMap
 import expo.modules.core.interfaces.DoNotStrip
 import expo.modules.kotlin.exception.UnexpectedException
+import expo.modules.kotlin.logger
 
 @Suppress("KotlinJniMissingFunction")
 @DoNotStrip
 class JavaCallback @DoNotStrip internal constructor(@DoNotStrip private val mHybridData: HybridData) : Destructible {
   operator fun invoke(result: Any?) {
-    if (result == null) {
-      invoke()
-      return
-    }
-    when (result) {
-      is Int -> invoke(result)
-      is Boolean -> invoke(result)
-      is Double -> invoke(result)
-      is Float -> invoke(result)
-      is String -> invoke(result)
-      is WritableNativeArray -> invoke(result)
-      is WritableNativeMap -> invoke(result)
-      else -> throw UnexpectedException("Unknown type: ${result.javaClass}")
+    try {
+
+      if (result == null) {
+        invoke()
+        return
+      }
+      when (result) {
+        is Int -> invoke(result)
+        is Boolean -> invoke(result)
+        is Double -> invoke(result)
+        is Float -> invoke(result)
+        is String -> invoke(result)
+        is WritableNativeArray -> invoke(result)
+        is WritableNativeMap -> invoke(result)
+        else -> throw UnexpectedException("Unknown type: ${result.javaClass}")
+      }
+    } catch (e: Throwable) {
+      if (!mHybridData.isValid) {
+        // We know that this particular JavaCallback was invalidated, so it shouldn't be invoked.
+        // To prevent crashes, we decided to suppress the error here.
+        logger.error("Invalidated JavaCallback was invoked", e)
+        return
+      }
+      throw e
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.5.12",
+  "version": "1.5.13",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,5 +42,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^3.0.0"
   },
-  "gitHead": "d82af4cef2171ea4cbbacb8eeae71bd4e5b63fea"
+  "gitHead": "25af32e83a26dc8027223b61bf7459ba93310ba3"
 }