Merge pull request #40 from mendix/moo/MOO-2265-update-deprecated-apis

[MOO-2265] - Update deprecated apis

Author: YogendraShelke

android/src/main/java/com/facebook/react/devsupport/MendixShakeDetector.kt

@@ -5,7 +5,6 @@
 import com.mendix.mendixnative.react.splash.MendixSplashScreenPresenter;
 
 import java.util.List;
-import java.util.Map;
 
 public interface MendixApplication extends ReactApplication {
   boolean getUseDeveloperSupport();

android/src/main/java/com/mendix/mendixnative/MendixApplication.java

@@ -2,7 +2,6 @@ package com.mendix.mendixnative
 
 import android.app.Activity
 import com.facebook.react.ReactHost
-import com.facebook.react.devsupport.DevSupportManagerBase
 import com.facebook.react.modules.network.OkHttpClientProvider
 import com.mendix.mendixnative.config.AppPreferences
 import com.mendix.mendixnative.react.*
@@ -34,12 +33,23 @@ class MendixInitializer(
     MxConfiguration.runtimeUrl = runtimeUrl
     MxConfiguration.warningsFilter = mendixApp.warningsFilter
 
+    // Must run before the first access to `reactHost` below (and before any reload).
+    // `PackagerConnectionSettings.debugServerHost` caches its value in memory for the
+    // lifetime of the process the first time it's read (e.g. by an eager dev-support
+    // settings reload triggered as soon as ReactHost/DevSupportManager is constructed).
+    // If that first read happens before we persist the real Metro host, RN falls back
+    // to its hardcoded emulator default (10.0.2.2:8081) and keeps using it for the rest
+    // of the process — even though the correct host is written to SharedPreferences —
+    // which is why a fresh app process (restart) "fixes" it but reload within the same
+    // process does not. Resolving/pushing the host here, before `reactHost` is touched,
+    // avoids that stale cache entirely.
+    if (hasRNDeveloperSupport) setupDeveloperApp(runtimeUrl, mendixApp)
+
     // Reload only if there's already a running instance.
     if (reactHost.currentReactContext != null) {
       reactHost.reload("Clean start for new Mendix app")
     }
     if (clearData) clearData(context.application)
-    if (hasRNDeveloperSupport) setupDeveloperApp(runtimeUrl, mendixApp)
   }
 
   fun onDestroy() {
@@ -65,6 +75,14 @@ class MendixInitializer(
     preferences.setDeltas(false)
     preferences.setDevMode((mendixApp.showExtendedDevMenu))
 
+    // Explicitly push the freshly resolved host into the live ReactHost's
+    // PackagerConnectionSettings. Writing to SharedPreferences alone (above) isn't
+    // enough if RN already cached a stale/default debug server host in memory for
+    // this process — this overwrite takes effect immediately, regardless of when
+    // that first (possibly premature) read happened.
+    reactHost.devSupportManager?.devSettings?.packagerConnectionSettings?.debugServerHost =
+      preferences.getMetroBundlerHost()
+
     clearCachedReactNativeDevBundle(context.application)
   }
 }

android/src/main/java/com/mendix/mendixnative/MendixInitializer.kt

@@ -2,7 +2,6 @@ package com.mendix.mendixnative
 
 import android.app.Application
 import com.facebook.react.ReactHost
-import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.JSBundleLoader
 import com.facebook.react.bridge.JSBundleLoaderDelegate
@@ -28,8 +27,6 @@ import com.mendixnative.MendixNativePackage
 import java.util.*
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 
-import com.facebook.react.defaults.DefaultReactNativeHost
-
 abstract class MendixReactApplication : Application(), MendixApplication, ErrorHandlerFactory {
   private val appSessionId = "" + Math.random() * 1000 + Date().time
   override fun getAppSessionId(): String = appSessionId
@@ -44,33 +41,11 @@ abstract class MendixReactApplication : Application(), MendixApplication, ErrorH
 
   private var jsBundleFileProvider: JSBundleFileProvider? = jsBundleProvider
 
-  override var reactNativeHost: ReactNativeHost = object : DefaultReactNativeHost(this) {
-    override fun getUseDeveloperSupport(): Boolean = this@MendixReactApplication.useDeveloperSupport
-
-    override fun getPackages(): List<ReactPackage> {
-      val pkgs: MutableList<ReactPackage> = ArrayList()
-      // Use the packages provided by the concrete Application subclass.
-      pkgs.addAll(this@MendixReactApplication.packages)
-      // Inject splashScreenPresenter into any MendixNativePackage instances without creating duplicates.
-      applyInternalPackageAugmentations(pkgs)
-      return pkgs
-    }
-
-    override fun getJSBundleFile(): String? = this@MendixReactApplication.jsBundleFile
-    override fun getJSMainModuleName(): String = "index"
-    override fun getBundleAssetName(): String? = super.getBundleAssetName()
-    override fun getRedBoxHandler(): RedBoxHandler? = null
-
-    // Hermes & New Arch flags; Hermes executor will be picked automatically when isHermesEnabled is true.
-    override val isNewArchEnabled: Boolean = true
-    override val isHermesEnabled: Boolean = true
-  }
-
   /**
-   * Build the [ReactHost] ourselves instead of using [DefaultReactHost.getDefaultReactHost],
-   * because that factory evaluates [ReactNativeHost.getJSBundleFile] once at creation time and
-   * bakes the result into a fixed [JSBundleLoader]. After an OTA update deploys a new bundle,
-   * a subsequent [ReactHost.reload] would still load the stale bundle.
+   * Build the [ReactHost] with a custom [JSBundleLoader] instead of using a static bundle path.
+   * The default approach evaluates the bundle file path once at creation time and bakes it into
+   * a fixed [JSBundleLoader]. After an OTA update deploys a new bundle, a subsequent
+   * [ReactHost.reload] would still load the stale bundle.
    *
    * By providing a **dynamic** [JSBundleLoader] whose [JSBundleLoader.loadScript] calls
    * [getJSBundleFile] on every invocation, each reload picks up the latest bundle path —
@@ -133,10 +108,7 @@ abstract class MendixReactApplication : Application(), MendixApplication, ErrorH
   override fun onCreate() {
     super.onCreate()
     SoLoader.init(this, OpenSourceMergedSoMapping)
-    // Only load the New Architecture entry point when enabled (always true here, but guarded for safety).
-    if (reactNativeHost is DefaultReactNativeHost) {
-      load()
-    }
+    load()
   }
 
   override fun getJSBundleFile(): String? {

android/src/main/java/com/mendix/mendixnative/MendixReactApplication.kt

@@ -1,17 +1,17 @@
 package com.mendix.mendixnative.activity
 
+import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
-import com.facebook.react.bridge.ReactContext
 import com.facebook.react.devsupport.interfaces.DevSupportManager
 import com.mendix.mendixnative.DevAppMenuHandler
 import com.mendix.mendixnative.MendixApplication
 import com.mendix.mendixnative.MendixInitializer
 import com.mendix.mendixnative.react.MendixApp
 import com.mendix.mendixnative.react.splash.MendixSplashScreenPresenter
-import com.mendix.mendixnative.util.MendixBackwardsCompatUtility
+import java.io.Serializable
 
 open class MendixReactActivity : ReactActivity(), DevAppMenuHandler, LaunchScreenHandler {
 
@@ -24,7 +24,7 @@ open class MendixReactActivity : ReactActivity(), DevAppMenuHandler, LaunchScree
 
   override fun onCreate(savedInstanceState: Bundle?) {
     mendixApp = mendixApp
-      ?: intent.getSerializableExtra(MENDIX_APP_INTENT_KEY) as? MendixApp
+      ?: getSerializableData(MENDIX_APP_INTENT_KEY, MendixApp::class.java)
         ?: throw IllegalStateException("MendixApp configuration can't be null")
     val mendixApplication = application as? MendixApplication
       ?: throw ClassCastException("Application needs to implement MendixApplication")
@@ -36,6 +36,19 @@ open class MendixReactActivity : ReactActivity(), DevAppMenuHandler, LaunchScree
     super.onCreate(null)
   }
 
+  inline fun <reified T : Serializable> getSerializableData(key: String?, clazz: Class<T>): T? {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      intent.getSerializableExtra<T?>(key, clazz)
+    } else {
+      @Suppress("DEPRECATION")
+      val data = intent.getSerializableExtra(key)
+      if (data is T) {
+        return data
+      }
+      return null
+    }
+  }
+
   override fun onDestroy() {
     mendixInitializer.onDestroy()
     super.onDestroy()
@@ -46,12 +59,9 @@ open class MendixReactActivity : ReactActivity(), DevAppMenuHandler, LaunchScree
   }
 
   override fun showDevAppMenu() {
-    currentDevSupportManager?.showDevOptionsDialog();
+    currentDevSupportManager?.showDevOptionsDialog()
   }
 
-  private val currentReactContext: ReactContext?
-    get() = if (reactNativeHost.hasInstance()) reactInstanceManager.currentReactContext else null
-
   val currentDevSupportManager: DevSupportManager?
     get() = reactHost.devSupportManager
 
@@ -70,9 +80,7 @@ open class MendixReactActivity : ReactActivity(), DevAppMenuHandler, LaunchScree
   }
 
   override fun showLaunchScreen() {
-    if (!MendixBackwardsCompatUtility.getInstance().unsupportedFeatures.hideSplashScreenInClient && splashScreenPresenter != null) {
-      splashScreenPresenter?.show(this)
-    }
+    splashScreenPresenter?.show(this)
   }
 
   override fun hideLaunchScreen() {

android/src/main/java/com/mendix/mendixnative/activity/MendixReactActivity.kt

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.mendix.mendixnative.config.AppUrl
 import okhttp3.*
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.RequestBody.Companion.toRequestBody
 import java.io.IOException
 import java.util.concurrent.TimeUnit
 
@@ -22,10 +23,7 @@ fun getRuntimeInfo(runtimeUrl: String, cb: (info: RuntimeInfoResponse) -> Unit)
   client.newCall(
     Request.Builder()
       .post(
-        RequestBody.create(
-          "application/json; charset=utf-8".toMediaTypeOrNull(),
-          "{\"action\":\"info\"}"
-        )
+        "{\"action\":\"info\"}".toRequestBody("application/json; charset=utf-8".toMediaTypeOrNull())
       )
       .url(AppUrl.removeTrailingSlash(AppUrl.ensureProtocol(runtimeUrl)) + "/xas/")
       .build()

android/src/main/java/com/mendix/mendixnative/api/RuntimeInfo.kt

@@ -1,6 +1,7 @@
 package com.mendix.mendixnative.fragment
 
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
 import com.facebook.react.devsupport.interfaces.DevSupportManager
@@ -9,6 +10,7 @@ import com.mendix.mendixnative.MendixInitializer
 import com.mendix.mendixnative.activity.LaunchScreenHandler
 import com.mendix.mendixnative.react.MendixApp
 import com.mendix.mendixnative.util.MendixDoubleTapRecognizer
+import java.io.Serializable
 
 /**
  * Class used for Sample apps
@@ -54,7 +56,7 @@ open class MendixReactFragment : ReactFragment(), MendixReactFragmentView {
     }
 
     if (mendixApp == null) {
-      mendixApp = requireArguments().getSerializable(ARG_MENDIX_APP) as MendixApp?
+      mendixApp = getSerializableData(ARG_MENDIX_APP, MendixApp::class.java)
         ?: throw IllegalArgumentException("Mendix app is required")
     }
 
@@ -73,9 +75,22 @@ open class MendixReactFragment : ReactFragment(), MendixReactFragmentView {
     super.onCreate(savedInstanceState)
   }
 
+  inline fun <reified T : Serializable> getSerializableData(key: String?, clazz: Class<T>): T? {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      requireArguments().getSerializable<T?>(key, clazz)
+    } else {
+      @Suppress("DEPRECATION")
+      val data = requireArguments().getSerializable(key)
+      if (data is T) {
+        return data
+      }
+      return null
+    }
+  }
+
   fun onNewIntent(intent: Intent) {
-    if (reactNativeHost.hasInstance()) {
-      reactNativeHost.reactInstanceManager.onNewIntent(intent);
+    reactHost?.currentReactContext?.let {
+      it.onNewIntent(it.currentActivity, intent)
     }
   }
 
@@ -84,7 +99,7 @@ open class MendixReactFragment : ReactFragment(), MendixReactFragmentView {
     super.onDestroy()
   }
 
-  override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
+  override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
     if (keyCode == KeyEvent.KEYCODE_MENU || doubleTapReloadRecognizer.didDoubleTapBacktick(
         keyCode,
         view
@@ -100,7 +115,7 @@ open class MendixReactFragment : ReactFragment(), MendixReactFragmentView {
 
   override fun showDevAppMenu() {
     activity?.let {
-      currentDevSupportManager?.showDevOptionsDialog();
+      currentDevSupportManager?.showDevOptionsDialog()
     }
   }
 
@@ -109,7 +124,7 @@ open class MendixReactFragment : ReactFragment(), MendixReactFragmentView {
 }
 
 interface MendixReactFragmentView : DevAppMenuHandler, BackButtonHandler {
-  fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean
+  fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean
 }
 
 interface BackButtonHandler {