Commit 6a410c62 authored by Martin Straka's avatar Martin Straka

Isds actions based on asynchronous qml input dialogue

parent 6c3e7848
......@@ -34,21 +34,26 @@ import QtQuick.Controls 2.1
Dialog {
id: root
signal finished(string userName,string accountName, string pwd)
signal finished(string isdsAction, string pwdType, string userName, string pwd)
property int minimumInputSize: parent.width / 2
property int maximumInputSize: parent.width / 2
property string dIsdsAction
property string dPwdType
property string dUserName
property string dAccountName
function openInputDialog(userName, accountName, title, text, hidePwd) {
function openInputDialog(isdsAction, pwdType, userName, title, text, placeholderText, hidePwd) {
dIsdsAction = isdsAction
dPwdType = pwdType
dUserName = userName
dAccountName = accountName
root.title = title
roottext.text = text
rootpwd.clear()
rootpwd.placeholderText = title
rootpwd.placeholderText = placeholderText
rootpwd.echoMode = (hidePwd) ? TextInput.Password : TextInput.Normal
if (pwdType == "totp" || pwdType == "hotp") {
rootpwd.inputMethodHints = Qt.ImhDigitsOnly
}
root.open()
}
......@@ -84,5 +89,5 @@ Dialog {
}
} // ColumnLayout
onAccepted: finished(dUserName, dAccountName, rootpwd.text.toString())
onAccepted: finished(dIsdsAction, dPwdType, dUserName, rootpwd.text.toString())
}
......@@ -115,12 +115,12 @@ ApplicationWindow {
InputDialogue {
id: inputDialog
onFinished: {
isds.returnInputDialogText(userName, accountName, pwd)
isds.returnInputDialogText(isdsAction, pwdType, userName, pwd)
}
Connections {
target: isds
onOpenDialogRequest: {
inputDialog.openInputDialog(userName, accountName, title, text, hidePwd)
inputDialog.openInputDialog(isdsAction, pwdType, userName, title, text, placeholderText, hidePwd)
}
}
}
......
......@@ -66,7 +66,13 @@ Component {
MouseArea {
anchors.fill: parent
onClicked: {
isds.getAccountInfo(userName, false)
isds.doIsdsAction("getAccountInfo", userName)
}
}
Connections {
target: isds
onRunGetAccountInfoSig: {
isds.getAccountInfo(userName)
}
}
}
......
......@@ -110,7 +110,7 @@ Component {
anchors.fill: parent
onClicked: {
statusBarText.text = ""
isds.syncAllAccounts(accountModel)
isds.doIsdsAction("syncAllAccounts", "")
}
}
}
......@@ -260,7 +260,15 @@ Component {
MouseArea {
anchors.fill: parent
onClicked: {
isds.syncOneAccount(accountModel, rUserName)
isds.doIsdsAction("syncOneAccount", rUserName)
}
}
Connections {
target: isds
onRunSyncOneAccountSig: {
if (rUserName == userName) {
isds.syncOneAccount(accountModel, userName)
}
}
}
}
......
......@@ -160,7 +160,7 @@ Component {
anchors.fill: parent
onClicked: {
if (index == 0) {
isds.downloadMessage(messageModel, userName, msgType, msgId)
isds.doIsdsAction("downloadMessage", userName)
} else if (index == 1) {
messages.markMessageAsLocallyRead(messageModel, userName, msgId, true)
} else if (index == 2) {
......@@ -186,5 +186,11 @@ Component {
delegate: messageMenuComponent
}
}
Connections {
target: isds
onRunDownloadMessageSig: {
isds.downloadMessage(messageModel, userName, msgType, msgId)
}
}
}
}
......@@ -151,7 +151,7 @@ Component {
anchors.fill: parent
onClicked: {
if (index == 0) {
isds.downloadMessage(messageModel, userName, msgType, msgId)
isds.doIsdsAction("downloadMessage", userName)
} else if (index == 1) {
files.sendAttachmentsWithEmailFromDb(userName, msgId)
} else if (index == 2) {
......
......@@ -201,7 +201,7 @@ Component {
anchors.fill: parent
onClicked: {
if (fromLocalDb) {
isds.downloadMessage(messageModel, userName, msgType, zfoId)
isds.doIsdsAction("downloadMessage", userName)
}
}
}
......@@ -394,7 +394,7 @@ Component {
if (downloadStart) {
downloadStart = false
if (fromLocalDb) {
isds.downloadMessage(messageModel, userName, msgType, zfoId)
isds.doIsdsAction("downloadMessage", userName)
}
}
}
......@@ -416,7 +416,7 @@ Component {
anchors.fill: parent
onClicked: {
if (fromLocalDb) {
isds.downloadMessage(messageModel, userName, msgType, zfoId)
isds.doIsdsAction("downloadMessage", userName)
}
}
}
......@@ -433,5 +433,13 @@ Component {
wrapMode: Text.WordWrap
text: ""
} // Text
Connections {
target: isds
onRunDownloadMessageSig: {
if (fromLocalDb) {
isds.downloadMessage(messageModel, userName, msgType, zfoId)
}
}
}
}
}
......@@ -215,9 +215,9 @@ Component {
if (downloadStart) {
downloadStart = false
if (msgType == MessageType.TYPE_RECEIVED) {
isds.syncSingleAccountReceived(accountModel, messageModel, userName)
isds.doIsdsAction("syncSingleAccountReceived", userName)
} else if (msgType == MessageType.TYPE_SENT) {
isds.syncSingleAccountSent(accountModel, messageModel, userName)
isds.doIsdsAction("syncSingleAccountSent", userName)
}
}
}
......@@ -234,6 +234,18 @@ Component {
messages.fillMessageList(messageModel, userName, msgType)
}
}
Connections {
target: isds
onRunSyncSingleAccountReceivedSig: {
isds.syncSingleAccountReceived(accountModel, messageModel, userName)
}
}
Connections {
target: isds
onRunSyncSingleAccountSentSig: {
isds.syncSingleAccountSent(accountModel, messageModel, userName)
}
}
}
}
}
......@@ -78,7 +78,8 @@ Item {
passwordTextField.text.toString(),
testAccount.checked, rememberPassword.checked,
useLS.checked, certPathLabelId.text.toString())) {
isds.getAccountInfo(userNameTextField.text.toString(), true)
/* TODO - remove the function or make it asynchronous */
isds.getAccountInfo(userNameTextField.text.toString())
}
} else {
if (accounts.updateAccount(accountModel, sLoginMethod,
......
......@@ -84,6 +84,11 @@
#define OTP_TYPE_HOTP "HOTP"
#define OTP_NO_OTP "noOTP"
/* PASSWORD TYPE */
#define PWD_PWD "pwd"
#define PWD_CERT "cert"
#define PWD_HOTP "hotp"
#define PWD_TOTP "totp"
/*!
* @brief Maximum length of message list to be downloaded.
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment