From 785775801a89128213ed85622b30a788935e2067 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 25 Jan 2020 15:36:43 -0700 Subject: [PATCH 1/2] Don't force cast scrollY as it might not always be set. Issue #1685 --- iOS/Article/WebViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iOS/Article/WebViewController.swift b/iOS/Article/WebViewController.swift index 7a1a56bc8..25868dda7 100644 --- a/iOS/Article/WebViewController.swift +++ b/iOS/Article/WebViewController.swift @@ -423,7 +423,7 @@ extension WebViewController: UIScrollViewDelegate { @objc func scrollPositionDidChange() { webView?.evaluateJavaScript("window.scrollY") { (scrollY, _) in - self.restoreWindowScrollY = scrollY as! Int + self.restoreWindowScrollY = scrollY as? Int ?? 0 } } From b62f80e0eabac689c1494a512893cad6e5e19438 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 25 Jan 2020 15:51:34 -0700 Subject: [PATCH 2/2] Removed unnecessary reloads that were crashing. Issue #1672 --- iOS/MasterFeed/MasterFeedViewController.swift | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift index 52c54d796..948d3da05 100644 --- a/iOS/MasterFeed/MasterFeedViewController.swift +++ b/iOS/MasterFeed/MasterFeedViewController.swift @@ -867,9 +867,7 @@ private extension MasterFeedViewController { return } coordinator.expand(node) - applyChanges(animated: true) { [weak self] in - self?.reloadNode(node) - } + applyChanges(animated: true) } func collapse(_ cell: MasterFeedTableViewCell) { @@ -877,9 +875,7 @@ private extension MasterFeedViewController { return } coordinator.collapse(node) - applyChanges(animated: true) { [weak self] in - self?.reloadNode(node) - } + applyChanges(animated: true) } func makeFeedContextMenu(node: Node, indexPath: IndexPath, includeDeleteRename: Bool) -> UIContextMenuConfiguration {