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

Refactor Git URL related code, fix #336

Browse source
This commit is contained in:
Mingshen Sun 2019-11-30 15:11:28 -08:00
parent e83a2f941e
commit 258906fdbb
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
8 changed files with 119 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

6
passKit/Helpers/DefaultsKeys.swift
View file

@ -22,9 +22,9 @@ public extension DefaultsKeys {
static let gitSSHPrivateKeyArmor = DefaultsKey<String?>("gitSSHPrivateKeyArmor")
static let passcodeKey = DefaultsKey<String?>("passcodeKey")
static let gitURL = DefaultsKey<URL?>("gitURL")
static let gitAuthenticationMethod = DefaultsKey<String?>("gitAuthenticationMethod")
static let gitUsername = DefaultsKey<String?>("gitUsername")
static let gitURL = DefaultsKey<URL>("gitURL", defaultValue: URL(string: "https://")!)
static let gitAuthenticationMethod = DefaultsKey<GitAuthenticationMethod>("gitAuthenticationMethod", defaultValue: GitAuthenticationMethod.password)
static let gitUsername = DefaultsKey<String>("gitUsername", defaultValue: "git")
static let gitBranchName = DefaultsKey<String>("gitBranchName", defaultValue: "master")
static let gitSSHPrivateKeyURL = DefaultsKey<URL?>("gitSSHPrivateKeyURL")
static let gitSSHKeySource = DefaultsKey<String?>("gitSSHKeySource")

4
passKit/Models/GitCredential.swift
View file

@ -11,6 +11,10 @@ import UIKit
import SwiftyUserDefaults
import ObjectiveGit
public enum GitAuthenticationMethod: String, DefaultsSerializable {
case password, key
}
public struct GitCredential {
private var credential: Credential
private let passwordStore = PasswordStore.shared

4
passKit/Models/PasswordStore.swift
View file

@ -89,8 +89,8 @@ public class PasswordStore {
return (try? fm.allocatedSizeOfDirectoryAtURL(directoryURL: self.storeURL)) ?? 0
}
public var numberOfLocalCommits: Int? {
return (try? getLocalCommits())?.flatMap { $0.count }
public var numberOfLocalCommits: Int {
return (try? getLocalCommits())?.flatMap { $0.count } ?? 0
}
public var lastSyncedTime: Date? {