From 760364149f17bc62683e259dde03e2951eaa4e9e Mon Sep 17 00:00:00 2001 From: Toni Sevener Date: Mon, 23 Jan 2023 13:36:23 -0600 Subject: [PATCH 1/2] Do not prevent users from viewing talk page if summary call fails --- Wikipedia/Code/TalkPageDataController.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Wikipedia/Code/TalkPageDataController.swift b/Wikipedia/Code/TalkPageDataController.swift index 196fca8bb65..53a80d141ca 100644 --- a/Wikipedia/Code/TalkPageDataController.swift +++ b/Wikipedia/Code/TalkPageDataController.swift @@ -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. @@ -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 From b30b9ea1caeab8a0fe0bc0e946c9a6afe34a5574 Mon Sep 17 00:00:00 2001 From: Toni Sevener Date: Mon, 23 Jan 2023 13:49:21 -0600 Subject: [PATCH 2/2] Don't hide nav bar on scroll --- Wikipedia/Code/TalkPageArchivesViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Wikipedia/Code/TalkPageArchivesViewController.swift b/Wikipedia/Code/TalkPageArchivesViewController.swift index 5639282d641..1e11cf7a8fb 100644 --- a/Wikipedia/Code/TalkPageArchivesViewController.swift +++ b/Wikipedia/Code/TalkPageArchivesViewController.swift @@ -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) {