Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions components/QRCodeScanner.qml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,41 @@ Rectangle {
state: "Stopped"

signal qrcode_decoded(string address, string payment_id, string amount, string tx_description, string recipient_name, var extra_parameters)
property bool walletRestoreMode: false

function parseWalletRestoreUri(data) {
var prefix = ""
if (data.indexOf("monero-wallet:") === 0)
prefix = "monero-wallet:"
else if (data.indexOf("monero_wallet:") === 0)
prefix = "monero_wallet:"
else
return null

var queryOffset = data.indexOf("?")
var address = data.substring(prefix.length, queryOffset < 0 ? data.length : queryOffset)
if (!walletManager.addressValid(address, appWindow.persistentSettings.nettype))
return null

var params = {}
if (queryOffset >= 0) {
var items = data.substring(queryOffset + 1).split("&")
for (var index = 0; index < items.length; ++index) {
var separator = items[index].indexOf("=")
if (separator < 0)
continue
var name = decodeURIComponent(items[index].substring(0, separator))
var value = decodeURIComponent(items[index].substring(separator + 1))
if (name === "view_key")
params.secret_view_key = value
else if (name === "spend_key")
params.secret_spend_key = value
else if (name === "height")
params.restore_height = value
}
}
return { "address": address, "extra_parameters": params }
}

states: [
State {
Expand All @@ -67,6 +102,7 @@ Rectangle {
root.visible = false
finder.enabled = false
camera.cameraState = Camera.UnloadedState
root.walletRestoreMode = false
}
}
}
Expand All @@ -86,6 +122,12 @@ Rectangle {
id : finder
objectName: "QrFinder"
onDecoded : {
var walletRestore = root.walletRestoreMode ? root.parseWalletRestoreUri(data) : null
if (walletRestore !== null) {
root.qrcode_decoded(walletRestore.address, "", "", "", "", walletRestore.extra_parameters)
root.state = "Stopped"
return
}
const parsed = walletManager.parse_uri_to_object(data);
if (!parsed.error) {
root.qrcode_decoded(parsed.address, parsed.payment_id, parsed.amount, parsed.tx_description, parsed.recipient_name, parsed.extra_parameters);
Expand Down
2 changes: 1 addition & 1 deletion pages/Keys.qml
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ Rectangle {
seedText.text = currentWallet.seed === "" ? qsTr("Mnemonic seed protected by hardware device.") + translationManager.emptyString : currentWallet.seed

if(typeof currentWallet != "undefined") {
viewOnlyQRCode.source = "image://qrcode/monero_wallet:" + currentWallet.address(0, 0) + "?view_key="+currentWallet.secretViewKey+"&height="+currentWallet.walletCreationHeight
viewOnlyQRCode.source = "image://qrcode/monero-wallet:" + currentWallet.address(0, 0) + "?view_key="+currentWallet.secretViewKey+"&height="+currentWallet.walletCreationHeight
fullWalletQRCode.source = viewOnlyQRCode.source +"&spend_key="+currentWallet.secretSpendKey

if(currentWallet.viewOnly) {
Expand Down
5 changes: 4 additions & 1 deletion wizard/WizardRestoreWallet1.qml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Rectangle {
restoreHeight.text = typeof params.restore_height != "undefined" ? params.restore_height : "";

cameraUi.qrcode_decoded.disconnect(updateFromQrCode);
cameraUi.walletRestoreMode = false;
}

function verifyFromKeys() {
Expand Down Expand Up @@ -172,8 +173,10 @@ Rectangle {
seedRadioButton.checked = false;
keysRadioButton.checked = false;
wizardController.walletRestoreMode = 'qr';
cameraUi.state = "Capture";
cameraUi.walletRestoreMode = true;
cameraUi.qrcode_decoded.disconnect(updateFromQrCode);
cameraUi.qrcode_decoded.connect(updateFromQrCode);
cameraUi.state = "Capture";
}
}
}
Expand Down
Loading