Skip to content

fix(android): update to match ReactNativeHost migration to Kotlin #2792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tido64 wants to merge 1 commit into
base: trunk
Choose a base branch
from
+5 −2
Open

fix(android): update to match ReactNativeHost migration to Kotlin #2792

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...ndroid/app/src/reacthost-0.76/java/com/microsoft/reacttetapp/react/MainReactNativeHost.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class MainReactNativeHost(
private val reactBundleNameProvider: ReactBundleNameProvider
) : com.microsoft.reacttestapp.compat.ReactNativeHostCompat(application) {
val jsExecutorName: String
get() = javaScriptExecutorFactory.toString()
get() = getJavaScriptExecutorFactory().toString()

var source: BundleSource =
if (reactBundleNameProvider.bundleName == null || isPackagerRunning(application)) {
Expand All @@ -37,6 +37,9 @@ class MainReactNativeHost(

var onBundleSourceChanged: ((newSource: BundleSource) -> Unit)? = null

private val application
get() = getApplication() as TestApp

private var currentActivityTracker = CurrentActivityTracker()

private val reactInstanceEventListeners =
Expand All @@ -54,7 +57,7 @@ class MainReactNativeHost(
beforeReactNativeInit()

if (BuildConfig.REACTAPP_USE_BRIDGELESS) {
val reactHost = (application as TestApp).reactHost
val reactHost = application.reactHost
reactHost.addReactInstanceEventListener(object : ReactInstanceEventListener {
override fun onReactContextInitialized(context: ReactContext) {
// proactively removing the listener to avoid leaking memory
Expand Down
Loading