Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2026-02-11 03:28:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(GODT-2778): fix login screen being disabled after an 'already logged in' error.

Browse Source
This commit is contained in:
Xavier Michelon
2023-07-10 09:44:18 +02:00
parent 8248491833
commit 6cb52cacc9
6 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/frontend/bridge-gui/bridge-gui-tester/UserTable.cpp
View File

@ -150,13 +150,16 @@ bridgepp::SPUser UserTable::userWithID(QString const &userID) {
//****************************************************************************************************************************************************
/// \param[in] username The username.
/// \param[in] username The username, or any email address attached to the account.
/// \return The user with the given username.
/// \return A null pointer if the user is not in the list.
//****************************************************************************************************************************************************
bridgepp::SPUser UserTable::userWithUsername(QString const &username) {
bridgepp::SPUser UserTable::userWithUsernameOrEmail(QString const &username) {
QList<SPUser>::const_iterator it = std::find_if(users_.constBegin(), users_.constEnd(), [&username](SPUser const &user) -> bool {
return user->username() == username;
if (user->username().compare(username, Qt::CaseInsensitive) == 0) {
return true;
}
return user->addresses().contains(username, Qt::CaseInsensitive);
});
return it == users_.end() ? nullptr : *it;