Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #3658 FxA login signin fix #3663

Merged
merged 1 commit into from
Jul 10, 2020
Merged

Fixes #3658 FxA login signin fix #3663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion 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 @@ -25,6 +25,7 @@
import org.mozilla.vrbrowser.utils.UrlUtils;

import java.util.ArrayList;
import java.util.List;

public class TabsWidget extends UIDialog {
protected BitmapCache mBitmapCache;
Expand All @@ -50,7 +51,7 @@ public class TabsWidget extends UIDialog {
public interface TabDelegate {
void onTabSelect(Session aTab);
void onTabAdd();
void onTabsClose(ArrayList<Session> aTabs);
void onTabsClose(List<Session> aTabs);
}

public TabsWidget(Context aContext) {
Expand Down
55 changes: 40 additions & 15 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
import java.io.Writer;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -677,13 +679,17 @@ void updateMaxWindowScales() {
}
}

public ArrayList<WindowWidget> getCurrentWindows(boolean privateMode) {
return privateMode ? mPrivateWindows : mRegularWindows;
}

public ArrayList<WindowWidget> getCurrentWindows() {
return mPrivateMode ? mPrivateWindows : mRegularWindows;
return getCurrentWindows(mPrivateMode);
}

@Nullable
private WindowWidget getWindowWithPlacement(WindowPlacement aPlacement) {
for (WindowWidget window: getCurrentWindows()) {
private WindowWidget getWindowWithPlacement(WindowPlacement aPlacement, boolean privateMode) {
for (WindowWidget window: privateMode ? mPrivateWindows : mRegularWindows) {
if (window.getWindowPlacement() == aPlacement) {
return window;
}
Expand All @@ -692,11 +698,21 @@ private WindowWidget getWindowWithPlacement(WindowPlacement aPlacement) {
}

@Nullable
private WindowWidget getFrontWindow() {
private WindowWidget getWindowWithPlacement(WindowPlacement aPlacement) {
return getWindowWithPlacement(aPlacement, mPrivateMode);
}

@Nullable
private WindowWidget getFrontWindow(boolean privateMode) {
if (mFullscreenWindow != null) {
return mFullscreenWindow;
}
return getWindowWithPlacement(WindowPlacement.FRONT);
return getWindowWithPlacement(WindowPlacement.FRONT, privateMode);
}

@Nullable
private WindowWidget getFrontWindow() {
return getFrontWindow(mPrivateMode);
}

@Nullable
Expand Down Expand Up @@ -993,7 +1009,9 @@ public void onAuthenticated(@NonNull OAuthAccount oAuthAccount, @NonNull AuthTyp

Session fxaSession = SessionStore.get().getSession(mAccounts.getOriginSessionId());
if (fxaSession != null) {
fxaSession.loadUri(mAccounts.getConnectionSuccessURL(), GeckoSession.LOAD_FLAGS_REPLACE_HISTORY);
Session originSession = SessionStore.get().getSession(fxaSession.getId());
closeTabs(Collections.singletonList(originSession), fxaSession.isPrivateMode());
addTab(getFocusedWindow(), mAccounts.getConnectionSuccessURL());
}

switch (mAccounts.getLoginOrigin()) {
Expand Down Expand Up @@ -1182,15 +1200,20 @@ private WindowWidget getWindowWithSession(GeckoSession aSession) {
}

@Nullable
private WindowWidget getWindowWithSession(Session aSession) {
for (WindowWidget window: getCurrentWindows()) {
private WindowWidget getWindowWithSession(Session aSession, boolean privateMode) {
for (WindowWidget window: getCurrentWindows(privateMode)) {
if (window.getSession() == aSession) {
return window;
}
}
return null;
}

@Nullable
private WindowWidget getWindowWithSession(Session aSession) {
return getWindowWithSession(aSession, mPrivateMode);
}

// WindowWidget.Delegate
@Override
public void onFocusRequest(@NonNull WindowWidget aWindow) {
Expand Down Expand Up @@ -1298,8 +1321,6 @@ public void addTab(@NonNull WindowWidget targetWindow, @Nullable String aUri) {
targetWindow.setSession(session, WindowWidget.DEACTIVATE_CURRENT_SESSION);
if (aUri == null || aUri.isEmpty()) {
session.loadHomePage();
} else {
session.loadUri(aUri);
}
}

Expand All @@ -1317,16 +1338,20 @@ public void onTabAdd() {
}

@Override
public void onTabsClose(ArrayList<Session> aTabs) {
public void onTabsClose(List<Session> aTabs) {
closeTabs(aTabs, mPrivateMode);
}

private void closeTabs(List<Session> aTabs, boolean privateMode) {
WindowWidget targetWindow = mFocusedWindow;
// Prepare available tabs to choose from
ArrayList<Session> available = SessionStore.get().getSortedSessions(mPrivateMode);
ArrayList<Session> available = SessionStore.get().getSortedSessions(privateMode);
available.removeAll(aTabs);
available.removeIf(session -> getWindowWithSession(session) != null);
available.removeIf(session -> getWindowWithSession(session, privateMode) != null);

// Sort windows by priority to take an available tab
WindowWidget front = getFrontWindow();
ArrayList<WindowWidget> windows = new ArrayList<>(getCurrentWindows());
WindowWidget front = getFrontWindow(privateMode);
ArrayList<WindowWidget> windows = getCurrentWindows(privateMode);
windows.sort((w1, w2) -> {
// Max priority for the target window
if (w1 == targetWindow) {
Expand Down