mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Add global shortcut permissions check on macOS.

Browse Source
This commit is contained in:
John Preston
2020-12-07 15:47:39 +04:00
parent 25ffdcc919
commit f11df0519e
5 changed files with 120 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Telegram/SourceFiles/calls/calls_group_call.cpp
View File

@@ -65,6 +65,8 @@ GroupCall::GroupCall(
}
}, _lifetime);
checkGlobalShortcutAvailability();
const auto id = inputCall.c_inputGroupCall().vid().v;
if (id) {
if (const auto call = _channel->call(); call && call->id() == id) {
@@ -83,6 +85,16 @@ GroupCall::~GroupCall() {
destroyController();
}
void GroupCall::checkGlobalShortcutAvailability() {
auto &settings = Core::App().settings();
if (!settings.groupCallPushToTalk()) {
return;
} else if (!base::GlobalShortcutsAllowed()) {
settings.setGroupCallPushToTalk(false);
Core::App().saveSettingsDelayed();
}
}
void GroupCall::setState(State state) {
if (_state.current() == State::Failed) {
return;
@@ -747,18 +759,14 @@ auto GroupCall::ensureGlobalShortcutManager()
void GroupCall::applyGlobalShortcutChanges() {
auto &settings = Core::App().settings();
if (!settings.groupCallPushToTalk()
|| settings.groupCallPushToTalkShortcut().isEmpty()) {
|| settings.groupCallPushToTalkShortcut().isEmpty()
|| !base::GlobalShortcutsAvailable()
|| !base::GlobalShortcutsAllowed()) {
_shortcutManager = nullptr;
_pushToTalk = nullptr;
return;
}
ensureGlobalShortcutManager();
if (!_shortcutManager) {
settings.setGroupCallPushToTalk(false);
Core::App().saveSettingsDelayed();
_pushToTalk = nullptr;
return;
}
const auto shortcut = _shortcutManager->shortcutFromSerialized(
settings.groupCallPushToTalkShortcut());
if (!shortcut) {