From aad1fc4a0c75a54c8a8d459d2d95b9f168b574a8 Mon Sep 17 00:00:00 2001 From: Nate Weaver Date: Sat, 15 Feb 2020 08:53:56 -0600 Subject: [PATCH] Call the completion handler with nil if faviconURLs is nil Fixes #1791. --- Shared/Favicons/FaviconDownloader.swift | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Shared/Favicons/FaviconDownloader.swift b/Shared/Favicons/FaviconDownloader.swift index 0e65d4538..25c83bcc1 100644 --- a/Shared/Favicons/FaviconDownloader.swift +++ b/Shared/Favicons/FaviconDownloader.swift @@ -211,21 +211,22 @@ private extension FaviconDownloader { } FaviconURLFinder.findFaviconURLs(with: homePageURL) { (faviconURLs) in + guard var faviconURLs = faviconURLs else { + completion(nil) + return + } + var defaultFaviconURL: String? = nil if let scheme = url.scheme, let host = url.host { defaultFaviconURL = "\(scheme)://\(host)/favicon.ico".lowercased(with: FaviconDownloader.localeForLowercasing) } - if var faviconURLs = faviconURLs { - if let defaultFaviconURL = defaultFaviconURL { - faviconURLs.append(defaultFaviconURL) - } - completion(faviconURLs) - return + if let defaultFaviconURL = defaultFaviconURL { + faviconURLs.append(defaultFaviconURL) } - completion(defaultFaviconURL != nil ? [defaultFaviconURL!] : nil) + completion(faviconURLs) } }