From a96ce3d40516b1db85c1a4a1f4543973e7a7ed61 Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Mon, 3 Feb 2020 16:47:49 +0100 Subject: [PATCH 1/2] Do not show the share button for private session in the tabs view --- .../shared/org/mozilla/vrbrowser/ui/views/TabView.java | 7 ++++++- .../org/mozilla/vrbrowser/ui/widgets/TabsWidget.java | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/TabView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/TabView.java index 90b1ca06f..c8b6a232c 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/TabView.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/TabView.java @@ -50,6 +50,7 @@ public class TabView extends RelativeLayout implements GeckoSession.ContentDeleg protected boolean mPressed; protected CompletableFuture mBitmapFuture; protected boolean mUsingPlaceholder; + private boolean mIsPrivateMode; private static final int ICON_ANIMATION_DURATION = 100; public interface Delegate { @@ -215,6 +216,10 @@ public void setActive(boolean aActive) { } } + public void setPrivate(boolean privateMode) { + mIsPrivateMode = privateMode; + } + @Override public void setSelected(boolean selected) { super.setSelected(selected); @@ -250,7 +255,7 @@ private void updateState() { boolean selected = isSelected(); mCloseButton.setVisibility(interacted && !selected && !mSelecting ? View.VISIBLE : View.GONE); - mSendTabButton.setVisibility(interacted && !selected && !mSelecting ? View.VISIBLE : View.GONE); + mSendTabButton.setVisibility(interacted && !selected && !mSelecting && !mIsPrivateMode ? View.VISIBLE : View.GONE); mTitle.setVisibility(interacted && !selected ? View.VISIBLE : View.GONE); mTabOverlay.setPressed(mPressed); if (mSelecting) { diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TabsWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TabsWidget.java index 47d70b46d..0c0fa569f 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TabsWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TabsWidget.java @@ -234,6 +234,9 @@ public void onBindViewHolder(MyViewHolder holder, int position) { holder.tabView.setSelecting(mSelecting); holder.tabView.setSelected(mSelectedTabs.contains(holder.tabView.getSession())); holder.tabView.setActive(SessionStore.get().getActiveSession() == holder.tabView.getSession()); + if (holder.tabView.getSession() != null) { + holder.tabView.setPrivate(holder.tabView.getSession().isPrivateMode()); + } holder.tabView.setDelegate(new TabView.Delegate() { @Override public void onClose(TabView aSender) { From 5d4b4ed26e2caff3a2564b955acbf0e80275338b Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Wed, 5 Feb 2020 10:43:11 +0100 Subject: [PATCH 2/2] Only avoid sharing if is the private home --- .../shared/org/mozilla/vrbrowser/ui/widgets/TabsWidget.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TabsWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TabsWidget.java index 0c0fa569f..7a81bcd67 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TabsWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TabsWidget.java @@ -21,6 +21,7 @@ import org.mozilla.vrbrowser.ui.widgets.dialogs.SendTabDialogWidget; import org.mozilla.vrbrowser.ui.widgets.dialogs.UIDialog; import org.mozilla.vrbrowser.utils.BitmapCache; +import org.mozilla.vrbrowser.utils.UrlUtils; import java.util.ArrayList; @@ -235,7 +236,7 @@ public void onBindViewHolder(MyViewHolder holder, int position) { holder.tabView.setSelected(mSelectedTabs.contains(holder.tabView.getSession())); holder.tabView.setActive(SessionStore.get().getActiveSession() == holder.tabView.getSession()); if (holder.tabView.getSession() != null) { - holder.tabView.setPrivate(holder.tabView.getSession().isPrivateMode()); + holder.tabView.setPrivate(UrlUtils.isPrivateAboutPage(getContext(), holder.tabView.getSession().getCurrentUri())); } holder.tabView.setDelegate(new TabView.Delegate() { @Override