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

Merge branch 'develop' into new_passcode_lock

Browse source
This commit is contained in:
Yishi Lin 2018-04-07 01:48:32 +08:00
commit fe80ed3dc8
4 changed files with 45 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pass/Views/LabelTableViewCell.swift
View file

@ -39,8 +39,7 @@ class LabelTableViewCell: UITableViewCell {
return
}
titleLabel.text = title
switch title.lowercased() {
case "password":
if title.caseInsensitiveCompare("password") == .orderedSame {
type = .password
if isReveal {
contentLabel.attributedText = Utils.attributedPassword(plainPassword: content)
@ -52,7 +51,7 @@ class LabelTableViewCell: UITableViewCell {
}
}
contentLabel.font = Globals.passwordFont
case "hmac-based":
} else if title.caseInsensitiveCompare("hmac-based") == .orderedSame {
type = .HOTP
if isReveal {
contentLabel.text = content
@ -60,11 +59,12 @@ class LabelTableViewCell: UITableViewCell {
contentLabel.text = Globals.oneTimePasswordDots
}
contentLabel.font = Globals.passwordFont
case "url":
} else if title.lowercased().range(of: "url") != nil || verifyUrl(content) {
type = .URL
contentLabel.text = content
contentLabel.font = UIFont.systemFont(ofSize: contentLabel.font.pointSize)
default:
} else {
// default
type = .other
contentLabel.text = content
contentLabel.font = UIFont.systemFont(ofSize: contentLabel.font.pointSize)
@ -198,4 +198,12 @@ class LabelTableViewCell: UITableViewCell {
}
self.accessoryView = buttons
}
private func verifyUrl(_ urlString: String?) -> Bool {
guard let urlString = urlString,
let _ = URL(string: urlString) else {
return false
}
return true
}
}