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

Port to Swift 4

Browse source
This commit is contained in:
Bob Sun 2017-10-09 22:14:48 -07:00
parent 25ab22acc7
commit f5f9fe505b
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pass/Controllers/PasswordEditorTableViewController.swift
View file

@ -104,7 +104,7 @@ class PasswordEditorTableViewController: UITableViewController, FillPasswordTabl
let minimumLength = lengthSetting?.min ?? 0 let minimumLength = lengthSetting?.min ?? 0
let maximumLength = lengthSetting?.max ?? 0 let maximumLength = lengthSetting?.max ?? 0
var defaultLength = lengthSetting?.def ?? 0 var defaultLength = lengthSetting?.def ?? 0
if let currentPasswordLength = (tableData[passwordSection][0][PasswordEditorCellKey.content] as? String)?.characters.count, if let currentPasswordLength = (tableData[passwordSection][0][PasswordEditorCellKey.content] as? String)?.count,
currentPasswordLength >= minimumLength, currentPasswordLength >= minimumLength,
currentPasswordLength <= maximumLength { currentPasswordLength <= maximumLength {
defaultLength = currentPasswordLength defaultLength = currentPasswordLength

4
passKit/Models/Password.swift
View file

@ -84,7 +84,7 @@ public class Password {
additions.removeAll() additions.removeAll()
// split the plain text // split the plain text
let plainTextSplit = plainText.characters.split(maxSplits: 1, omittingEmptySubsequences: false) { let plainTextSplit = plainText.split(maxSplits: 1, omittingEmptySubsequences: false) {
$0 == "\n" || $0 == "\r\n" $0 == "\n" || $0 == "\r\n"
}.map(String.init) }.map(String.init)
@ -167,7 +167,7 @@ public class Password {
public func getAdditionsPlainText() -> String { public func getAdditionsPlainText() -> String {
// lines starting from the second // lines starting from the second
let plainTextSplit = plainText.characters.split(maxSplits: 1, omittingEmptySubsequences: false) { let plainTextSplit = plainText.split(maxSplits: 1, omittingEmptySubsequences: false) {
$0 == "\n" || $0 == "\r\n" $0 == "\n" || $0 == "\r\n"
}.map(String.init) }.map(String.init)
if plainTextSplit.count == 1 { if plainTextSplit.count == 1 {