Fix #5694: Open in 'New Private Tab' doesn't open tab when 'Close Pri… (

#5749) * Fix #5694: Open in 'New Private Tab' doesn't open tab when 'Close Private Tab' is enabled * Review fix
mozilla-mobile · Nov 13, 2019 · 2cacc90 · 2cacc90
1 parent dcecbb0
commit 2cacc90
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Client/Frontend/Browser/BrowserViewController/BrowserViewController+WebViewDelegates.swift b/Client/Frontend/Browser/BrowserViewController/BrowserViewController+WebViewDelegates.swift
@@ -124,8 +124,15 @@ extension BrowserViewController: WKUIDelegate {
                 guard !self.topTabsVisible else {
                     return
                 }
+                var toastLabelText: String
+
+                if isPrivate {
+                    toastLabelText = Strings.ContextMenuButtonToastNewPrivateTabOpenedLabelText
+                } else {
+                    toastLabelText = Strings.ContextMenuButtonToastNewTabOpenedLabelText
+                }
                 // We're not showing the top tabs; show a toast to quick switch to the fresh new tab.
-                let toast = ButtonToast(labelText: Strings.ContextMenuButtonToastNewTabOpenedLabelText, buttonText: Strings.ContextMenuButtonToastNewTabOpenedButtonText, completion: { buttonPressed in
+                let toast = ButtonToast(labelText: toastLabelText, buttonText: Strings.ContextMenuButtonToastNewTabOpenedButtonText, completion: { buttonPressed in
                     if buttonPressed {
                         self.tabManager.selectTab(tab)
                     }

diff --git a/Client/Frontend/Browser/TabTrayController.swift b/Client/Frontend/Browser/TabTrayController.swift
@@ -275,10 +275,10 @@ class TabTrayController: UIViewController {
             fromView = emptyPrivateTabsView
         }
 
-        tabDisplayManager.togglePrivateMode(isOn: !tabDisplayManager.isPrivate, createTabOnEmptyPrivateMode: false)
-
         tabManager.willSwitchTabMode(leavingPBM: tabDisplayManager.isPrivate)
-
+
+        tabDisplayManager.togglePrivateMode(isOn: !tabDisplayManager.isPrivate, createTabOnEmptyPrivateMode: false)
+
         if tabDisplayManager.isPrivate, privateTabsAreEmpty() {
             UIView.animate(withDuration: 0.2) {
                 self.searchBarHolder.alpha = 0