Fix mozilla-mobile#6722: no reload() datasource when app backgrounded…

… (db closed) (mozilla-mobile#6884)
dnarcese · Jul 14, 2020 · 02df316 · 02df316
1 parent 261dccd
commit 02df316
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/Client/Frontend/Library/BookmarkDetailPanel.swift b/Client/Frontend/Library/BookmarkDetailPanel.swift
@@ -171,6 +171,8 @@ class BookmarkDetailPanel: SiteTableViewController {
     }
 
     override func reloadData() {
+        // Can be called while app backgrounded and the db closed, don't try to reload the data source in this case
+        if profile.isShutdown { return }
         profile.places.getBookmarksTree(rootGUID: BookmarkRoots.RootGUID, recursive: true).uponQueue(.main) { result in
             guard let rootFolder = result.successValue as? BookmarkFolder else {
                 // TODO: Handle error case?

diff --git a/Client/Frontend/Library/BookmarksPanel.swift b/Client/Frontend/Library/BookmarksPanel.swift
@@ -163,6 +163,8 @@ class BookmarksPanel: SiteTableViewController, LibraryPanel {
     }
 
     override func reloadData() {
+        // Can be called while app backgrounded and the db closed, don't try to reload the data source in this case
+        if profile.isShutdown { return }
         profile.places.getBookmarksTree(rootGUID: bookmarkFolderGUID, recursive: false).uponQueue(.main) { result in
 
             guard let folder = result.successValue as? BookmarkFolder else {

diff --git a/Client/Frontend/Library/HistoryPanel.swift b/Client/Frontend/Library/HistoryPanel.swift
@@ -155,6 +155,8 @@ class HistoryPanel: SiteTableViewController, LibraryPanel {
     // MARK: - Loading data
 
     override func reloadData() {
+        // Can be called while app backgrounded and the db closed, don't try to reload the data source in this case
+        if profile.isShutdown { return }
         guard !isFetchInProgress else { return }
         groupedSites = DateGroupedTableData<Site>()