diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index 12ef9ecd5f8a..58940c0e1227 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -3906,7 +3906,7 @@ public abstract interface class com/facebook/react/touch/ReactInterceptingViewGr public final class com/facebook/react/turbomodule/core/CallInvokerHolderImpl : com/facebook/react/turbomodule/core/interfaces/CallInvokerHolder { } -public class com/facebook/react/turbomodule/core/NativeMethodCallInvokerHolderImpl : com/facebook/react/turbomodule/core/interfaces/NativeMethodCallInvokerHolder { +public final class com/facebook/react/turbomodule/core/NativeMethodCallInvokerHolderImpl : com/facebook/react/turbomodule/core/interfaces/NativeMethodCallInvokerHolder { } public abstract interface class com/facebook/react/turbomodule/core/interfaces/CallInvokerHolder { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/NativeMethodCallInvokerHolderImpl.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/NativeMethodCallInvokerHolderImpl.kt similarity index 52% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/NativeMethodCallInvokerHolderImpl.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/NativeMethodCallInvokerHolderImpl.kt index c68b5a69aab2..d777783a041c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/NativeMethodCallInvokerHolderImpl.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/NativeMethodCallInvokerHolderImpl.kt @@ -5,14 +5,13 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.turbomodule.core; +package com.facebook.react.turbomodule.core -import com.facebook.infer.annotation.Nullsafe; -import com.facebook.jni.HybridData; -import com.facebook.proguard.annotations.DoNotStrip; -import com.facebook.react.common.annotations.FrameworkAPI; -import com.facebook.react.internal.turbomodule.core.NativeModuleSoLoader; -import com.facebook.react.turbomodule.core.interfaces.NativeMethodCallInvokerHolder; +import com.facebook.jni.HybridData +import com.facebook.proguard.annotations.DoNotStrip +import com.facebook.react.common.annotations.FrameworkAPI +import com.facebook.react.internal.turbomodule.core.NativeModuleSoLoader +import com.facebook.react.turbomodule.core.interfaces.NativeMethodCallInvokerHolder /** * NativeMethodCallInvokerHolder is created at a different time/place (i.e: in CatalystInstance) @@ -20,17 +19,13 @@ * class so that we may pass it from CatalystInstance, through Java, to * TurboModuleManager::initHybrid. */ -@Nullsafe(Nullsafe.Mode.LOCAL) @FrameworkAPI -public class NativeMethodCallInvokerHolderImpl implements NativeMethodCallInvokerHolder { - - @DoNotStrip private final HybridData mHybridData; - - static { - NativeModuleSoLoader.maybeLoadSoLibrary(); - } - - private NativeMethodCallInvokerHolderImpl(HybridData hd) { - mHybridData = hd; +public class NativeMethodCallInvokerHolderImpl +private constructor(@field:DoNotStrip private val mHybridData: HybridData) : + NativeMethodCallInvokerHolder { + private companion object { + init { + NativeModuleSoLoader.maybeLoadSoLibrary() + } } }