Added QR icon back

Yubico · Sep 17, 2020 · 39f0081 · 39f0081
1 parent af47aa4
commit 39f0081
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/qml/NewCredentialView.qml b/qml/NewCredentialView.qml
@@ -141,7 +141,6 @@ Flickable {
 
     function scanQr(data) {
         scanning = true
-        console.log(data)
         yubiKey.parseQr(data, function (resp) {
             scanning = false
             if (resp.success) {
@@ -153,17 +152,6 @@ Flickable {
         })
     }
 
-    FileDialog {
-            id: dialog
-            title: "Dump logs to file"
-            onAccepted: {
-                fileName = file.toString()
-                fileName = fileName.replace(/^(file:\/{3})/,"")
-                console.log(fileName)
-                navigator.snackBar(ScreenShot.capture(fileName))
-            }
-        }
-
     function addCredentialNoCopy() {
         addCredential(true)
     }
@@ -244,6 +232,7 @@ Flickable {
 
             StyledImage {
                 id: qrImage
+                source: "../images/qr-monitor.svg"
                 color: primaryColor
                 opacity: lowEmphasis
                 iconWidth: 100

diff --git a/screenshot.h b/screenshot.h
@@ -25,22 +25,21 @@ class ScreenShot: public QObject
         decoder.setSourceFilterType(QZXing::SourceFilter_ImageNormal);
         decoder.setTryHarderBehaviour(QZXing::TryHarderBehaviour_ThoroughScanning | QZXing::TryHarderBehaviour_Rotate);
 
-        //trigger decode
         QString result;
-        if (fileName == "") {
+        if (fileName == "") { // If user scans the screen
             std::vector<double> scalefactor = {1, 1.25, 1.5, 2, 3, 0.85, 0.70, 0.50};
             QImage newimage;
             for (size_t i = 0; i < screenshots.size(); i++) {
                 QImage image(screenshots[i]);
                 for (double j : scalefactor) {
                     newimage = image.scaledToWidth(image.width() * j);
                     result = decoder.decodeImage(newimage, newimage.width(), newimage.height(), false);
-                    if (result != "") {
+                    if (result.contains("otpauth")) {
                         return result;
                     }
                 }
             }
-        } else {
+        } else { // If user drag n drops a code
             QImage image(fileName);
             result = decoder.decodeImage(image, image.width(), image.height(), false);
         }