lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Fix #54: try other ways to load favicon

Browse source 
- try to replace http to https
- if a url does not start with http or https, try to add https
- return if cannot form a URL
This commit is contained in:
Bob Sun 2017-03-15 14:14:42 -07:00
parent 83e55403e5
commit f573be9ee0
2 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
pass/Controllers/PasswordDetailTableViewController.swift
View file

@ -143,9 +143,9 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
indicator.stopAnimating()
indicatorLable.isHidden = true
editUIBarButtonItem.isEnabled = true
if let url = password.getURL() {
if let urlString = password.getURLString() {
if self.passwordEntity?.image == nil{
self.updatePasswordImage(url: url)
self.updatePasswordImage(urlString: urlString)
}
}
}
@ -268,7 +268,25 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
}
}
func updatePasswordImage(url: String) {
func updatePasswordImage(urlString: String) {
var newUrlString = urlString
if urlString.lowercased().hasPrefix("http://") {
// try to replace http url to https url
newUrlString = urlString.replacingOccurrences(of: "http://",
with: "https://",
options: .caseInsensitive,
range: urlString.range(of: "http://"))
} else if urlString.lowercased().hasPrefix("https://") {
// do nothing here
} else {
// if a url does not start with http or https, try to add https
newUrlString = "https://\(urlString)"
}
guard let url = URL(string: newUrlString) else {
return
}
do {
try FavIcon.downloadPreferred(url) { [weak self] result in
switch result {