integrate custom input reader into qml implementation ref #255

fibercrypto · Jan 22, 2020 · cf25102 · cf25102
1 parent f3f29e3
commit cf25102
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 9 deletions.
diff --git a/src/models/bridgeModel.go b/src/models/bridgeModel.go
@@ -1,7 +1,7 @@
 package models
 
 import (
-	"errors"
+	"github.com/fibercrypto/skywallet-go/src/skywallet"
 	"sync"
 
 	"github.com/therecipe/qt/core"
@@ -61,7 +61,8 @@ func (b *QBridge) getResult() string {
 
 func (b *QBridge) getOptionalResult() (string, error) {
 	if len(b.ErrMessage()) > 0 {
-		return "", errors.New(b.ErrMessage())
+		logWalletsModel.Warningln(b.ErrMessage())
+		return "", skywallet.ErrUserCancelledFromInputReader
 	}
 	return b.result, nil
 }

diff --git a/src/models/device_interaction.go b/src/models/device_interaction.go
@@ -2,6 +2,7 @@ package models
 
 import (
 	hardware "github.com/fibercrypto/fibercryptowallet/src/contrib/hardware-wallet/skywallet"
+	"github.com/fibercrypto/skywallet-go/src/skywallet"
 	messages "github.com/fibercrypto/skywallet-protob/go"
 	"github.com/therecipe/qt/core"
 	"github.com/therecipe/qt/qml"
@@ -63,7 +64,13 @@ func (devI *QDeviceInteraction) changePin() {
 		devI.OperationDone()
 		return data
 	}).Catch(func(err error) error {
-		logWalletsModel.WithError(err).Errorln("unable to change pin")
+		if err == skywallet.ErrUserCancelledFromInputReader {
+			logWalletsModel.WithError(err).Infoln("unable to change pin")
+		} else if err == skywallet.ErrUserCancelledWithDeviceButton {
+			logWalletsModel.WithError(err).Warningln("unable to change pin")
+		} else {
+			logWalletsModel.WithError(err).Errorln("unable to change pin")
+		}
 		devI.OperationDone()
 		return err
 	})

diff --git a/src/models/walletsModel.go b/src/models/walletsModel.go
@@ -93,7 +93,7 @@ func createSkyHardwareWallet(bridgeForPassword *QBridge) {
 				pass, err := bridgeForPassword.getOptionalResult()
 				bridgeForPassword.unlock()
 				if err != nil {
-					logWalletsModel.WithError(err).Errorln("error handling user interaction")
+					logWalletsModel.WithError(err).Warningln("error handling user interaction")
 					return "", skyWallet.ErrUserCancelledFromInputReader
 				}
 				return pass, nil
@@ -389,4 +389,4 @@ func (walletModel *WalletModel) loadModel(wallets []*QWallet) {
 
 	walletModel.EndResetModel()
 	walletModel.SetCount(len(walletModel.Wallets()))
-}
+}
diff --git a/src/ui/Dialogs/NumPadDialog.qml b/src/ui/Dialogs/NumPadDialog.qml
@@ -17,7 +17,6 @@ Dialog {
     readonly property string numPadButtonText: "#"
     readonly property real numPadButtonImplicitSize: 50
     readonly property real numPadButtonPointSize: 18
-    property alias pin: textInput.text
 
     function clear(newTitle) {
         textInput.clear()
@@ -44,6 +43,14 @@ Dialog {
     onAboutToShow: {
         textInput.forceActiveFocus()
     }
+    onRejected: {
+        bridgeForPassword.errMessage = "Action canceled";
+        bridgeForPassword.unlock()
+    }
+    onAccepted: {
+        bridgeForPassword.setResult(textInput.text)
+        bridgeForPassword.unlock()
+    }
 
     Flickable {
         id: flickable

diff --git a/src/ui/main.qml b/src/ui/main.qml
@@ -5,6 +5,7 @@ import Qt.labs.settings 1.0
 import WalletsManager 1.0
 import Config 1.0
 import Utils 1.0
+import DeviceInteraction 1.0
 
 // Resource imports
 // import "qrc:/ui/src/ui/Dialogs"
@@ -152,6 +153,30 @@ ApplicationWindow {
                  + "eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non proident, "
                  + "sunt in culpa qui officia deserunt mollit anim id est laborum.")
     }
+    MsgDialog {
+        id: requestCancel
+        anchors.centerIn: Overlay.overlay
+        width: applicationWindow.width > 440 ? 440 - 40 : applicationWindow.width - 40
+        height: applicationWindow.height > 280 ? 280 - 40 : applicationWindow.height - 40
+        focus: true
+        modal: true
+        standardButtons: Dialog.Cancel
+        onRejected: {
+            deviceInteraction.cancelCommand()
+        }
+    }
+    MsgDialog {
+        id: requestConfirmation
+        anchors.centerIn: Overlay.overlay
+        width: applicationWindow.width > 440 ? 440 - 40 : applicationWindow.width - 40
+        height: applicationWindow.height > 280 ? 280 - 40 : applicationWindow.height - 40
+        focus: true
+        modal: true
+        standardButtons: Dialog.Ok | Dialog.Cancel
+        onRejected: {
+            deviceInteraction.cancelCommand()
+        }
+    }
 
     // QR
     DialogQR {
@@ -176,6 +201,9 @@ ApplicationWindow {
         modal: true
     }
 
+    DeviceInteraction {
+        id: deviceInteraction
+    }
     QBridge{
         id: bridgeForPassword
 
@@ -189,7 +217,16 @@ ApplicationWindow {
             msgDialog.text = message
             msgDialog.open()
         }
-
+        onDeviceRequireConfirmableAction: {
+            requestConfirmation.title = title
+            requestConfirmation.text = message
+            requestConfirmation.open()
+        }
+        onDeviceRequireCancelableAction: {
+            requestCancel.title = title
+            requestCancel.text = message
+            requestCancel.open()
+        }
         onGetSkyHardwareWalletPin: {
             numPadDialog.clear(title)
             numPadDialog.open()
@@ -223,8 +260,7 @@ ApplicationWindow {
         focus: true
         modal: true
         onClosed: {
-            bridgeForPassword.setResult(numPadDialog.pin)
-            bridgeForPassword.unlock()
+            msgDialog.close()
         }
     }