Skip to content

Refactor ReactDelegate to provide DevSupportManager #43520

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

Closed
arushikesarwani94 wants to merge 1 commit into from
Closed

Refactor ReactDelegate to provide DevSupportManager #43520

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
25 changes: 16 additions & 9 deletions packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,20 @@ public ReactDelegate(
mReactNativeHost = reactNativeHost;
}

@Nullable
private DevSupportManager getDevSupportManager() {
if (ReactFeatureFlags.enableBridgelessArchitecture
&& mReactHost != null
&& mReactHost.getDevSupportManager() != null) {
return mReactHost.getDevSupportManager();
} else if (getReactNativeHost().hasInstance()
&& getReactNativeHost().getUseDeveloperSupport()) {
return getReactNativeHost().getReactInstanceManager().getDevSupportManager();
} else {
return null;
}
}

public void onHostResume() {
if (!(mActivity instanceof DefaultHardwareBackBtnHandler)) {
throw new ClassCastException(
Expand Down Expand Up @@ -258,15 +272,8 @@ protected ReactRootView createRootView() {
* application.
*/
public boolean shouldShowDevMenuOrReload(int keyCode, KeyEvent event) {
DevSupportManager devSupportManager = null;
if (ReactFeatureFlags.enableBridgelessArchitecture
&& mReactHost != null
&& mReactHost.getDevSupportManager() != null) {
devSupportManager = mReactHost.getDevSupportManager();
} else if (getReactNativeHost().hasInstance()
&& getReactNativeHost().getUseDeveloperSupport()) {
devSupportManager = getReactNativeHost().getReactInstanceManager().getDevSupportManager();
} else {
DevSupportManager devSupportManager = getDevSupportManager();
if (devSupportManager == null) {
return false;
}

Expand Down