Skip to content

Commit

Permalink
Merge pull request #4453 from wikimedia/talk-page-archives-error
Browse files Browse the repository at this point in the history
Do not prevent users from viewing talk page if summary call fails
  • Loading branch information
mazevedofs authored Jan 23, 2023
2 parents 7629089 + b30b9ea commit 0a31817
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Wikipedia/Code/TalkPageArchivesViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class TalkPageArchivesViewController: UIViewController, Themeable, ShiftingTopVi

lazy var barView: ShiftingNavigationBarView = {
let items = navigationController?.viewControllers.map({ $0.navigationItem }) ?? []
return ShiftingNavigationBarView(shiftOrder: 1, navigationItems: items, hidesOnScroll: true, popDelegate: self)
return ShiftingNavigationBarView(shiftOrder: 1, navigationItems: items, hidesOnScroll: false, popDelegate: self)
}()

init(viewModel: TalkPageArchivesViewModel, theme: Theme) {
Expand Down
5 changes: 4 additions & 1 deletion Wikipedia/Code/TalkPageDataController.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Foundation
import WMF
import CocoaLumberjackSwift

/// Class that coordinates network fetches for talk pages.
/// Leans on file persistence for offline mode as-needed.
Expand Down Expand Up @@ -51,7 +52,9 @@ class TalkPageDataController {

fetchArticleSummaryIfNeeded(dispatchGroup: group) { articleSummary, errors in
finalArticleSummary = articleSummary
finalErrors.append(contentsOf: errors)
if errors.count > 0 {
DDLogError("Error fetching article summary for talk page header. Ignoring.")
}
}

fetchLatestRevisionID(dispatchGroup: group) { revisionID in
Expand Down

0 comments on commit 0a31817

Please sign in to comment.