Hide context menus when window activation state changes (#1906)

Author: MortimerGoro

app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java

@@ -570,14 +570,21 @@ public void setActiveWindow(boolean active) {
             updateTitleBar();
         }
 
-        if (mContextMenu != null) {
-            mContextMenu.hide(REMOVE_WIDGET);
-        }
+        hideContextMenus();
 
         TelemetryWrapper.activePlacementEvent(mWindowPlacement.getValue(), mActive);
         updateBorder();
     }
 
+    private void hideContextMenus() {
+        if (mContextMenu != null && mContextMenu.isVisible()) {
+            mContextMenu.hide(REMOVE_WIDGET);
+        }
+        if (mLibraryItemContextMenu != null && mLibraryItemContextMenu.isVisible()) {
+            mLibraryItemContextMenu.hide(REMOVE_WIDGET);
+        }
+    }
+
     private void updateTitleBar() {
         if (isBookmarksVisible()) {
             updateTitleBarUrl(getResources().getString(R.string.url_bookmarks_title));
@@ -1200,9 +1207,7 @@ private int getWindowWidth(float aWorldWidth) {
     private void showLibraryItemContextMenu(@NotNull View view, LibraryItemContextMenu.LibraryContextMenuItem item, boolean isLastVisibleItem) {
         view.requestFocusFromTouch();
 
-        if (mLibraryItemContextMenu != null) {
-            mLibraryItemContextMenu.hide(REMOVE_WIDGET);
-        }
+        hideContextMenus();
 
         float ratio = WidgetPlacement.viewToWidgetRatio(getContext(), WindowWidget.this);
 
@@ -1233,19 +1238,19 @@ private void showLibraryItemContextMenu(@NotNull View view, LibraryItemContextMe
             @Override
             public void onOpenInNewWindowClick(LibraryItemContextMenu.LibraryContextMenuItem item) {
                 mWidgetManager.openNewWindow(item.getUrl());
-                mLibraryItemContextMenu.hide(REMOVE_WIDGET);
+                hideContextMenus();
             }
 
             @Override
             public void onAddToBookmarks(LibraryItemContextMenu.LibraryContextMenuItem item) {
                 SessionStore.get().getBookmarkStore().addBookmark(item.getUrl(), item.getTitle());
-                mLibraryItemContextMenu.hide(REMOVE_WIDGET);
+                hideContextMenus();
             }
 
             @Override
             public void onRemoveFromBookmarks(LibraryItemContextMenu.LibraryContextMenuItem item) {
                 SessionStore.get().getBookmarkStore().deleteBookmarkByURL(item.getUrl());
-                mLibraryItemContextMenu.hide(REMOVE_WIDGET);
+                hideContextMenus();
             }
         }));
         mLibraryItemContextMenu.show(REQUEST_FOCUS);
@@ -1425,9 +1430,7 @@ public void dismiss() {
     public void onContextMenu(GeckoSession session, int screenX, int screenY, ContextElement element) {
         TelemetryWrapper.longPressContextMenuEvent();
 
-        if (mContextMenu != null) {
-            mContextMenu.hide(REMOVE_WIDGET);
-        }
+        hideContextMenus();
 
         mContextMenu = new ContextMenuWidget(getContext());
         mContextMenu.mWidgetPlacement.parentHandle = getHandle();