Skip to content

Commit effecc8

Browse files
authored
fix(android): fix crash when initial props is set (#1206)
1 parent 9f49816 commit effecc8

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

android/app/src/main/java/com/microsoft/reacttestapp/TestApp.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.app.Application
55
import android.content.Context
66
import com.facebook.react.PackageList
77
import com.facebook.react.ReactApplication
8+
import com.facebook.soloader.SoLoader
89
import com.microsoft.reacttestapp.manifest.ManifestProvider
910
import com.microsoft.reacttestapp.react.ReactBundleNameProvider
1011
import com.microsoft.reacttestapp.react.TestAppReactNativeHost
@@ -25,6 +26,10 @@ class TestApp : Application(), ReactApplication {
2526
override fun onCreate() {
2627
super.onCreate()
2728

29+
// We need to initialize SoLoader early because ManifestProvider may
30+
// need to use WritableNativeMap when parsing initial properties.
31+
SoLoader.init(this, false)
32+
2833
manifestProviderInternal = ManifestProvider.create(this)
2934
val (manifest, _) = manifestProvider.fromResources()
3035

android/app/src/main/java/com/microsoft/reacttestapp/react/TestAppReactNativeHost.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ class TestAppReactNativeHost(
8585
reactInstanceManager.addReactInstanceEventListener(reactInstanceListener)
8686

8787
beforeReactNativeInit()
88-
SoLoader.init(application, false)
8988
reactInstanceManager.createReactContextInBackground()
9089

9190
if (BuildConfig.DEBUG) {

0 commit comments

Comments
 (0)