Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-25 17:01:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix TouchID not being shown after lid close

Browse Source 
Fixes #8945
Fixes #10315
This commit is contained in:
Janek Bevendorff 2024-02-22 13:39:59 +01:00 committed by Jonathan White
parent 6a273363c4
commit aace1dc913
3 changed files with 63 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/gui/DatabaseOpenWidget.cpp
View File

@ -34,6 +34,7 @@
#include <QCloseEvent> #include <QCloseEvent>
#include <QDesktopServices> #include <QDesktopServices>
#include <QFont> #include <QFont>
namespace namespace
{ {
constexpr int clearFormsDelay = 30000; constexpr int clearFormsDelay = 30000;
@ -45,15 +46,6 @@ namespace
} }
return false; return false;
} }
bool canPerformQuickUnlock(const QUuid& dbUuid)
{
if (isQuickUnlockAvailable()) {
return getQuickUnlock()->hasKey(dbUuid);
}
Q_UNUSED(dbUuid);
return false;
}
} // namespace } // namespace
DatabaseOpenWidget::DatabaseOpenWidget(QWidget* parent) DatabaseOpenWidget::DatabaseOpenWidget(QWidget* parent)
@ -174,50 +166,57 @@ void DatabaseOpenWidget::toggleHardwareKeyComponent(bool state)
} }
} }
void DatabaseOpenWidget::showEvent(QShowEvent* event) bool DatabaseOpenWidget::event(QEvent* event)
{ {
DialogyWidget::showEvent(event); bool ret = DialogyWidget::event(event);
if (isOnQuickUnlockScreen()) {
m_ui->quickUnlockButton->setFocus(); switch (event->type()) {
if (m_db.isNull() || !canPerformQuickUnlock(m_db->publicUuid())) { case QEvent::Show:
case QEvent::WindowActivate: {
if (isOnQuickUnlockScreen() && (m_db.isNull() || !canPerformQuickUnlock())) {
resetQuickUnlock(); resetQuickUnlock();
} }
} else { toggleQuickUnlockScreen();
m_ui->editPassword->setFocus(); m_hideTimer.stop();
}
m_hideTimer.stop();
#ifdef WITH_XC_YUBIKEY #ifdef WITH_XC_YUBIKEY
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
m_deviceListener->registerHotplugCallback(true, m_deviceListener->registerHotplugCallback(true,
true, true,
YubiKeyInterfaceUSB::YUBICO_USB_VID, YubiKeyInterfaceUSB::YUBICO_USB_VID,
DeviceListener::MATCH_ANY, DeviceListener::MATCH_ANY,
&DeviceListenerWin::DEV_CLS_KEYBOARD); &DeviceListenerWin::DEV_CLS_KEYBOARD);
m_deviceListener->registerHotplugCallback(true, m_deviceListener->registerHotplugCallback(true,
true, true,
YubiKeyInterfaceUSB::ONLYKEY_USB_VID, YubiKeyInterfaceUSB::ONLYKEY_USB_VID,
DeviceListener::MATCH_ANY, DeviceListener::MATCH_ANY,
&DeviceListenerWin::DEV_CLS_KEYBOARD); &DeviceListenerWin::DEV_CLS_KEYBOARD);
#else #else
m_deviceListener->registerHotplugCallback(true, true, YubiKeyInterfaceUSB::YUBICO_USB_VID); m_deviceListener->registerHotplugCallback(true, true, YubiKeyInterfaceUSB::YUBICO_USB_VID);
m_deviceListener->registerHotplugCallback(true, true, YubiKeyInterfaceUSB::ONLYKEY_USB_VID); m_deviceListener->registerHotplugCallback(true, true, YubiKeyInterfaceUSB::ONLYKEY_USB_VID);
#endif #endif
#endif #endif
}
void DatabaseOpenWidget::hideEvent(QHideEvent* event) return true;
{
DialogyWidget::hideEvent(event);
// Schedule form clearing if we are hidden
if (!isVisible()) {
m_hideTimer.start();
} }
case QEvent::Hide: {
// Schedule form clearing if we are hidden
if (!isVisible()) {
m_hideTimer.start();
}
#ifdef WITH_XC_YUBIKEY #ifdef WITH_XC_YUBIKEY
m_deviceListener->deregisterAllHotplugCallbacks(); m_deviceListener->deregisterAllHotplugCallbacks();
#endif #endif
return true;
}
default:;
}
return ret;
} }
bool DatabaseOpenWidget::unlockingDatabase() bool DatabaseOpenWidget::unlockingDatabase()
@ -246,12 +245,7 @@ void DatabaseOpenWidget::load(const QString& filename)
} }
} }
if (canPerformQuickUnlock(m_db->publicUuid())) { toggleQuickUnlockScreen();
m_ui->centralStack->setCurrentIndex(1);
m_ui->quickUnlockButton->setFocus();
} else {
m_ui->editPassword->setFocus();
}
#ifdef WITH_XC_YUBIKEY #ifdef WITH_XC_YUBIKEY
// Do initial auto-poll // Do initial auto-poll
@ -268,7 +262,7 @@ void DatabaseOpenWidget::clearForms()
m_ui->keyFileLineEdit->setShowPassword(false); m_ui->keyFileLineEdit->setShowPassword(false);
m_ui->keyFileLineEdit->setClearButtonEnabled(true); m_ui->keyFileLineEdit->setClearButtonEnabled(true);
m_ui->hardwareKeyCombo->clear(); m_ui->hardwareKeyCombo->clear();
m_ui->centralStack->setCurrentIndex(0); toggleQuickUnlockScreen();
QString error; QString error;
m_db.reset(new Database()); m_db.reset(new Database());
@ -387,7 +381,7 @@ QSharedPointer<CompositeKey> DatabaseOpenWidget::buildDatabaseKey()
{ {
auto databaseKey = QSharedPointer<CompositeKey>::create(); auto databaseKey = QSharedPointer<CompositeKey>::create();
if (!m_db.isNull() && canPerformQuickUnlock(m_db->publicUuid())) { if (!m_db.isNull() && canPerformQuickUnlock()) {
// try to retrieve the stored password using Windows Hello // try to retrieve the stored password using Windows Hello
QByteArray keyData; QByteArray keyData;
if (!getQuickUnlock()->getKey(m_db->publicUuid(), keyData)) { if (!getQuickUnlock()->getKey(m_db->publicUuid(), keyData)) {
@ -574,11 +568,27 @@ void DatabaseOpenWidget::setUserInteractionLock(bool state)
m_unlockingDatabase = state; m_unlockingDatabase = state;
} }
bool DatabaseOpenWidget::isOnQuickUnlockScreen() bool DatabaseOpenWidget::canPerformQuickUnlock() const
{
return !m_db.isNull() && isQuickUnlockAvailable() && getQuickUnlock()->hasKey(m_db->publicUuid());
}
bool DatabaseOpenWidget::isOnQuickUnlockScreen() const
{ {
return m_ui->centralStack->currentIndex() == 1; return m_ui->centralStack->currentIndex() == 1;
} }
void DatabaseOpenWidget::toggleQuickUnlockScreen()
{
if (canPerformQuickUnlock()) {
m_ui->centralStack->setCurrentIndex(1);
m_ui->quickUnlockButton->setFocus();
} else {
m_ui->centralStack->setCurrentIndex(0);
m_ui->editPassword->setFocus();
}
}
void DatabaseOpenWidget::triggerQuickUnlock() void DatabaseOpenWidget::triggerQuickUnlock()
{ {
if (isOnQuickUnlockScreen()) { if (isOnQuickUnlockScreen()) {

7
src/gui/DatabaseOpenWidget.h
View File

@ -53,7 +53,9 @@ public:
bool unlockingDatabase(); bool unlockingDatabase();
// Quick Unlock helper functions // Quick Unlock helper functions
bool isOnQuickUnlockScreen(); bool canPerformQuickUnlock() const;
bool isOnQuickUnlockScreen() const;
void toggleQuickUnlockScreen();
void triggerQuickUnlock(); void triggerQuickUnlock();
void resetQuickUnlock(); void resetQuickUnlock();
@ -61,8 +63,7 @@ signals:
void dialogFinished(bool accepted); void dialogFinished(bool accepted);
protected: protected:
void showEvent(QShowEvent* event) override; bool event(QEvent* event) override;
void hideEvent(QHideEvent* event) override;
QSharedPointer<CompositeKey> buildDatabaseKey(); QSharedPointer<CompositeKey> buildDatabaseKey();
void setUserInteractionLock(bool state); void setUserInteractionLock(bool state);

4
src/quickunlock/TouchID.mm
View File

@ -338,9 +338,7 @@ bool TouchID::isAvailable() const
// note: we cannot cache the check results because the configuration // note: we cannot cache the check results because the configuration
// is dynamic in its nature. User can close the laptop lid or take off // is dynamic in its nature. User can close the laptop lid or take off
// the watch, thus making one (or both) of the authentication types unavailable. // the watch, thus making one (or both) of the authentication types unavailable.
const bool watchAvailable = isWatchAvailable(); return isWatchAvailable() || isTouchIdAvailable();
const bool touchIdAvailable = isTouchIdAvailable();
return watchAvailable || touchIdAvailable;
} }
/** /**