Fixes #2432 Remove the option for sending private mode about page

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

@@ -48,6 +48,7 @@
 import org.mozilla.vrbrowser.utils.AnimationHelper;
 import org.mozilla.vrbrowser.utils.ConnectivityReceiver;
 import org.mozilla.vrbrowser.utils.ServoUtils;
+import org.mozilla.vrbrowser.utils.UrlUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1141,6 +1142,10 @@ private void startWidgetResize() {
     }
 
     private void showMenu() {
+        if (mAttachedWindow.getSession() == null) {
+            return;
+        }
+
         if (mHamburgerMenu != null && mHamburgerMenu.isVisible()) {
             // Release current selection menu to recreate it with different actions.
             hideMenu();
@@ -1167,21 +1172,24 @@ public void onResize() {
 
                 @Override
                 public void onSwitchMode() {
-                    int uaMode = mAttachedWindow.getSession().getUaMode();
-                    if (uaMode == GeckoSessionSettings.USER_AGENT_MODE_DESKTOP) {
-                        mHamburgerMenu.setUAMode(GeckoSessionSettings.USER_AGENT_MODE_MOBILE);
-                        mAttachedWindow.getSession().setUaMode(GeckoSessionSettings.USER_AGENT_MODE_MOBILE);
-
-                    } else {
-                        mHamburgerMenu.setUAMode(GeckoSessionSettings.USER_AGENT_MODE_DESKTOP);
-                        mAttachedWindow.getSession().setUaMode(GeckoSessionSettings.USER_AGENT_MODE_DESKTOP);
+                    if (mAttachedWindow.getSession() != null) {
+                        int uaMode = mAttachedWindow.getSession().getUaMode();
+                        if (uaMode == GeckoSessionSettings.USER_AGENT_MODE_DESKTOP) {
+                            mHamburgerMenu.setUAMode(GeckoSessionSettings.USER_AGENT_MODE_MOBILE);
+                            mAttachedWindow.getSession().setUaMode(GeckoSessionSettings.USER_AGENT_MODE_MOBILE);
+
+                        } else {
+                            mHamburgerMenu.setUAMode(GeckoSessionSettings.USER_AGENT_MODE_DESKTOP);
+                            mAttachedWindow.getSession().setUaMode(GeckoSessionSettings.USER_AGENT_MODE_DESKTOP);
+                        }
                     }
 
                     hideMenu();
                 }
             });
         }
 
+        mHamburgerMenu.setSendTabEnabled(!UrlUtils.isPrivateAboutPage(getContext(), mAttachedWindow.getSession().getCurrentUri()));
         mHamburgerMenu.setUAMode(mAttachedWindow.getSession().getUaMode());
         mHamburgerMenu.show(UIWidget.KEEP_FOCUS);
     }

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

@@ -1,5 +1,6 @@
 package org.mozilla.vrbrowser.ui.widgets.menus;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.view.View;
 
@@ -13,6 +14,7 @@
 import org.mozilla.vrbrowser.utils.ViewUtils;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Optional;
 
 public class HamburgerMenuWidget extends MenuWidget implements WidgetManagerDelegate.FocusChangeListener {
@@ -29,14 +31,14 @@ public interface MenuDelegate {
     public static final int WINDOW_RESIZE = 1;
     public static final int SWITCH_MODE = 2;
 
-    ArrayList<MenuItem> mItems;
+    HashMap<Integer, MenuItem> mItems;
     @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
     Optional<MenuDelegate> mMenuDelegate;
+    boolean mSendTabEnabled = true;
 
     public HamburgerMenuWidget(Context aContext) {
         super(aContext, R.layout.hamburger_menu);
         initialize();
-        createMenuItems();
     }
 
     private void initialize() {
@@ -45,6 +47,8 @@ private void initialize() {
                 R.drawable.context_menu_item_background,
                 R.drawable.context_menu_item_background_single);
         mAdapter.updateLayoutId(R.layout.hamburger_menu_item);
+
+        updateMenuItems();
     }
 
     @Override
@@ -94,31 +98,39 @@ public void setMenuDelegate(MenuDelegate delegate) {
         mMenuDelegate = Optional.ofNullable(delegate);
     }
 
-    private void createMenuItems() {
-        mItems = new ArrayList<>();
+    @SuppressLint("UseSparseArrays")
+    private void updateMenuItems() {
+        mItems = new HashMap<>();
 
-        mItems.add(SEND_TAB,
-                new MenuItem(getContext().getString(R.string.hamburger_menu_send_tab),
-                        R.drawable.ic_icon_tabs_sendtodevice,
-                        () -> mMenuDelegate.ifPresent(MenuDelegate::onSendTab)));
+        if (mSendTabEnabled) {
+            mItems.put(SEND_TAB,
+                    new MenuItem(getContext().getString(R.string.hamburger_menu_send_tab),
+                            R.drawable.ic_icon_tabs_sendtodevice,
+                            () -> mMenuDelegate.ifPresent(MenuDelegate::onSendTab)));
+        }
 
-        mItems.add(WINDOW_RESIZE,
+        mItems.put(WINDOW_RESIZE,
                 new MenuItem(getContext().getString(R.string.hamburger_menu_resize),
                         R.drawable.ic_icon_resize,
                         () -> mMenuDelegate.ifPresent(MenuDelegate::onResize)));
 
-        mItems.add(SWITCH_MODE,
+        mItems.put(SWITCH_MODE,
                 new MenuItem(getContext().getString(R.string.hamburger_menu_switch_to_desktop),
                         R.drawable.ic_icon_ua_default,
                         () -> mMenuDelegate.ifPresent(MenuDelegate::onSwitchMode)));
 
-        super.updateMenuItems(mItems);
+        super.updateMenuItems(new ArrayList<>(mItems.values()));
 
         mWidgetPlacement.height = mItems.size() * WidgetPlacement.dpDimension(getContext(), R.dimen.hamburger_menu_item_height);
         mWidgetPlacement.height += mBorderWidth * 2;
         mWidgetPlacement.height += WidgetPlacement.dpDimension(getContext(), R.dimen.hamburger_menu_triangle_height);
     }
 
+    public void setSendTabEnabled(boolean value) {
+        mSendTabEnabled = value;
+        updateMenuItems();
+    }
+
     // FocusChangeListener
 
     @Override

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

@@ -7,7 +7,6 @@
 package org.mozilla.vrbrowser.ui.widgets.menus;
 
 import android.content.Context;
-import android.graphics.drawable.Drawable;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -184,6 +183,10 @@ public boolean onHover(View view, MotionEvent event) {
                 return false;
             }
 
+            if (mItems.size() <= position) {
+                return false;
+            }
+
             MenuItem item = mItems.get(position);
             if (item.mCallback == null) {
                 return false;

app/src/common/shared/org/mozilla/vrbrowser/utils/UrlUtils.java

@@ -5,8 +5,14 @@
 
 package org.mozilla.vrbrowser.utils;
 
+import android.content.Context;
+import android.util.Base64;
+
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.mozilla.vrbrowser.R;
+
 import java.util.regex.Pattern;
 
 
@@ -61,4 +67,10 @@ public static String stripProtocol(@Nullable String host) {
     public static boolean isDomain(String text) {
         return domainPattern.matcher(text).find();
     }
+
+    public static boolean isPrivateAboutPage(@NonNull Context context,  @NonNull String uri) {
+        InternalPages.PageResources pageResources = InternalPages.PageResources.create(R.raw.private_mode, R.raw.private_style);
+        byte[] privatePageBytes = InternalPages.createAboutPage(context, pageResources);
+        return uri.equals("data:text/html;base64," + Base64.encodeToString(privatePageBytes, Base64.NO_WRAP));
+    }
 }