Addressed feedback.

brave · Aug 14, 2019 · 9524abc · 9524abc
1 parent 62c4f36
commit 9524abc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/Client/Frontend/Browser/BrowserViewController.swift b/Client/Frontend/Browser/BrowserViewController.swift
@@ -3064,11 +3064,11 @@ extension BrowserViewController: PreferencesObserver {
 
             // Destroy all tab data
             tabManager.allTabs.forEach({
-                tabManager.removeAllBrowsingDataForTab($0, completionHandler: { [weak self] in
-                    self?.tabManager.removeAll()
-                })
+                tabManager.removeAllBrowsingDataForTab($0)
             })
 
+            tabManager.removeAll()
+
             // Clear all persistent data
             let clearables: [Clearable] = [
                 HistoryClearable(),
@@ -3078,11 +3078,11 @@ extension BrowserViewController: PreferencesObserver {
             ]
 
             // Reset tab manager configuration
-            self.tabManager.resetConfiguration()
+            tabManager.resetConfiguration()
             ClearPrivateDataTableViewController.clearPrivateData(clearables).uponQueue(DispatchQueue.main) { _ in
 
                 // Clear saved tab data
-                TabMO.deleteAllNormalTabs()
+                TabMO.deleteAll()
             }
         case Preferences.Shields.blockAdsAndTracking.key,
              Preferences.Shields.httpsEverywhere.key,

diff --git a/Data/models/TabMO.swift b/Data/models/TabMO.swift
@@ -134,10 +134,6 @@ public final class TabMO: NSManagedObject, CRUD {
         deleteAll(context: .new(inMemory: false))
     }
 
-    public class func deleteAllNormalTabs() {
-        deleteAll(predicate: NSPredicate(format: "isPrivate != true"), context: .new(inMemory: false))
-    }
-
     public class func deleteAllPrivateTabs() {
         deleteAll(predicate: NSPredicate(format: "isPrivate == true"), context: .new(inMemory: false))
     }