From 312d032a7bfccc3bbd933c92dc89d730af59616f Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Fri, 29 Nov 2013 19:11:49 -0200 Subject: BlackBerry: fix password prompt alignment Align certificate and csk password prompts according to their parents Task-number: QTCREATORBUG-10948 Change-Id: I139019b2a5a73f5082a434518c62be97c63574e8 Reviewed-by: David Kaspar Reviewed-by: Tobias Hunger --- src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp') diff --git a/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp b/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp index 37d8a199e2..a2c824ec02 100644 --- a/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp +++ b/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp @@ -144,8 +144,8 @@ void BlackBerryDebugTokenRequestDialog::requestDebugToken() BlackBerryConfigurationManager &configuration = BlackBerryConfigurationManager::instance(); m_requester->requestDebugToken(m_ui->debugTokenPath->path(), - m_utils.cskPassword(), configuration.defaultKeystorePath(), - m_utils.certificatePassword(), m_ui->devicePin->text()); + m_utils.cskPassword(this), configuration.defaultKeystorePath(), + m_utils.certificatePassword(this), m_ui->devicePin->text()); } void BlackBerryDebugTokenRequestDialog::setDefaultPath() -- cgit v1.2.1 From 07da6325a80442ac75c76c083643f2e53c6a3a17 Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Fri, 29 Nov 2013 19:28:04 -0200 Subject: BlackBerry: do not show invalid password message Do not show "Invalid password" dialog when the user has actually pressed "Cancel" upon prompting for the certificate password or csk password dialog, and make sure the "overwrite" dialog does not appear after a failed attempt to request a debug token. Change-Id: Id9aa78ab3517249df5bd3b4c2d1e0fd2032c3c0b Reviewed-by: Tobias Hunger --- .../qnx/blackberrydebugtokenrequestdialog.cpp | 24 ++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp') diff --git a/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp b/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp index a2c824ec02..8585cec354 100644 --- a/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp +++ b/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp @@ -143,9 +143,24 @@ void BlackBerryDebugTokenRequestDialog::requestDebugToken() BlackBerryConfigurationManager &configuration = BlackBerryConfigurationManager::instance(); + bool ok; + const QString cskPassword = m_utils.cskPassword(this, &ok); + + if (!ok) { + setBusy(false); + return; + } + + const QString certificatePassword = m_utils.certificatePassword(this, &ok); + + if (!ok) { + setBusy(false); + return; + } + m_requester->requestDebugToken(m_ui->debugTokenPath->path(), - m_utils.cskPassword(this), configuration.defaultKeystorePath(), - m_utils.certificatePassword(this), m_ui->devicePin->text()); + cskPassword, configuration.defaultKeystorePath(), + certificatePassword, m_ui->devicePin->text()); } void BlackBerryDebugTokenRequestDialog::setDefaultPath() @@ -235,6 +250,11 @@ void BlackBerryDebugTokenRequestDialog::debugTokenArrived(int status) break; } + QFile file(m_ui->debugTokenPath->path()); + + if (file.exists()) + file.remove(); + QMessageBox::critical(this, tr("Error"), errorString); setBusy(false); -- cgit v1.2.1