SYNERGY-1085 Notificatons for unknown applications (#7066)
* SYNERGY-1085 Notificatons for unknown applications * Update ChangeLog
This commit is contained in:
parent
1a38713ff8
commit
28dcd34251
3 changed files with 25 additions and 15 deletions
|
|
@ -12,7 +12,7 @@ Bug fixes:
|
||||||
- #7046 Fix MacOS 10.13 build
|
- #7046 Fix MacOS 10.13 build
|
||||||
- #7049 Scroll doesn't work in case of macOS is server
|
- #7049 Scroll doesn't work in case of macOS is server
|
||||||
- #7057 | #7058 Fix copy paste logic, when OS reported about clipboard update too late
|
- #7057 | #7058 Fix copy paste logic, when OS reported about clipboard update too late
|
||||||
- #7055 Add secure input notification on Linux
|
- #7055 | #7066 Add secure input notification on Linux
|
||||||
- #7052 Add secure input notification on Windows
|
- #7052 Add secure input notification on Windows
|
||||||
- #7047 | #7060 Fix prevent sleep option on Mac and Windows
|
- #7047 | #7060 Fix prevent sleep option on Mac and Windows
|
||||||
- #7064 There is no secure input notification if user moves pointer between clients
|
- #7064 There is no secure input notification if user moves pointer between clients
|
||||||
|
|
|
||||||
|
|
@ -919,12 +919,17 @@ ServerProxy::secureInputNotification()
|
||||||
String app;
|
String app;
|
||||||
ProtocolUtil::readf(m_stream, kMsgDSecureInputNotification + 4, &app);
|
ProtocolUtil::readf(m_stream, kMsgDSecureInputNotification + 4, &app);
|
||||||
|
|
||||||
String secureInputNotificationBody =
|
|
||||||
"'Secure input' enabled by " + app + " on the server. " \
|
|
||||||
"To fix the keyboard, " + app + " must be closed.";
|
|
||||||
|
|
||||||
// display this notification on the client
|
// display this notification on the client
|
||||||
AppUtil::instance().showNotification(
|
if (app != "unknown") {
|
||||||
"The keyboard may stop working.",
|
AppUtil::instance().showNotification(
|
||||||
secureInputNotificationBody);
|
"The keyboard may stop working.",
|
||||||
|
"'Secure input' enabled by " + app + " on the server. " \
|
||||||
|
"To fix the keyboard, " + app + " must be closed.");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
AppUtil::instance().showNotification(
|
||||||
|
"The keyboard may stop working.",
|
||||||
|
"'Secure input' enabled by an application on the server. " \
|
||||||
|
"To fix the keyboard, the application must be closed.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -270,13 +270,18 @@ PrimaryClient::getSecureInputApp() const
|
||||||
void
|
void
|
||||||
PrimaryClient::secureInputNotification(const String& app) const
|
PrimaryClient::secureInputNotification(const String& app) const
|
||||||
{
|
{
|
||||||
String secureInputNotificationBody =
|
if (app != "unknown") {
|
||||||
"'Secure input' enabled by " + app + ". " \
|
AppUtil::instance().showNotification(
|
||||||
"Close " + app + " to continue using keyboards on the clients.";
|
"The client keyboards may stop working.",
|
||||||
|
"'Secure input' enabled by " + app + ". " \
|
||||||
AppUtil::instance().showNotification(
|
"Close " + app + " to continue using keyboards on the clients.");
|
||||||
"The client keyboards may stop working.",
|
}
|
||||||
secureInputNotificationBody);
|
else {
|
||||||
|
AppUtil::instance().showNotification(
|
||||||
|
"The client keyboards may stop working.",
|
||||||
|
"'Secure input' enabled by an application. " \
|
||||||
|
"Close the application to continue using keyboards on the clients.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue