diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.java deleted file mode 100644 index ba43fca0a60..00000000000 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -package com.facebook.react.bridge; - -import android.content.Context; -import com.facebook.infer.annotation.Nullsafe; - -/** - * A context wrapper that always wraps Android Application {@link Context} and {@link - * CatalystInstance} by extending {@link ReactContext} - */ -@Nullsafe(Nullsafe.Mode.LOCAL) -public abstract class ReactApplicationContext extends ReactContext { - // We want to wrap ApplicationContext, since there is no easy way to verify that application - // context is passed as a param, we use {@link Context#getApplicationContext} to ensure that - // the context we're wrapping is in fact an application context. - public ReactApplicationContext(Context context) { - super(context.getApplicationContext()); - } -} diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.kt new file mode 100644 index 00000000000..d51b137c37d --- /dev/null +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.kt @@ -0,0 +1,20 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +package com.facebook.react.bridge + +import android.content.Context + +/** + * A context wrapper that always wraps Android Application [Context] and [CatalystInstance] by + * extending [ReactContext]. + */ +public abstract class ReactApplicationContext(context: Context) : + // We want to wrap ApplicationContext, since there is no easy way to verify that application + // context is passed as a param, we use [Context.getApplicationContext] to ensure that + // the context we're wrapping is in fact an application context. + ReactContext(context.applicationContext) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.kt index 5fca725d830..8efa04adf30 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.kt @@ -9,6 +9,7 @@ package com.facebook.react.modules.clipboard import android.content.ClipData import android.content.ClipboardManager +import android.content.Context import com.facebook.fbreact.specs.NativeClipboardSpec import com.facebook.react.bridge.Promise import com.facebook.react.bridge.ReactApplicationContext @@ -20,8 +21,7 @@ internal class ClipboardModule(context: ReactApplicationContext) : NativeClipboa private val clipboardService: ClipboardManager get() = - getReactApplicationContext().getSystemService(ReactApplicationContext.CLIPBOARD_SERVICE) - as ClipboardManager + getReactApplicationContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager override fun getString(promise: Promise) { try {