Add SAS Method choice and Add send_to_device API call
2 files changed, 34 insertions, 1 deletions
diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml
index a85c41c3..6bfee09c 100644
--- a/resources/qml/UserProfile.qml
+++ b/resources/qml/UserProfile.qml
@@ -107,18 +107,28 @@ ApplicationWindow{
}
}
Button{
+ id: verifyButton
text:"Verify"
onClicked: {
var dialog = deviceVerificationDialog.createObject(userProfileDialog,
- {flow: deviceVerificationFlow,sender: true});
+ {flow: deviceVerificationFlow,sender: false});
+ deviceVerificationFlow.userId = user_data.userId
+ deviceVerificationFlow.deviceId = model.deviceID
dialog.show();
}
+ contentItem: Text {
+ text: verifyButton.text
+ color: colors.background
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ }
}
}
}
}
Button{
+ id: okbutton
text:"OK"
onClicked: userProfileDialog.close()
anchors.margins: {
@@ -126,6 +136,13 @@ ApplicationWindow{
bottom:10
}
+ contentItem: Text {
+ text: okbutton.text
+ color: colors.background
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ }
+
Layout.alignment: Qt.AlignRight | Qt.AlignBottom
}
}
diff --git a/resources/qml/device-verification/DeviceVerification.qml b/resources/qml/device-verification/DeviceVerification.qml
index ce2485ff..31f6f9c1 100644
--- a/resources/qml/device-verification/DeviceVerification.qml
+++ b/resources/qml/device-verification/DeviceVerification.qml
@@ -108,6 +108,22 @@ ApplicationWindow {
}
RowLayout {
+ RadioButton {
+ Layout.alignment: Qt.AlignLeft
+ text: "Decimal"
+ onClicked: { flow.method = DeviceVerificationFlow.Decimal }
+ }
+ Item {
+ Layout.fillWidth: true
+ }
+ RadioButton {
+ Layout.alignment: Qt.AlignRight
+ text: "Emoji"
+ onClicked: { flow.method = DeviceVerificationFlow.Emoji }
+ }
+ }
+
+ RowLayout {
Button {
Layout.alignment: Qt.AlignLeft
text: "Deny"
|
