Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better error handling and fixes for key import

Browse Source
This commit is contained in:
miruka
2019-08-27 23:51:38 -04:00
parent 399a35dacb
commit f65c0176ba
4 changed files with 64 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/qml/Pages/EditAccount/Encryption.qml
View File

@@ -8,10 +8,11 @@ HColumnLayout {
function importKeys(file, passphrase) {
importButton.loading = true
let path = Qt.resolvedUrl(file).replace(/^file:\/\//, "")
let path = file.toString().replace(/^file:\/\//, "")
py.callClientCoro(
editAccount.userId, "import_keys", [path, passphrase], () => {
print("import done")
importButton.loading = false
}
)
@@ -63,9 +64,11 @@ HColumnLayout {
HPasswordPopup {
property url file: ""
function verifyPassword(pass) {
return py.callSync(
"check_exported_keys_password", [file.toString(), pass]
function verifyPassword(pass, callback) {
return py.callCoro(
"check_exported_keys_passphrase",
[file.toString().replace(/^file:\/\//, ""), pass],
callback
)
}
@@ -73,6 +76,6 @@ HColumnLayout {
label.text: qsTr(
"Please enter the passphrase that was used to protect this file:"
)
onAcceptedPasswordChanged: importKeys(file, password)
onAcceptedPasswordChanged: importKeys(file, acceptedPassword)
}
}