From 352da92229fc30b6494c46e7a3e7d9ed80521bb5 Mon Sep 17 00:00:00 2001
From: xiphon <xiphon@protonmail.com>
Date: Thu, 16 Jul 2020 17:13:42 +0000
Subject: QrCodeScanner: use parse_uri_to_object to parse scanned codes

---
 components/QRCodeScanner.qml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'components')

diff --git a/components/QRCodeScanner.qml b/components/QRCodeScanner.qml
index 67d76238..a4d6927c 100644
--- a/components/QRCodeScanner.qml
+++ b/components/QRCodeScanner.qml
@@ -86,9 +86,14 @@ Rectangle {
         id : finder
         objectName: "QrFinder"
         onDecoded : {
-            root.qrcode_decoded(address, payment_id, amount, tx_description, recipient_name, extra_parameters)
-            root.state = "Stopped"
-	}
+            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);
+                root.state = "Stopped";
+            } else {
+                onNotifyError(parsed.error);
+            }
+        }
         onNotifyError : {
             if( warning )
                 messageDialog.icon = StandardIcon.Critical
-- 
cgit v1.2.3