Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Introduce methods to show/hide DevLoadingView in DevSupportManagerBase

Browse Source 
Summary:
## Rationale

Throughout DevSupportManagerBase, we show/hide the DevLoadingView and simultaneously write to the `mDevLoadingViewVisible` boolean. This diff pulls all those boolean writes into methods, so that subclasses of DevSupportManagerBase can show/hide the DevLoadingView without accessing the boolean directly.

Changelog: [Internal]

Reviewed By: JoshuaGross

Differential Revision: D29004062

fbshipit-source-id: d54d79701e31f9ac8d1d1d44019199718fe1c8c0
This commit is contained in:
Ramanpreet Nara
2021-06-10 16:45:35 -07:00
committed by Facebook GitHub Bot
parent 30340890dc
commit 2c88459e24
1 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java
+26 -16
View File
@@ -856,8 +856,7 @@ public abstract class DevSupportManagerBase
if (mDevSettings.isRemoteJSDebugEnabled()) {
PrinterHolder.getPrinter()
.logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Proxy");
mDevLoadingViewController.showForRemoteJSEnabled();
mDevLoadingViewVisible = true;
showDevLoadingViewForRemoteJSEnabled();
reloadJSInProxyMode();
} else {
PrinterHolder.getPrinter()
@@ -872,6 +871,24 @@ public abstract class DevSupportManagerBase
return mCurrentContext;
}
@UiThread
private void showDevLoadingViewForUrl(String bundleUrl) {
mDevLoadingViewController.showForUrl(bundleUrl);
mDevLoadingViewVisible = true;
}
@UiThread
private void showDevLoadingViewForRemoteJSEnabled() {
mDevLoadingViewController.showForRemoteJSEnabled();
mDevLoadingViewVisible = true;
}
@UiThread
private void hideDevLoadingView() {
mDevLoadingViewController.hide();
mDevLoadingViewVisible = false;
}
protected DevServerHelper getDevServerHelper() {
return mDevServerHelper;
}
@@ -938,16 +955,14 @@ public abstract class DevSupportManagerBase
@UiThread
private void showSplitBundleDevLoadingView(String bundleUrl) {
mDevLoadingViewController.showForUrl(bundleUrl);
mDevLoadingViewVisible = true;
showDevLoadingViewForUrl(bundleUrl);
mPendingJSSplitBundleRequests++;
}
@UiThread
private void hideSplitBundleDevLoadingView() {
if (--mPendingJSSplitBundleRequests == 0) {
mDevLoadingViewController.hide();
mDevLoadingViewVisible = false;
hideDevLoadingView();
}
}
@@ -1105,14 +1120,12 @@ public abstract class DevSupportManagerBase
@Override
public void onSuccess() {
future.set(true);
mDevLoadingViewController.hide();
mDevLoadingViewVisible = false;
hideDevLoadingView();
}
@Override
public void onFailure(final Throwable cause) {
mDevLoadingViewController.hide();
mDevLoadingViewVisible = false;
hideDevLoadingView();
FLog.e(ReactConstants.TAG, "Failed to connect to debugger!", cause);
future.setException(
new IOException(mApplicationContext.getString(R.string.catalyst_debug_error), cause));
@@ -1140,8 +1153,7 @@ public abstract class DevSupportManagerBase
public void reloadJSFromServer(final String bundleURL, final BundleLoadCallback callback) {
ReactMarker.logMarker(ReactMarkerConstants.DOWNLOAD_START);
mDevLoadingViewController.showForUrl(bundleURL);
mDevLoadingViewVisible = true;
showDevLoadingViewForUrl(bundleURL);
final BundleDownloader.BundleInfo bundleInfo = new BundleDownloader.BundleInfo();
@@ -1149,8 +1161,7 @@ public abstract class DevSupportManagerBase
new DevBundleDownloadListener() {
@Override
public void onSuccess() {
mDevLoadingViewController.hide();
mDevLoadingViewVisible = false;
hideDevLoadingView();
synchronized (DevSupportManagerBase.this) {
mBundleStatus.isLastDownloadSucess = true;
mBundleStatus.updateTimestamp = System.currentTimeMillis();
@@ -1175,8 +1186,7 @@ public abstract class DevSupportManagerBase
@Override
public void onFailure(final Exception cause) {
mDevLoadingViewController.hide();
mDevLoadingViewVisible = false;
hideDevLoadingView();
synchronized (DevSupportManagerBase.this) {
mBundleStatus.isLastDownloadSucess = false;
}