From 149edc1cbc5de54d5eda1d8e9519204a22e55b5c Mon Sep 17 00:00:00 2001 From: Danny Moesch Date: Wed, 3 Jul 2019 22:45:18 +0200 Subject: [PATCH] Only migrate if possible (do not stop after first failure) --- passKit/Models/PasswordStore.swift | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift index 8d0fdf0..0433bba 100644 --- a/passKit/Models/PasswordStore.swift +++ b/passKit/Models/PasswordStore.swift @@ -187,18 +187,14 @@ public class PasswordStore { } private func importExistingKeysIntoKeychain() { - do { - try KeyFileManager(keyType: PgpKey.PUBLIC, keyPath: Globals.pgpPublicKeyPath).importKeyAndDeleteFile() - try KeyFileManager(keyType: PgpKey.PRIVATE, keyPath: Globals.pgpPrivateKeyPath).importKeyAndDeleteFile() - try KeyFileManager(keyType: SshKey.PRIVATE, keyPath: Globals.gitSSHPrivateKeyPath).importKeyAndDeleteFile() - SharedDefaults.remove(.pgpPublicKeyArmor) - SharedDefaults.remove(.pgpPrivateKeyArmor) - SharedDefaults.remove(.gitSSHPrivateKeyArmor) - SharedDefaults[.pgpKeySource] = "file" - SharedDefaults[.gitSSHKeySource] = "file" - } catch { - print("MigrationError".localize(error)) - } + try? KeyFileManager(keyType: PgpKey.PUBLIC, keyPath: Globals.pgpPublicKeyPath).importKeyAndDeleteFile() + try? KeyFileManager(keyType: PgpKey.PRIVATE, keyPath: Globals.pgpPrivateKeyPath).importKeyAndDeleteFile() + try? KeyFileManager(keyType: SshKey.PRIVATE, keyPath: Globals.gitSSHPrivateKeyPath).importKeyAndDeleteFile() + SharedDefaults.remove(.pgpPublicKeyArmor) + SharedDefaults.remove(.pgpPrivateKeyArmor) + SharedDefaults.remove(.gitSSHPrivateKeyArmor) + SharedDefaults[.pgpKeySource] = "file" + SharedDefaults[.gitSSHKeySource] = "file" } public func initGitSSHKey(with armorKey: String) throws {