expo-modules-core 1.12.4 → 1.12.6

package/CHANGELOG.md

@@ -10,12 +10,23 @@
 
 ### 💡 Others
 
+## 1.12.6 — 2024-05-01
+
+### 🐛 Bug fixes
+
+- [Android] Fix `field operation on NULL object` when reloading the app. ([#28555](https://github.com/expo/expo/pull/28555) by [@lukmccall](https://github.com/lukmccall))
+
+## 1.12.5 — 2024-05-01
+
+_This version does not introduce any user-facing changes._
+
 ## 1.12.4 — 2024-04-29
 
 ### 🐛 Bug fixes
 
 - [Android] Fixed gziped payload does not correctly shown in network inspector. ([#28486](https://github.com/expo/expo/pull/28486) by [@kudo](https://github.com/kudo))
 - [Android] Fixed crashes during the deallocation of shared objects. ([#28491](https://github.com/expo/expo/pull/28491) by [@lukmccall](https://github.com/lukmccall))
+- [iOS] Fix accessing the view registry to avoid infinite loop crash. ([#28531](https://github.com/expo/expo/pull/28531) by [@tsapeta](https://github.com/tsapeta))
 
 ## 1.12.3 — 2024-04-26
 

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '1.12.4'
+version = '1.12.6'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -63,7 +63,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.12.4"
+    versionName "1.12.6"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

package/android/src/main/cpp/ExpoModulesHostObject.cpp

@@ -41,6 +41,13 @@ jsi::Value ExpoModulesHostObject::get(jsi::Runtime &runtime, const jsi::PropName
   // Create a lazy object for the specific module. It defers initialization of the final module object.
   LazyObject::Shared moduleLazyObject = std::make_shared<LazyObject>(
     [this, cName](jsi::Runtime &rt) {
+      // Check if the installer has been deallocated.
+      // If so, return nullptr to avoid a "field operation on NULL object" crash.
+      // As it's probably the best we can do in this case.
+      if (installer->wasDeallocated()) {
+        return std::shared_ptr<jsi::Object>(nullptr);
+      }
+
       auto module = installer->getModule(cName);
       return module->cthis()->getJSIObject(rt);
     });

package/android/src/main/cpp/JSIContext.cpp

@@ -359,6 +359,7 @@ void JSIContext::prepareForDeallocation() {
   runtimeHolder.reset();
   jniDeallocator.reset();
   javaPart_.reset();
+  wasDeallocated_ = true;
 }
 
 void JSIContext::jniSetNativeStateForSharedObject(
@@ -386,6 +387,10 @@ void JSIContext::jniSetNativeStateForSharedObject(
     ->setNativeState(runtimeHolder->get(), std::move(nativeState));
 }
 
+bool JSIContext::wasDeallocated() const {
+  return wasDeallocated_;
+}
+
 thread_local std::unordered_map<uintptr_t, JSIContext *> jsiContexts;
 
 void bindJSIContext(const jsi::Runtime &runtime, JSIContext *jsiContext) {

package/android/src/main/cpp/JSIContext.h

@@ -145,10 +145,14 @@ public:
 
   void prepareForDeallocation();
 
+  bool wasDeallocated() const;
+
 private:
   friend HybridBase;
   jni::global_ref<JSIContext::javaobject> javaPart_;
 
+  bool wasDeallocated_ = false;
+
   explicit JSIContext(jni::alias_ref<jhybridobject> jThis);
 
   inline jni::local_ref<JavaScriptModuleObject::javaobject>

package/android/src/main/java/expo/modules/core/utilities/EmulatorUtilities.kt

@@ -27,7 +27,6 @@ object EmulatorUtilities {
       Build.BOOTLOADER.lowercase(Locale.ROOT).contains("nox") ||
       Build.HARDWARE.lowercase(Locale.ROOT).contains("nox") ||
       Build.PRODUCT.lowercase(Locale.ROOT).contains("nox") ||
-      Build.SERIAL.lowercase(Locale.ROOT).contains("nox") ||
       (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic"))
   }
 }

package/android/src/main/java/expo/modules/kotlin/AndroidExtensions.kt

@@ -0,0 +1,34 @@
+package expo.modules.kotlin
+
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import android.os.Parcelable
+import java.io.Serializable
+
+inline fun <reified T : Parcelable> Intent.safeGetParcelableExtra(name: String): T? {
+  return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+    getParcelableExtra(name, T::class.java)
+  } else {
+    @Suppress("DEPRECATION")
+    getParcelableExtra(name)
+  }
+}
+
+inline fun <reified T : Parcelable> Bundle.safeGetParcelable(name: String): T? {
+  return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+    getParcelable(name, T::class.java)
+  } else {
+    @Suppress("DEPRECATION")
+    getParcelable(name)
+  }
+}
+
+inline fun <reified T : Serializable> Bundle.safeGetSerializable(name: String): T? {
+  return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+    getSerializable(name, T::class.java)
+  } else {
+    @Suppress("DEPRECATION")
+    getSerializable(name) as T?
+  }
+}

package/android/src/main/java/expo/modules/kotlin/AppContext.kt

@@ -363,7 +363,7 @@ class AppContext(
   }
 
   internal fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int, data: Intent?) {
-    activityResultsManager.onActivityResult(activity, requestCode, resultCode, data)
+    activityResultsManager.onActivityResult(requestCode, resultCode, data)
     registry.post(
       EventName.ON_ACTIVITY_RESULT,
       activity,

package/android/src/main/java/expo/modules/kotlin/Promise.kt

@@ -79,6 +79,7 @@ fun Promise.toBridgePromise(): com.facebook.react.bridge.Promise {
       expoPromise.reject(code ?: unknownCode, message, throwable)
     }
 
+    @Deprecated("Use reject(code, message, throwable) instead")
     override fun reject(message: String?) {
       expoPromise.reject(unknownCode, message, null)
     }

package/android/src/main/java/expo/modules/kotlin/activityresult/ActivityResultsManager.kt

@@ -48,7 +48,7 @@ class ActivityResultsManager(
 
   // region Lifecycle
 
-  fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int, data: Intent?) {
+  fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
     registry.dispatchResult(requestCode, resultCode, data)
   }
 

package/android/src/main/java/expo/modules/kotlin/activityresult/AppContextActivityResultRegistry.kt

@@ -25,10 +25,10 @@ import androidx.lifecycle.LifecycleOwner
 import expo.modules.core.utilities.ifNull
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.providers.CurrentActivityProvider
+import expo.modules.kotlin.safeGetParcelable
+import expo.modules.kotlin.safeGetParcelableExtra
 import java.io.Serializable
-import java.util.*
-import kotlin.collections.ArrayList
-import kotlin.collections.HashMap
+import java.util.Random
 
 private const val TAG = "ActivityResultRegistry"
 
@@ -116,8 +116,9 @@ class AppContextActivityResultRegistry(
           ?: arrayOfNulls(0)
         ActivityCompat.requestPermissions(activity, permissions, requestCode)
       }
+
       StartIntentSenderForResult.ACTION_INTENT_SENDER_REQUEST -> {
-        val request: IntentSenderRequest = intent.getParcelableExtra(StartIntentSenderForResult.EXTRA_INTENT_SENDER_REQUEST)!!
+        val request = intent.safeGetParcelableExtra<IntentSenderRequest>(StartIntentSenderForResult.EXTRA_INTENT_SENDER_REQUEST)!!
         try {
           // startIntentSenderForResult path
           ActivityCompat.startIntentSenderForResult(
@@ -141,6 +142,7 @@ class AppContextActivityResultRegistry(
           }
         }
       }
+
       else -> {
         // startActivityForResult path
         ActivityCompat.startActivityForResult(activity, intent, requestCode, optionsBundle)
@@ -181,10 +183,14 @@ class AppContextActivityResultRegistry(
 
           // 1. No callbacks registered yet, other path would take care of the results
           @Suppress("UNCHECKED_CAST")
-          val callbacksAndContract: CallbacksAndContract<I, O> = (keyToCallbacksAndContract[key] ?: return@LifecycleEventObserver) as CallbacksAndContract<I, O>
+          val callbacksAndContract: CallbacksAndContract<I, O> = (
+            keyToCallbacksAndContract[key]
+              ?: return@LifecycleEventObserver
+            ) as CallbacksAndContract<I, O>
 
           // 2. There are results to be delivered to the callbacks
-          pendingResults.getParcelable<ActivityResult>(key)?.let {
+          val activityResult = pendingResults.safeGetParcelable<ActivityResult>(key)
+          activityResult?.let {
             pendingResults.remove(key)
 
             @Suppress("UNCHECKED_CAST")
@@ -200,9 +206,11 @@ class AppContextActivityResultRegistry(
             }
           }
         }
+
         Lifecycle.Event.ON_DESTROY -> {
           unregister(key)
         }
+
         else -> Unit
       }
     }
@@ -274,7 +282,7 @@ class AppContextActivityResultRegistry(
     }
     keyToCallbacksAndContract.remove(key)
     if (pendingResults.containsKey(key)) {
-      Log.w(TAG, "Dropping pending result for request $key : ${pendingResults.getParcelable<ActivityResult>(key)}")
+      Log.w(TAG, "Dropping pending result for request $key : ${pendingResults.safeGetParcelable<ActivityResult>(key)}")
       pendingResults.remove(key)
     }
     keyToLifecycleContainers[key]?.let {

package/android/src/main/java/expo/modules/kotlin/activityresult/DataPersistor.kt

@@ -7,6 +7,7 @@ import android.os.Parcel
 import android.text.format.DateUtils
 import android.util.Base64
 import androidx.core.os.bundleOf
+import expo.modules.kotlin.safeGetSerializable
 import java.io.Serializable
 import java.util.*
 import kotlin.collections.ArrayList
@@ -64,7 +65,7 @@ class DataPersistor(context: Context) {
         bundle
           .keySet()
           .associateWith { key ->
-            bundle.getSerializable(key) ?: throw IllegalStateException("For a key '$key' there should be a serializable class available")
+            bundle.safeGetSerializable<Serializable>(key) ?: throw IllegalStateException("For a key '$key' there should be a serializable class available")
           }
       }
   }
@@ -82,7 +83,7 @@ class DataPersistor(context: Context) {
   }
 
   fun retrieveSerializable(key: String): Serializable? {
-    return retrievedData.getSerializable(key)
+    return retrievedData.safeGetSerializable<Serializable>(key)
   }
 
   fun persist() {

package/android/src/main/java/expo/modules/kotlin/devtools/ExpoRequestCdpInterceptor.kt

@@ -61,15 +61,15 @@ object ExpoRequestCdpInterceptor : ExpoNetworkInspectOkHttpInterceptorsDelegate
   ) {
     val now = BigDecimal(System.currentTimeMillis() / 1000.0).setScale(3, RoundingMode.CEILING)
 
-    val params = ResponseReceivedParams(now, requestId, request, response)
+    val params = ResponseReceivedParams(now, requestId, response)
     dispatchEvent(Event("Network.responseReceived", params))
 
     if (body != null) {
-      val params2 = ExpoReceivedResponseBodyParams(now, requestId, request, response, body)
+      val params2 = ExpoReceivedResponseBodyParams(requestId, body)
       dispatchEvent(Event("Expo(Network.receivedResponseBody)", params2))
     }
 
-    val params3 = LoadingFinishedParams(now, requestId, request, response)
+    val params3 = LoadingFinishedParams(now, requestId, response)
     dispatchEvent(Event("Network.loadingFinished", params3))
   }
 

package/android/src/main/java/expo/modules/kotlin/devtools/cdp/CdpNetworkTypes.kt

@@ -183,7 +183,7 @@ data class ResponseReceivedParams(
   val response: Response,
   val hasExtraInfo: Boolean = false
 ) : JsonSerializable {
-  constructor(now: BigDecimal, requestId: RequestId, request: okhttp3.Request, okhttpResponse: okhttp3.Response) : this(
+  constructor(now: BigDecimal, requestId: RequestId, okhttpResponse: okhttp3.Response) : this(
     requestId = requestId,
     timestamp = now,
     type = ResourceType.fromMimeType(okhttpResponse.header("Content-Type", "") ?: ""),
@@ -207,7 +207,7 @@ data class LoadingFinishedParams(
   val timestamp: MonotonicTime,
   val encodedDataLength: Long
 ) : JsonSerializable {
-  constructor(now: BigDecimal, requestId: RequestId, request: okhttp3.Request, response: okhttp3.Response) : this(
+  constructor(now: BigDecimal, requestId: RequestId, response: okhttp3.Response) : this(
     requestId = requestId,
     timestamp = now,
     encodedDataLength = response.body?.contentLength() ?: 0
@@ -228,10 +228,7 @@ data class ExpoReceivedResponseBodyParams(
   var base64Encoded: Boolean
 ) : JsonSerializable {
   constructor(
-    now: BigDecimal,
     requestId: RequestId,
-    request: okhttp3.Request,
-    response: okhttp3.Response,
     body: okhttp3.ResponseBody
   ) : this(
     requestId = requestId,

package/android/src/main/java/expo/modules/kotlin/exception/CommonExceptions.kt

@@ -65,4 +65,9 @@ class Exceptions {
   ) : CodedException(
     message = "Expected to run on $expectedThreadName thread, but was run on $currentThreadName"
   )
+
+  /**
+   * An exception to throw when the root view is missing.
+   */
+  class MissingRootView : CodedException(message = "The root view is missing")
 }

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

@@ -88,8 +88,8 @@ open class JavaScriptObject @DoNotStrip internal constructor(@DoNotStrip private
 
   // Needed to handle untyped null value
   // Without it setProperty(name, null) won't work
-  fun setProperty(name: String, `null`: Nothing?) = unsetProperty(name)
-  operator fun set(name: String, `null`: Nothing?) = unsetProperty(name)
+  fun setProperty(name: String, @Suppress("UNUSED_PARAMETER") `null`: Nothing?) = unsetProperty(name)
+  operator fun set(name: String, @Suppress("UNUSED_PARAMETER") `null`: Nothing?) = unsetProperty(name)
 
   fun defineProperty(
     name: String,
@@ -130,7 +130,7 @@ open class JavaScriptObject @DoNotStrip internal constructor(@DoNotStrip private
   // Needed to handle untyped null value
   fun defineProperty(
     name: String,
-    `null`: Nothing?,
+    @Suppress("UNUSED_PARAMETER") `null`: Nothing?,
     options: List<PropertyDescriptor> = emptyList()
   ) = defineJSObjectProperty(name, null, options.toCppOptions())
 

package/android/src/main/java/expo/modules/kotlin/types/Either.kt

@@ -10,7 +10,7 @@ import kotlin.reflect.KType
 
 sealed class DeferredValue
 
-object IncompatibleValue : DeferredValue()
+data object IncompatibleValue : DeferredValue()
 
 class UnconvertedValue(
   private val unconvertedValue: Any,
@@ -73,16 +73,16 @@ open class Either<FirstType : Any, SecondType : Any>(
   }
 
   @JvmName("isFirstType")
-  fun `is`(type: KClass<FirstType>): Boolean = `is`(0)
+  fun `is`(@Suppress("UNUSED_PARAMETER") type: KClass<FirstType>): Boolean = `is`(0)
 
   @JvmName("isSecondType")
-  fun `is`(type: KClass<SecondType>): Boolean = `is`(1)
+  fun `is`(@Suppress("UNUSED_PARAMETER") type: KClass<SecondType>): Boolean = `is`(1)
 
   @JvmName("getFirstType")
-  fun get(type: KClass<FirstType>): FirstType = get(0) as FirstType
+  fun get(@Suppress("UNUSED_PARAMETER") type: KClass<FirstType>): FirstType = get(0) as FirstType
 
   @JvmName("getSecondType")
-  fun get(type: KClass<SecondType>): SecondType = get(1) as SecondType
+  fun get(@Suppress("UNUSED_PARAMETER") type: KClass<SecondType>): SecondType = get(1) as SecondType
 
   fun first(): FirstType = get(0) as FirstType
 
@@ -96,10 +96,10 @@ open class EitherOfThree<FirstType : Any, SecondType : Any, ThirdType : Any>(
   types: List<KType>
 ) : Either<FirstType, SecondType>(bareValue, deferredValue, types) {
   @JvmName("isThirdType")
-  fun `is`(type: KClass<ThirdType>): Boolean = `is`(2)
+  fun `is`(@Suppress("UNUSED_PARAMETER") type: KClass<ThirdType>): Boolean = `is`(2)
 
   @JvmName("getThirdType")
-  fun get(type: KClass<ThirdType>) = get(3) as ThirdType
+  fun get(@Suppress("UNUSED_PARAMETER") type: KClass<ThirdType>) = get(3) as ThirdType
 
   fun third(): ThirdType = get(3) as ThirdType
 }
@@ -111,10 +111,10 @@ class EitherOfFour<FirstType : Any, SecondType : Any, ThirdType : Any, FourthTyp
   types: List<KType>
 ) : EitherOfThree<FirstType, SecondType, ThirdType>(bareValue, deferredValue, types) {
   @JvmName("isFourthType")
-  fun `is`(type: KClass<FourthType>): Boolean = `is`(3)
+  fun `is`(@Suppress("UNUSED_PARAMETER") type: KClass<FourthType>): Boolean = `is`(3)
 
   @JvmName("getFourthType")
-  fun get(type: KClass<FourthType>): FourthType = get(3) as FourthType
+  fun get(@Suppress("UNUSED_PARAMETER") type: KClass<FourthType>): FourthType = get(3) as FourthType
 
   fun fourth(): FourthType = get(3) as FourthType
 }

package/ios/Legacy/Services/EXReactNativeAdapter.mm

@@ -296,7 +296,7 @@ EX_REGISTER_MODULE();
       UIView<RCTComponentViewProtocol> *componentView = [uiManager viewForReactTag:(NSNumber *)viewId];
       UIView *view = [(ExpoFabricViewObjC *)componentView contentView];
 #else
-      UIView *view = viewRegistry[viewId];
+      UIView *view = [uiManager viewForReactTag:(NSNumber *)viewId];
 #endif
       block(view);
     }];
@@ -313,7 +313,7 @@ EX_REGISTER_MODULE();
       UIView<RCTComponentViewProtocol> *componentView = [uiManager viewForReactTag:(NSNumber *)viewId];
       UIView *view = [(ExpoFabricViewObjC *)componentView contentView];
 #else
-      UIView *view = viewRegistry[viewId];
+      UIView *view = [uiManager viewForReactTag:(NSNumber *)viewId];
 #endif
       block(view);
     }];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.12.4",
+  "version": "1.12.6",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^3.0.0"
   },
-  "gitHead": "4a7cf0d0baf6dfc595d93f604945d2142e705a36"
+  "gitHead": "87bd0dfa8b784a834191195ca174a00dd30ee5b7"
 }