reapply 65fdcab

Author: alanjhughes

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactDelegate.java

@@ -274,7 +274,7 @@ public void reload() {
     }
 
     // Reload in DEBUG mode
-    devSupportManager.handleReloadJS();
+    devSupportManager.reloadExpoApp();
   }
 
   /** Start the React surface with the app key supplied in the {@link ReactDelegate} constructor. */

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.kt

@@ -300,23 +300,47 @@ public abstract class DevSupportManagerBase(
     }
   }
 
+  private fun getExponentActivityId(): Int {
+    return -1
+  }
+
+  override fun reloadExpoApp() {
+    try {
+      val clazz = Class.forName("host.exp.exponent.ReactNativeStaticHelpers")
+      val method = clazz.getMethod("reloadFromManifest", Int::class.javaPrimitiveType)
+      method.invoke(null, getExponentActivityId())
+    } catch (expoHandleErrorException: Exception) {
+      expoHandleErrorException.printStackTrace()
+
+      // reloadExpoApp replaces handleReloadJS in some places
+      // where in Expo we would like to reload from manifest.
+      // If so, if anything goes wrong here, we can fall back
+      // to plain JS reload.
+
+      // NOTE(brentvatne): rather than reload just JS we need to reload the entire project from manifest
+      reloadExpoApp()
+    }
+  }
+
+
   override fun showDevOptionsDialog() {
     if (devOptionsDialog != null || !isDevSupportEnabled || ActivityManager.isUserAMonkey()) {
       return
     }
     val options = LinkedHashMap<String, DevOptionHandler>()
     val disabledItemKeys: MutableSet<String?> = HashSet() /* register standard options */
-    options[applicationContext.getString(R.string.catalyst_reload)] = DevOptionHandler {
-      if (!devSettings.isJSDevModeEnabled && devSettings.isHotModuleReplacementEnabled) {
-        Toast.makeText(
-                applicationContext,
-                applicationContext.getString(R.string.catalyst_hot_reloading_auto_disable),
-                Toast.LENGTH_LONG)
-            .show()
-        devSettings.isHotModuleReplacementEnabled = false
-      }
-      handleReloadJS()
-    }
+    // NOTE(brentvatne): This option does not make sense for Expo
+//    options[applicationContext.getString(R.string.catalyst_reload)] = DevOptionHandler {
+//      if (!devSettings.isJSDevModeEnabled && devSettings.isHotModuleReplacementEnabled) {
+//        Toast.makeText(
+//                applicationContext,
+//                applicationContext.getString(R.string.catalyst_hot_reloading_auto_disable),
+//                Toast.LENGTH_LONG)
+//            .show()
+//        devSettings.isHotModuleReplacementEnabled = false
+//      }
+//      handleReloadJS()
+//    }
 
     if (devSettings.isDeviceDebugEnabled) {
       // On-device JS debugging (CDP). Render action to open debugger frontend.
@@ -369,15 +393,16 @@ public abstract class DevSupportManagerBase(
           reactContext.getJSModule(HMRClient::class.java)?.disable()
         }
       }
-      if (nextEnabled && !devSettings.isJSDevModeEnabled) {
-        Toast.makeText(
-                applicationContext,
-                applicationContext.getString(R.string.catalyst_hot_reloading_auto_enable),
-                Toast.LENGTH_LONG)
-            .show()
-        devSettings.isJSDevModeEnabled = true
-        handleReloadJS()
-      }
+      // NOTE(brentvatne): This option does not make sense for Expo
+//      if (nextEnabled && !devSettings.isJSDevModeEnabled) {
+//        Toast.makeText(
+//                applicationContext,
+//                applicationContext.getString(R.string.catalyst_hot_reloading_auto_enable),
+//                Toast.LENGTH_LONG)
+//            .show()
+//        devSettings.isJSDevModeEnabled = true
+//        handleReloadJS()
+//      }
     }
 
     val fpsDebugLabel =
@@ -396,11 +421,12 @@ public abstract class DevSupportManagerBase(
       }
       devSettings.isFpsDebugEnabled = !devSettings.isFpsDebugEnabled
     }
-    options[applicationContext.getString(R.string.catalyst_settings)] = DevOptionHandler {
-      val intent = Intent(applicationContext, DevSettingsActivity::class.java)
-      intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-      applicationContext.startActivity(intent)
-    }
+    // NOTE(brentvatne): This option does not make sense for Expo
+//    options[applicationContext.getString(R.string.catalyst_settings)] = DevOptionHandler {
+//      val intent = Intent(applicationContext, DevSettingsActivity::class.java)
+//      intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+//      applicationContext.startActivity(intent)
+//    }
 
     if (customDevOptions.isNotEmpty()) {
       options.putAll(customDevOptions)
@@ -752,6 +778,7 @@ public abstract class DevSupportManagerBase(
     }
   }
 
+  // NOTE(brentvatne): this is confusingly called the first time the app loads!
   private fun reload() {
     UiThreadUtil.assertOnUiThread()
 
@@ -797,7 +824,11 @@ public abstract class DevSupportManagerBase(
                 // Disable debugger to resume the JsVM & avoid thread locks while reloading
                 devServerHelper.disableDebugger()
               }
-              UiThreadUtil.runOnUiThread { handleReloadJS() }
+              UiThreadUtil.runOnUiThread {
+                // NOTE(brentvatne): rather than reload just JS we need to reload the entire project from manifest
+                // handleReloadJS();
+                reloadExpoApp();
+              }
             }
 
             override fun onPackagerDevMenuCommand() {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxContentView.kt

@@ -199,7 +199,7 @@ internal class RedBoxContentView(
         }
 
     findViewById<Button>(R.id.rn_redbox_reload_button).setOnClickListener {
-      devSupportManager.handleReloadJS()
+      devSupportManager.reloadExpoApp()
     }
     findViewById<Button>(R.id.rn_redbox_dismiss_button).setOnClickListener {
       devSupportManager.hideRedboxDialog()

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialogSurfaceDelegate.kt

@@ -95,7 +95,7 @@ internal class RedBoxDialogSurfaceDelegate(private val devSupportManager: DevSup
                     return true
                   }
                   if (doubleTapReloadRecognizer.didDoubleTapR(keyCode, currentFocus)) {
-                    devSupportManager.handleReloadJS()
+                    devSupportManager.reloadExpoApp()
                   }
                   return super.onKeyUp(keyCode, event)
                 }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReleaseDevSupportManager.kt

@@ -97,6 +97,8 @@ public open class ReleaseDevSupportManager : DevSupportManager {
 
   public override fun handleReloadJS(): Unit = Unit
 
+  override public fun reloadExpoApp(): Unit = Unit
+
   public override fun reloadJSFromServer(bundleURL: String, callback: BundleLoadCallback): Unit =
       Unit
 

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.kt

@@ -66,6 +66,8 @@ public interface DevSupportManager : JSExceptionHandler {
 
   public fun handleReloadJS()
 
+  public fun reloadExpoApp(): Unit = Unit
+
   public fun reloadJSFromServer(bundleURL: String, callback: BundleLoadCallback)
 
   public fun isPackagerRunning(callback: PackagerStatusCallback)