flutter/GitJournal
1
0
Fork 0
mirror of https://github.com/GitJournal/GitJournal.git synced 2025-06-29 02:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Settings Migration: Make sure the keys actually exist

Browse Source
This commit is contained in:
Vishesh Handa
2020-10-21 15:42:13 +02:00
parent 95aa6b4647
commit bfdbfccba7
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/settings.dart
View File

@ -375,9 +375,13 @@ class Settings extends ChangeNotifier {
var sshPublicKeyPath = p.join(oldSshDir.path, "id_rsa.pub"); var sshPublicKeyPath = p.join(oldSshDir.path, "id_rsa.pub");
var sshPrivateKeyPath = p.join(oldSshDir.path, "id_rsa"); var sshPrivateKeyPath = p.join(oldSshDir.path, "id_rsa");
sshPublicKey = await File(sshPublicKeyPath).readAsString(); var publicKeyExists = File(sshPublicKeyPath).existsSync();
sshPrivateKey = await File(sshPrivateKeyPath).readAsString(); var privateKeyExists = File(sshPrivateKeyPath).existsSync();
sshPassword = ""; if (publicKeyExists && privateKeyExists) {
sshPublicKey = await File(sshPublicKeyPath).readAsString();
sshPrivateKey = await File(sshPrivateKeyPath).readAsString();
sshPassword = "";
}
await oldSshDir.delete(recursive: true); await oldSshDir.delete(recursive: true);
} }
@ -387,9 +391,13 @@ class Settings extends ChangeNotifier {
var sshPublicKeyPath = p.join(newSshDir.path, "id_rsa.pub"); var sshPublicKeyPath = p.join(newSshDir.path, "id_rsa.pub");
var sshPrivateKeyPath = p.join(newSshDir.path, "id_rsa"); var sshPrivateKeyPath = p.join(newSshDir.path, "id_rsa");
sshPublicKey = await File(sshPublicKeyPath).readAsString(); var publicKeyExists = File(sshPublicKeyPath).existsSync();
sshPrivateKey = await File(sshPrivateKeyPath).readAsString(); var privateKeyExists = File(sshPrivateKeyPath).existsSync();
sshPassword = ""; if (publicKeyExists && privateKeyExists) {
sshPublicKey = await File(sshPublicKeyPath).readAsString();
sshPrivateKey = await File(sshPrivateKeyPath).readAsString();
sshPassword = "";
}
await newSshDir.delete(recursive: true); await newSshDir.delete(recursive: true);
} }