Skip to content

Commit

Permalink
disable "Open Debugger" menu item if the bundler is disconnected (fac…
Browse files Browse the repository at this point in the history
…ebook#42876)

Summary:

Changelog:
[Android][Fixed] Disable the "Open Debugger" item from dev menu if the bundler is disconnected

# Existing
In our dev menu, the "Open Debugger" menu item is shown even if the packager isn't connected.

{F1451833462}

# In this PR
The "Open Debugger" menu item is disabled when the packager is disconnected with the message "Connect to the bundler to debug JavaScript"

{F1451834019}

# Reference
* Also on iOS: D53354110

Differential Revision: D53428914
  • Loading branch information
EdmondChuiHW authored and facebook-github-bot committed Feb 5, 2024
1 parent 8456cca commit b577385
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,14 @@
import android.util.Pair;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.ListAdapter;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.UiThread;
import com.facebook.common.logging.FLog;
Expand Down Expand Up @@ -63,10 +67,12 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;

public abstract class DevSupportManagerBase implements DevSupportManager {

Expand Down Expand Up @@ -104,6 +110,7 @@ public interface CallbackWithBundleLoader {
private boolean mIsReceiverRegistered = false;
private boolean mIsShakeDetectorStarted = false;
private boolean mIsDevSupportEnabled = false;
private boolean mIsPackagerConnected;
private @Nullable final RedBoxHandler mRedBoxHandler;
private @Nullable String mLastErrorTitle;
private @Nullable StackFrame[] mLastErrorStack;
Expand Down Expand Up @@ -340,6 +347,7 @@ public void showDevOptionsDialog() {
return;
}
LinkedHashMap<String, DevOptionHandler> options = new LinkedHashMap<>();
Set<String> disabledItemKeys = new HashSet<>();
/* register standard options */
options.put(
mApplicationContext.getString(R.string.catalyst_reload),
Expand Down Expand Up @@ -369,8 +377,15 @@ public void onOptionSelected() {

if (mDevSettings.isDeviceDebugEnabled() && !mDevSettings.isRemoteJSDebugEnabled()) {
// On-device JS debugging (CDP). Render action to open debugger frontend.
boolean isConnected = mIsPackagerConnected;
String debuggerItemString =
mApplicationContext.getString(
isConnected ? R.string.catalyst_debug_open : R.string.catalyst_debug_open_disabled);
if (!isConnected) {
disabledItemKeys.add(debuggerItemString);
}
options.put(
mApplicationContext.getString(R.string.catalyst_debug_open),
debuggerItemString,
() ->
mDevServerHelper.openDebugger(
mCurrentContext,
Expand Down Expand Up @@ -505,11 +520,34 @@ public void onOptionSelected() {
header.addView(jsExecutorLabel);
}

ListAdapter adapter =
new ArrayAdapter<String>(
context, android.R.layout.simple_list_item_1, options.keySet().toArray(new String[0])) {
@Override
public boolean areAllItemsEnabled() {
return false;
}

@Override
public boolean isEnabled(int position) {
return !disabledItemKeys.contains(getItem(position));
}

@NonNull
@Override
public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
View view = super.getView(position, convertView, parent);
view.setEnabled(isEnabled(position));

return view;
}
};

mDevOptionsDialog =
new AlertDialog.Builder(context)
.setCustomTitle(header)
.setItems(
options.keySet().toArray(new String[0]),
.setAdapter(
adapter,
(dialog, which) -> {
optionHandlers[which].onOptionSelected();
mDevOptionsDialog = null;
Expand Down Expand Up @@ -1022,12 +1060,12 @@ private void reload() {
new PackagerCommandListener() {
@Override
public void onPackagerConnected() {
// No-op
mIsPackagerConnected = true;
}

@Override
public void onPackagerDisconnected() {
// No-op
mIsPackagerConnected = false;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<string name="catalyst_change_bundle_location" project="catalyst" translatable="false">Change Bundle Location</string>
<string name="catalyst_open_debugger_error" project="catalyst" translatable="false">Failed to open debugger. Please check that the dev server is running and reload the app.</string>
<string name="catalyst_debug_open" project="catalyst" translatable="false">Open Debugger</string>
<string name="catalyst_debug_open_disabled" project="catalyst" translatable="false">Connect to the bundler to debug JavaScript</string>
<string name="catalyst_debug_connecting" project="catalyst" translatable="false">Connecting to debugger...</string>
<string name="catalyst_debug_error" project="catalyst" translatable="false">Failed to connect to debugger!</string>
<string name="catalyst_hot_reloading" project="catalyst" translatable="false">Enable Fast Refresh</string>
Expand Down

0 comments on commit b577385

Please sign in to comment.