Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #6480: generateDefaultFaviconImage make thread safe to fix crash #6557

Merged
merged 1 commit into from
May 6, 2020
Merged

Fix #6480: generateDefaultFaviconImage make thread safe to fix crash #6557

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions Storage/SQL/SQLiteHistoryFavicons.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,29 +363,30 @@ extension SQLiteHistory: Favicons {
// Generates a "default" favicon based on the first character in the
// site's domain name or gets an already-generated icon from the cache.
fileprivate func generateDefaultFaviconImage(forSite site: Site) -> Deferred<Maybe<UIImage>> {
guard let url = URL(string: site.url),
let character = url.baseDomain?.first else {
return deferMaybe(defaultFavicon)
}
let deferred = Deferred<Maybe<UIImage>>()

let faviconLetter = String(character).uppercased()
DispatchQueue.main.async {
guard let url = URL(string: site.url), let character = url.baseDomain?.first else {
deferred.fill(Maybe(success: defaultFavicon))
return
}

if let cachedFavicon = defaultFaviconImageCache[faviconLetter] {
return deferMaybe(cachedFavicon)
}
let faviconLetter = String(character).uppercased()

func generateBackgroundColor(forURL url: URL) -> UIColor {
guard let hash = url.baseDomain?.hashValue else {
return UIColor.Photon.Grey50
if let cachedFavicon = defaultFaviconImageCache[faviconLetter] {
deferred.fill(Maybe(success: cachedFavicon))
return
}
let index = abs(hash) % (DefaultFaviconBackgroundColors.count - 1)
let colorHex = DefaultFaviconBackgroundColors[index]
return UIColor(colorString: colorHex)
}

let deferred = Deferred<Maybe<UIImage>>()
func generateBackgroundColor(forURL url: URL) -> UIColor {
guard let hash = url.baseDomain?.hashValue else {
return UIColor.Photon.Grey50
}
let index = abs(hash) % (DefaultFaviconBackgroundColors.count - 1)
let colorHex = DefaultFaviconBackgroundColors[index]
return UIColor(colorString: colorHex)
}

DispatchQueue.main.async {
var image = UIImage()
let label = UILabel(frame: CGRect(x: 0, y: 0, width: 60, height: 60))
label.text = faviconLetter
Expand All @@ -404,7 +405,6 @@ extension SQLiteHistory: Favicons {
defaultFaviconImageCache[faviconLetter] = image
deferred.fill(Maybe(success: image))
}

return deferred
}
}