Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Fixes #2725 Do not show the share button for private session in the tabs view #2732

Merged
bluemarvin merged 2 commits into from
Feb 6, 2020
Merged

Fixes #2725 Do not show the share button for private session in the tabs view #2732

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a96ce3d
Do not show the share button for private session in the tabs view
keianhzo Feb 3, 2020
5d4b4ed
Only avoid sharing if is the private home
keianhzo Feb 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion app/src/common/shared/org/mozilla/vrbrowser/ui/views/TabView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public class TabView extends RelativeLayout implements GeckoSession.ContentDeleg
protected boolean mPressed;
protected CompletableFuture<Bitmap> mBitmapFuture;
protected boolean mUsingPlaceholder;
private boolean mIsPrivateMode;
private static final int ICON_ANIMATION_DURATION = 100;

public interface Delegate {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down
3 changes: 3 additions & 0 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TabsWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down