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

Fix substring depreciated warnings

Browse source
This commit is contained in:
Yishi Lin 2017-09-23 16:43:14 +08:00
parent 774f05eae0
commit f646762f4b
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pass/Controllers/GitSSHKeyArmorSettingTableViewController.swift
View file

@ -61,7 +61,7 @@ class GitSSHKeyArmorSettingTableViewController: UITableViewController, UITextVie
// update full text and check whether we are done // update full text and check whether we are done
key.append(segment) key.append(segment)
if let index1 = key.range(of: "-----END")?.lowerBound, if let index1 = key.range(of: "-----END")?.lowerBound,
let _ = key.substring(from: index1).range(of: "KEY-----")?.lowerBound { let _ = key.suffix(from: index1).range(of: "KEY-----")?.lowerBound {
isDone = true isDone = true
} }

2
passKit/Models/PasswordEntity.swift
View file

@ -14,7 +14,7 @@ extension PasswordEntity {
public var nameWithCategory: String { public var nameWithCategory: String {
get { get {
if let p = path, p.hasSuffix(".gpg") { if let p = path, p.hasSuffix(".gpg") {
return p.substring(to: p.index(p.endIndex, offsetBy: -4)) return String(p.prefix(upTo: p.index(p.endIndex, offsetBy: -4)))
} else { } else {
return "" return ""
} }

4
passKit/Models/PasswordStore.swift
View file

@ -347,7 +347,7 @@ public class PasswordStore {
}.map { (filename) -> PasswordEntity in }.map { (filename) -> PasswordEntity in
let passwordEntity = NSEntityDescription.insertNewObject(forEntityName: "PasswordEntity", into: context) as! PasswordEntity let passwordEntity = NSEntityDescription.insertNewObject(forEntityName: "PasswordEntity", into: context) as! PasswordEntity
if filename.hasSuffix(".gpg") { if filename.hasSuffix(".gpg") {
passwordEntity.name = filename.substring(to: filename.index(filename.endIndex, offsetBy: -4)) passwordEntity.name = String(filename.prefix(upTo: filename.index(filename.endIndex, offsetBy: -4)))
} else { } else {
passwordEntity.name = filename passwordEntity.name = filename
} }
@ -369,7 +369,7 @@ public class PasswordStore {
let files = try fm.contentsOfDirectory(atPath: filePath).map { (filename) -> PasswordEntity in let files = try fm.contentsOfDirectory(atPath: filePath).map { (filename) -> PasswordEntity in
let passwordEntity = NSEntityDescription.insertNewObject(forEntityName: "PasswordEntity", into: context) as! PasswordEntity let passwordEntity = NSEntityDescription.insertNewObject(forEntityName: "PasswordEntity", into: context) as! PasswordEntity
if filename.hasSuffix(".gpg") { if filename.hasSuffix(".gpg") {
passwordEntity.name = filename.substring(to: filename.index(filename.endIndex, offsetBy: -4)) passwordEntity.name = String(filename.prefix(upTo: filename.index(filename.endIndex, offsetBy: -4)))
} else { } else {
passwordEntity.name = filename passwordEntity.name = filename
} }