mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-05 21:47:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use QSharedPointer instead of cloning YkChallengeResponseKey and make it a QObject to allow emitting signals

Browse source
This commit is contained in:
Janek Bevendorff 2017-02-23 23:52:36 +01:00
parent e93e4a9931
commit 093fe5c7ef
No known key found for this signature in database
GPG key ID: CFEC2F6850BFFA53
9 changed files with 78 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/gui/ChangeMasterKeyWidget.cpp
View file

@ -15,8 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtConcurrentRun>
#include "ChangeMasterKeyWidget.h"
#include "ui_ChangeMasterKeyWidget.h"
@ -30,6 +28,9 @@
#include "config-keepassx.h"
#include <QtConcurrentRun>
#include <QSharedPointer>
ChangeMasterKeyWidget::ChangeMasterKeyWidget(QWidget* parent)
: DialogyWidget(parent)
, m_ui(new Ui::ChangeMasterKeyWidget())
@ -172,9 +173,9 @@ void ChangeMasterKeyWidget::generateKey()
MessageWidget::Error);
return;
}
YkChallengeResponseKey key(i);
bool blocking = i & true;
int slot = i >> 1;
auto key = QSharedPointer<YkChallengeResponseKey>(new YkChallengeResponseKey(slot, blocking));
m_key.addChallengeResponseKey(key);
}
#endif
@ -210,7 +211,7 @@ void ChangeMasterKeyWidget::pollYubikey()
void ChangeMasterKeyWidget::yubikeyDetected(int slot, bool blocking)
{
YkChallengeResponseKey yk(slot, blocking);
m_ui->comboChallengeResponse->addItem(yk.getName(), QVariant(slot));
m_ui->comboChallengeResponse->addItem(yk.getName(), QVariant((slot << 1) | blocking));
m_ui->comboChallengeResponse->setEnabled(m_ui->challengeResponseGroup->isChecked());
m_ui->buttonRedetectYubikey->setEnabled(m_ui->challengeResponseGroup->isChecked());
m_ui->yubikeyProgress->setVisible(false);