Do not show empty selection menu (#2216)

MozillaReality · Nov 8, 2019 · 33a031c · 33a031c
1 parent 2353c72
commit 33a031c
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
@@ -57,6 +57,7 @@
 import org.mozilla.vrbrowser.ui.widgets.prompts.ConfirmPromptWidget;
 import org.mozilla.vrbrowser.ui.widgets.prompts.PromptWidget;
 import org.mozilla.vrbrowser.ui.widgets.settings.SettingsWidget;
+import org.mozilla.vrbrowser.utils.StringUtils;
 import org.mozilla.vrbrowser.utils.SystemUtils;
 import org.mozilla.vrbrowser.utils.ViewUtils;
 
@@ -1632,6 +1633,11 @@ public void onSecurityChange(GeckoSession geckoSession, SecurityInformation secu
 
     @Override
     public void onShowActionRequest(@NonNull GeckoSession aSession, @NonNull Selection aSelection, @NonNull String[] aActions, @NonNull GeckoResponse<String> aResponse) {
+        if (StringUtils.isEmpty(aSelection.text) || (aActions.length == 1 && GeckoSession.SelectionActionDelegate.ACTION_HIDE.equals(aActions[0]))) {
+            // See: https://github.com/MozillaReality/FirefoxReality/issues/2214
+            aResponse.respond(GeckoSession.SelectionActionDelegate.ACTION_HIDE);
+            return;
+        }
         TelemetryWrapper.longPressContextMenuEvent();
 
         hideContextMenus();