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

Set name and url in Password non-optional

Browse source 
Name and url in Password class shouldn't be optional because we store
them in core data as non-optional. This change also help us to avoid
man unneccessary unwrap.
This commit is contained in:
Bob Sun 2018-11-10 22:38:12 -08:00
parent 5262ca89f7
commit 2abbceb2e9
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
9 changed files with 60 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

14
passKit/Models/Password.swift
View file

@ -62,9 +62,9 @@ public class Password {
private static let URL_KEYWORD = "url"
private static let UNKNOWN = "unknown"
public var name = ""
public var url: URL?
public var namePath: String { return url?.deletingPathExtension().path ?? "" }
public var name: String
public var url: URL
public var namePath: String { return url.deletingPathExtension().path }
public var password = ""
public var changed: Int = 0
@ -79,11 +79,13 @@ public class Password {
private var otpToken: Token?
public var otpType: OtpType { return OtpType.from(token: self.otpToken) }
public init(name: String, url: URL?, plainText: String) {
public init(name: String, url: URL, plainText: String) {
self.name = name
self.url = url
self.initEverything(name: name, url: url, plainText: plainText)
}
public func updatePassword(name: String, url: URL?, plainText: String) {
public func updatePassword(name: String, url: URL, plainText: String) {
if self.plainText != plainText || self.url != url {
if self.plainText != plainText {
changed = changed|PasswordChange.content.rawValue
@ -95,7 +97,7 @@ public class Password {
}
}
private func initEverything(name: String, url: URL?, plainText: String) {
private func initEverything(name: String, url: URL, plainText: String) {
self.name = name
self.url = url
self.plainText = plainText