Skip to content

Commit 86cd31e

Browse files
javachefacebook-github-bot
authored andcommitted
Remove unused loadSplitBundleFromServer
Summary: This code is not referenced internally or externally and was part of the DevSplitBundleLoader which was removed in D43597007. Changelog: [Android][Breaking][Removed] Removed loadSplitBundleFromServer from DevSupportManager interface Reviewed By: cortinico Differential Revision: D72790533 fbshipit-source-id: 9e0960af4c528d9019943c89466ab442f34619e1
1 parent bf8d6da commit 86cd31e

File tree

6 files changed

+0
-79
lines changed

6 files changed

+0
-79
lines changed

packages/react-native/ReactAndroid/api/ReactAndroid.api

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,7 +1936,6 @@ public final class com/facebook/react/defaults/DefaultTurboModuleManagerDelegate
19361936
public final class com/facebook/react/devsupport/BridgeDevSupportManager : com/facebook/react/devsupport/DevSupportManagerBase {
19371937
public fun <init> (Landroid/content/Context;Lcom/facebook/react/devsupport/ReactInstanceDevHelper;Ljava/lang/String;ZLcom/facebook/react/devsupport/interfaces/RedBoxHandler;Lcom/facebook/react/devsupport/interfaces/DevBundleDownloadListener;ILjava/util/Map;Lcom/facebook/react/common/SurfaceDelegateFactory;Lcom/facebook/react/devsupport/interfaces/DevLoadingViewManager;Lcom/facebook/react/devsupport/interfaces/PausedInDebuggerOverlayManager;)V
19381938
public fun handleReloadJS ()V
1939-
public fun loadSplitBundleFromServer (Ljava/lang/String;Lcom/facebook/react/devsupport/interfaces/DevSplitBundleCallback;)V
19401939
}
19411940

19421941
public final class com/facebook/react/devsupport/BundleDownloader {
@@ -2125,7 +2124,6 @@ public class com/facebook/react/devsupport/ReleaseDevSupportManager : com/facebo
21252124
public fun hidePausedInDebuggerOverlay ()V
21262125
public fun hideRedboxDialog ()V
21272126
public fun isPackagerRunning (Lcom/facebook/react/devsupport/interfaces/PackagerStatusCallback;)V
2128-
public fun loadSplitBundleFromServer (Ljava/lang/String;Lcom/facebook/react/devsupport/interfaces/DevSplitBundleCallback;)V
21292127
public fun onNewReactContextCreated (Lcom/facebook/react/bridge/ReactContext;)V
21302128
public fun onReactInstanceDestroyed (Lcom/facebook/react/bridge/ReactContext;)V
21312129
public fun openDebugger ()V
@@ -2202,11 +2200,6 @@ public abstract interface class com/facebook/react/devsupport/interfaces/DevOpti
22022200
public abstract fun onOptionSelected ()V
22032201
}
22042202

2205-
public abstract interface class com/facebook/react/devsupport/interfaces/DevSplitBundleCallback {
2206-
public abstract fun onError (Ljava/lang/String;Ljava/lang/Throwable;)V
2207-
public abstract fun onSuccess ()V
2208-
}
2209-
22102203
public abstract interface class com/facebook/react/devsupport/interfaces/DevSupportManager : com/facebook/react/bridge/JSExceptionHandler {
22112204
public abstract fun addCustomDevOption (Ljava/lang/String;Lcom/facebook/react/devsupport/interfaces/DevOptionHandler;)V
22122205
public abstract fun createRootView (Ljava/lang/String;)Landroid/view/View;
@@ -2230,7 +2223,6 @@ public abstract interface class com/facebook/react/devsupport/interfaces/DevSupp
22302223
public abstract fun hidePausedInDebuggerOverlay ()V
22312224
public abstract fun hideRedboxDialog ()V
22322225
public abstract fun isPackagerRunning (Lcom/facebook/react/devsupport/interfaces/PackagerStatusCallback;)V
2233-
public abstract fun loadSplitBundleFromServer (Ljava/lang/String;Lcom/facebook/react/devsupport/interfaces/DevSplitBundleCallback;)V
22342226
public abstract fun onNewReactContextCreated (Lcom/facebook/react/bridge/ReactContext;)V
22352227
public abstract fun onReactInstanceDestroyed (Lcom/facebook/react/bridge/ReactContext;)V
22362228
public abstract fun openDebugger ()V

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

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import android.content.Context
1111
import com.facebook.debug.holder.PrinterHolder.printer
1212
import com.facebook.debug.tags.ReactDebugOverlayTags
1313
import com.facebook.infer.annotation.Assertions
14-
import com.facebook.react.bridge.JSBundleLoader
1514
import com.facebook.react.bridge.ReactMarker
1615
import com.facebook.react.bridge.ReactMarkerConstants
1716
import com.facebook.react.bridge.UiThreadUtil
@@ -21,7 +20,6 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel
2120
import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger.assertLegacyArchitecture
2221
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener
2322
import com.facebook.react.devsupport.interfaces.DevLoadingViewManager
24-
import com.facebook.react.devsupport.interfaces.DevSplitBundleCallback
2523
import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager
2624
import com.facebook.react.devsupport.interfaces.RedBoxHandler
2725
import com.facebook.react.packagerconnection.RequestHandler
@@ -77,26 +75,6 @@ public class BridgeDevSupportManager(
7775
override val uniqueTag: String
7876
get() = "Bridge"
7977

80-
override fun loadSplitBundleFromServer(bundlePath: String, callback: DevSplitBundleCallback) {
81-
fetchSplitBundleAndCreateBundleLoader(
82-
bundlePath,
83-
object : CallbackWithBundleLoader {
84-
override fun onSuccess(bundleLoader: JSBundleLoader) {
85-
val context =
86-
requireNotNull(currentReactContext) {
87-
"Failed to load split bundle from server due to DevSupportManager.currentReactContext being null"
88-
}
89-
bundleLoader.loadScript(context.catalystInstance)
90-
context
91-
.getJSModule(HMRClient::class.java)
92-
.registerBundle(devServerHelper.getDevServerSplitBundleURL(bundlePath))
93-
callback.onSuccess()
94-
}
95-
96-
override fun onError(url: String, cause: Throwable) = callback.onError(url, cause)
97-
})
98-
}
99-
10078
override fun handleReloadJS() {
10179
UiThreadUtil.assertOnUiThread()
10280
ReactMarker.logMarker(

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@
88
package com.facebook.react.devsupport
99

1010
import android.content.Context
11-
import com.facebook.react.bridge.JSBundleLoader
1211
import com.facebook.react.bridge.UiThreadUtil
1312
import com.facebook.react.common.SurfaceDelegateFactory
1413
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener
1514
import com.facebook.react.devsupport.interfaces.DevLoadingViewManager
16-
import com.facebook.react.devsupport.interfaces.DevSplitBundleCallback
1715
import com.facebook.react.devsupport.interfaces.DevSupportManager
1816
import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager
1917
import com.facebook.react.devsupport.interfaces.RedBoxHandler
@@ -74,28 +72,6 @@ internal class BridgelessDevSupportManager(
7472
override val uniqueTag: String
7573
get() = "Bridgeless"
7674

77-
override fun loadSplitBundleFromServer(bundlePath: String, callback: DevSplitBundleCallback) {
78-
fetchSplitBundleAndCreateBundleLoader(
79-
bundlePath,
80-
object : CallbackWithBundleLoader {
81-
override fun onSuccess(bundleLoader: JSBundleLoader) {
82-
try {
83-
reactInstanceDevHelper.loadBundle(bundleLoader).waitForCompletion()
84-
val bundleURL = devServerHelper.getDevServerSplitBundleURL(bundlePath)
85-
val reactContext = reactInstanceDevHelper.currentReactContext
86-
reactContext?.getJSModule(HMRClient::class.java)?.registerBundle(bundleURL)
87-
callback.onSuccess()
88-
} catch (e: InterruptedException) {
89-
Thread.currentThread().interrupt()
90-
throw RuntimeException(
91-
"[BridgelessDevSupportManager]: Got interrupted while loading bundle", e)
92-
}
93-
}
94-
95-
override fun onError(url: String, cause: Throwable) = callback.onError(url, cause)
96-
})
97-
}
98-
9975
override fun handleReloadJS() {
10076
UiThreadUtil.assertOnUiThread()
10177
// dismiss redbox if exists

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import com.facebook.react.bridge.ReadableArray
1717
import com.facebook.react.common.SurfaceDelegate
1818
import com.facebook.react.devsupport.interfaces.BundleLoadCallback
1919
import com.facebook.react.devsupport.interfaces.DevOptionHandler
20-
import com.facebook.react.devsupport.interfaces.DevSplitBundleCallback
2120
import com.facebook.react.devsupport.interfaces.DevSupportManager
2221
import com.facebook.react.devsupport.interfaces.DevSupportManager.PackagerLocationCustomizer
2322
import com.facebook.react.devsupport.interfaces.DevSupportManager.PausedInDebuggerOverlayCommandListener
@@ -101,11 +100,6 @@ public open class ReleaseDevSupportManager : DevSupportManager {
101100
public override fun reloadJSFromServer(bundleURL: String, callback: BundleLoadCallback): Unit =
102101
Unit
103102

104-
public override fun loadSplitBundleFromServer(
105-
bundlePath: String,
106-
callback: DevSplitBundleCallback
107-
): Unit = Unit
108-
109103
public override fun isPackagerRunning(callback: PackagerStatusCallback) {
110104
callback.onPackagerStatusFetched(false)
111105
}

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ public interface DevSupportManager : JSExceptionHandler {
6868

6969
public fun reloadJSFromServer(bundleURL: String, callback: BundleLoadCallback)
7070

71-
public fun loadSplitBundleFromServer(bundlePath: String, callback: DevSplitBundleCallback)
72-
7371
public fun isPackagerRunning(callback: PackagerStatusCallback)
7472

7573
public fun setHotModuleReplacementEnabled(isHotModuleReplacementEnabled: Boolean)

0 commit comments

Comments
 (0)