Skip to content

Commit

Permalink
Refactor: Stop having DevSupportManager conform to PackagerCommandLis…
Browse files Browse the repository at this point in the history
…tener

Summary:
## Rationale
The public methods of PackagerCommandListener should not be a part of the public API of DevSupportManagerBase. It's cleaner to just create a new PackagerCommandListener object inline, when we need it. This way, there're are less methods to think about when reasoning about the public API of DevSupportManagerBase.

Changelog: [Internal]

Reviewed By: JoshuaGross

Differential Revision: D29006835

fbshipit-source-id: 0eea86c22e7d676c94d29b240a1f39955d8216ab
  • Loading branch information
RSNara authored and facebook-github-bot committed Jun 10, 2021
1 parent 675e480 commit 1d14df2
Showing 1 changed file with 54 additions and 52 deletions.
Expand Up @@ -60,7 +60,7 @@
import java.util.Locale;
import java.util.Map;

public abstract class DevSupportManagerBase implements DevSupportManager, PackagerCommandListener {
public abstract class DevSupportManagerBase implements DevSupportManager {

public interface CallbackWithBundleLoader {
void onSuccess(JSBundleLoader bundleLoader);
Expand Down Expand Up @@ -966,56 +966,6 @@ public void run() {
return mLastErrorType;
}

@Override
public void onPackagerConnected() {
// No-op
}

@Override
public void onPackagerDisconnected() {
// No-op
}

@Override
public void onPackagerReloadCommand() {
// Disable debugger to resume the JsVM & avoid thread locks while reloading
mDevServerHelper.disableDebugger();
UiThreadUtil.runOnUiThread(
new Runnable() {
@Override
public void run() {
handleReloadJS();
}
});
}

@Override
public void onPackagerDevMenuCommand() {
UiThreadUtil.runOnUiThread(
new Runnable() {
@Override
public void run() {
showDevOptionsDialog();
}
});
}

@Override
public void onCaptureHeapCommand(final Responder responder) {
UiThreadUtil.runOnUiThread(
new Runnable() {
@Override
public void run() {
handleCaptureHeap(responder);
}
});
}

@Override
public @Nullable Map<String, RequestHandler> customCommandHandlers() {
return mCustomPackagerCommandHandlers;
}

private void handleCaptureHeap(final Responder responder) {
if (mCurrentContext == null) {
return;
Expand Down Expand Up @@ -1240,7 +1190,59 @@ private void reload() {
mDevLoadingViewController.showMessage("Reloading...");
}

mDevServerHelper.openPackagerConnection(this.getClass().getSimpleName(), this);
mDevServerHelper.openPackagerConnection(
this.getClass().getSimpleName(),
new PackagerCommandListener() {
@Override
public void onPackagerConnected() {
// No-op
}

@Override
public void onPackagerDisconnected() {
// No-op
}

@Override
public void onPackagerReloadCommand() {
// Disable debugger to resume the JsVM & avoid thread locks while reloading
mDevServerHelper.disableDebugger();
UiThreadUtil.runOnUiThread(
new Runnable() {
@Override
public void run() {
handleReloadJS();
}
});
}

@Override
public void onPackagerDevMenuCommand() {
UiThreadUtil.runOnUiThread(
new Runnable() {
@Override
public void run() {
showDevOptionsDialog();
}
});
}

@Override
public void onCaptureHeapCommand(final Responder responder) {
UiThreadUtil.runOnUiThread(
new Runnable() {
@Override
public void run() {
handleCaptureHeap(responder);
}
});
}

@Override
public @Nullable Map<String, RequestHandler> customCommandHandlers() {
return mCustomPackagerCommandHandlers;
}
});
} else {
// hide FPS debug overlay
if (mDebugOverlayController != null) {
Expand Down

0 comments on commit 1d14df2

Please sign in to comment.