This repository was archived by the owner on Jul 22, 2024. It is now read-only.
File tree Expand file tree Collapse file tree 3 files changed +18
-19
lines changed
app/src/common/shared/org/mozilla/vrbrowser Expand file tree Collapse file tree 3 files changed +18
-19
lines changed Original file line number Diff line number Diff line change @@ -23,7 +23,6 @@ import mozilla.components.service.fxa.sync.SyncStatusObserver
23
23
import mozilla .components .service .fxa .sync .getLastSynced
24
24
import mozilla .components .support .base .log .logger .Logger
25
25
import org .mozilla .vrbrowser .VRBrowserApplication
26
- import org .mozilla .vrbrowser .browser .engine .SessionStore
27
26
import org .mozilla .vrbrowser .utils .SystemUtils
28
27
import java .util .concurrent .CompletableFuture
29
28
import java .util .concurrent .ExecutionException
Original file line number Diff line number Diff line change @@ -28,7 +28,6 @@ import org.mozilla.geckoview.AllowOrDeny
28
28
import org .mozilla .geckoview .GeckoResult
29
29
import org .mozilla .geckoview .GeckoSession
30
30
import org .mozilla .vrbrowser .R
31
- import org .mozilla .vrbrowser .browser .engine .SessionStore
32
31
33
32
class Services (context : Context , places : Places ): GeckoSession .NavigationDelegate {
34
33
companion object {
Original file line number Diff line number Diff line change 34
34
import java .io .Writer ;
35
35
import java .lang .reflect .Type ;
36
36
import java .util .ArrayList ;
37
- import java .util .Arrays ;
38
37
import java .util .Collections ;
39
38
import java .util .List ;
40
39
import java .util .stream .Collectors ;
@@ -891,22 +890,24 @@ public void onLoggedOut() {
891
890
892
891
@ Override
893
892
public void onAuthenticated (@ NotNull OAuthAccount oAuthAccount , @ NotNull AuthType authType ) {
894
- Session session = mFocusedWindow .getSession ();
895
- addTab (mFocusedWindow , mAccounts .getConnectionSuccessURL ());
896
- onTabsClose (new ArrayList <>(Collections .singletonList (session )));
897
-
898
- switch (mAccounts .getLoginOrigin ()) {
899
- case BOOKMARKS :
900
- getFocusedWindow ().switchBookmarks ();
901
- break ;
902
-
903
- case HISTORY :
904
- getFocusedWindow ().switchHistory ();
905
- break ;
906
-
907
- case SETTINGS :
908
- mWidgetManager .getTray ().toggleSettingsDialog (SettingsWidget .SettingDialog .FXA );
909
- break ;
893
+ if (authType != AuthType .Existing .INSTANCE ) {
894
+ Session session = mFocusedWindow .getSession ();
895
+ addTab (mFocusedWindow , mAccounts .getConnectionSuccessURL ());
896
+ onTabsClose (new ArrayList <>(Collections .singletonList (session )));
897
+
898
+ switch (mAccounts .getLoginOrigin ()) {
899
+ case BOOKMARKS :
900
+ getFocusedWindow ().switchBookmarks ();
901
+ break ;
902
+
903
+ case HISTORY :
904
+ getFocusedWindow ().switchHistory ();
905
+ break ;
906
+
907
+ case SETTINGS :
908
+ mWidgetManager .getTray ().toggleSettingsDialog (SettingsWidget .SettingDialog .FXA );
909
+ break ;
910
+ }
910
911
}
911
912
}
912
913
You can’t perform that action at this time.
0 commit comments