From da7dcc2405532e665b0b3157c1eb89e3ac342b6a Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sun, 19 May 2019 13:03:07 -0500 Subject: [PATCH] Remove quality assurance checks from avatar image in timeline --- .../MasterTimelineViewController.swift | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/iOS/MasterTimeline/MasterTimelineViewController.swift b/iOS/MasterTimeline/MasterTimelineViewController.swift index a1eab464d..dc716ec7c 100644 --- a/iOS/MasterTimeline/MasterTimelineViewController.swift +++ b/iOS/MasterTimeline/MasterTimelineViewController.swift @@ -13,7 +13,6 @@ import Articles class MasterTimelineViewController: ProgressTableViewController, UndoableCommandRunner { - private static var minAvatarDimension: CGFloat = 20.0 private var numberOfTextLines = 0 @IBOutlet weak var markAllAsReadButton: UIBarButtonItem! @@ -393,7 +392,7 @@ private extension MasterTimelineViewController { if let authors = article.authors { for author in authors { - if let image = avatarForAuthor(author), imagePassesQualityAssurance(image) { + if let image = avatarForAuthor(author) { return image } } @@ -404,28 +403,18 @@ private extension MasterTimelineViewController { } let feedIconImage = appDelegate.feedIconDownloader.icon(for: feed) - if imagePassesQualityAssurance(feedIconImage) { + if feedIconImage != nil { return feedIconImage } if let feed = article.feed, let faviconImage = appDelegate.faviconDownloader.favicon(for: feed) { - if imagePassesQualityAssurance(faviconImage) { - return faviconImage - } + return faviconImage } return FaviconGenerator.favicon(feed) } - func imagePassesQualityAssurance(_ image: UIImage?) -> Bool { - let minDimension = MasterTimelineViewController.minAvatarDimension * RSScreen.mainScreenScale - if let image = image, image.size.height >= minDimension, image.size.width >= minDimension { - return true - } - return false - } - func avatarForAuthor(_ author: Author) -> UIImage? { return appDelegate.authorAvatarDownloader.image(for: author) }