Rebase updated

MozillaReality · Nov 25, 2019 · 2ff5af0 · 2ff5af0
1 parent e1361dc
commit 2ff5af0
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 1 deletion.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/BookmarksView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/BookmarksView.java
@@ -230,6 +230,8 @@ public void onFxALogin(@NonNull View view) {
                             WidgetManagerDelegate widgetManager = ((VRBrowserActivity) getContext());
                             widgetManager.openNewTabForeground(url);
                             widgetManager.getFocusedWindow().getSession().setUaMode(GeckoSessionSettings.USER_AGENT_MODE_MOBILE);
+
+                            mBookmarksViewListeners.forEach((listener) -> listener.onFxALogin(view));
                         }
 
                     }, mUIThreadExecutor).exceptionally(throwable -> {

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HistoryView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HistoryView.java
@@ -227,6 +227,8 @@ public void onFxALogin(@NonNull View view) {
                             WidgetManagerDelegate widgetManager = ((VRBrowserActivity) getContext());
                             widgetManager.openNewTabForeground(url);
                             widgetManager.getFocusedWindow().getSession().setUaMode(GeckoSessionSettings.USER_AGENT_MODE_MOBILE);
+
+                            mHistoryViewListeners.forEach((listener) -> listener.onFxALogin(view));
                         }
 
                     }, mUIThreadExecutor).exceptionally(throwable -> {

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
@@ -1428,6 +1428,11 @@ public void onHideContextMenu(@NonNull View view) {
         public void onItemClicked(@NonNull View view, Bookmark item) {
             hideBookmarks();
         }
+
+        @Override
+        public void onFxALogin(@NonNull View view) {
+            hideBookmarks();
+        }
     };
 
     private HistoryCallback mHistoryListener = new HistoryCallback() {
@@ -1462,6 +1467,11 @@ public void onHideContextMenu(@NonNull View view) {
         public void onItemClicked(@NonNull View view, VisitInfo item) {
             hideHistory();
         }
+
+        @Override
+        public void onFxALogin(@NonNull View view) {
+            hideHistory();
+        }
     };
 
     private void hideContextMenus() {

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/WhatsNewWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/WhatsNewWidget.java
@@ -104,6 +104,8 @@ private void signIn(View view) {
             mAccounts.logoutAsync();
 
         } else {
+            hide(REMOVE_WIDGET);
+
             CompletableFuture<String> result = mAccounts.authUrlAsync();
             if (result != null) {
                 result.thenAcceptAsync((url) -> {

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SettingsWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SettingsWidget.java
@@ -281,11 +281,12 @@ private void manageAccount() {
         switch(mAccounts.getAccountStatus()) {
             case SIGNED_OUT:
             case NEEDS_RECONNECT:
-                hide(REMOVE_WIDGET);
                 if (mAccounts.getAccountStatus() == Accounts.AccountStatus.SIGNED_IN) {
                     mAccounts.logoutAsync();
 
                 } else {
+                    hide(REMOVE_WIDGET);
+
                     CompletableFuture<String> result = mAccounts.authUrlAsync();
                     if (result != null) {
                         result.thenAcceptAsync((url) -> {