Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-10 12:46:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(GODT-2467): elide long email adresses in 'bad event' QML notification dialog.

Browse Source
This commit is contained in:
Xavier Michelon
2023-03-09 12:16:17 +01:00
parent b57c7abe92
commit 7be46a4740
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/frontend/bridge-gui/bridge-gui/QMLBackend.cpp
View File

@ -23,6 +23,7 @@
#include <bridgepp/GRPC/GRPCClient.h>
#include <bridgepp/Exception/Exception.h>
#include <bridgepp/Worker/Overseer.h>
#include <bridgepp/BridgeUtils.h>
#define HANDLE_EXCEPTION(x) try { x } \
@ -1033,7 +1034,7 @@ void QMLBackend::displayBadEventDialog(QString const &userID) {
emit userBadEvent(userID,
tr("Bridge ran into an internal error and it is not able to proceed with the account %1. Synchronize your local database now or logout"
" to do it later. Synchronization time depends on the size of your mailbox.").arg(user->primaryEmailOrUsername()));
" to do it later. Synchronization time depends on the size of your mailbox.").arg(elideLongString(user->primaryEmailOrUsername(), 30)));
emit selectUser(userID);
emit showMainWindow();
)

16
internal/frontend/bridge-gui/bridgepp/bridgepp/BridgeUtils.cpp
View File

@ -280,4 +280,20 @@ bool onWindows() {
}
//****************************************************************************************************************************************************
/// Elision is performed by inserting '...' around the (maxLen / 2) - 2 left-most and right-most characters of the string.
///
/// \return The elided string, or the original string if its length does not exceed maxLength.
//****************************************************************************************************************************************************
QString elideLongString(QString const &str, qint32 maxLength) {
qint32 const len = str.length();
if (len <= maxLength) {
return str;
}
qint32 const hLen = qMax(0, (maxLength / 2) - 2);
return str.left(hLen) + "..." + str.right(hLen);
}
} // namespace bridgepp

1
internal/frontend/bridge-gui/bridgepp/bridgepp/BridgeUtils.h
View File

@ -49,6 +49,7 @@ OS os(); ///< Return the operating system.
bool onLinux(); ///< Check if the OS is Linux.
bool onMacOS(); ///< Check if the OS is macOS.
bool onWindows(); ///< Check if the OS in Windows.
QString elideLongString(QString const &str, qint32 maxLength); ///< Elide a string in the middle if its length exceed maxLength.
} // namespace