procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix macOS native notification callbacks.

This commit is contained in:
John Preston 2017-03-08 10:31:05 +03:00
parent ed3b2cc017
commit b5d9eee489
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/mainwindow.cpp
View File

@ -187,7 +187,7 @@ void MainWindow::firstShow() {
trayIconMenu->addAction(notificationActionText, this, SLOT(toggleDisplayNotifyFromTray()))->setEnabled(true); trayIconMenu->addAction(notificationActionText, this, SLOT(toggleDisplayNotifyFromTray()))->setEnabled(true);
trayIconMenu->addAction(lang(lng_quit_from_tray), this, SLOT(quitFromTray()))->setEnabled(true); trayIconMenu->addAction(lang(lng_quit_from_tray), this, SLOT(quitFromTray()))->setEnabled(true);
} }
workmodeUpdated(Global::WorkMode().value()); Global::RefWorkMode().setForced(Global::WorkMode().value(), true);
psFirstShow(); psFirstShow();
updateTrayMenu(); updateTrayMenu();

32
Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
View File

@ -39,27 +39,26 @@ NSImage *qt_mac_create_nsimage(const QPixmap &pm);
@interface NotificationDelegate : NSObject<NSUserNotificationCenterDelegate> { @interface NotificationDelegate : NSObject<NSUserNotificationCenterDelegate> {
} }
- (id) init; - (id) initWithManager:(std::shared_ptr<Manager*>)manager;
- (void)userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification; - (void)userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification;
- (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center shouldPresentNotification:(NSUserNotification *)notification; - (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center shouldPresentNotification:(NSUserNotification *)notification;
@end @end
@implementation NotificationDelegate { @implementation NotificationDelegate {
std::weak_ptr<Manager*> _manager;
} }
- (id) init { - (id) initWithManager:(std::shared_ptr<Manager*>)manager {
if (self = [super init]) { if (self = [super init]) {
_manager = manager;
} }
return self; return self;
} }
- (void) userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification { - (void) userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification {
auto manager = ManagerInstance.data();
if (!manager) {
return;
}
NSDictionary *notificationUserInfo = [notification userInfo]; NSDictionary *notificationUserInfo = [notification userInfo];
NSNumber *launchIdObject = [notificationUserInfo objectForKey:@"launch"]; NSNumber *launchIdObject = [notificationUserInfo objectForKey:@"launch"];
auto notificationLaunchId = launchIdObject ? [launchIdObject unsignedLongLongValue] : 0ULL; auto notificationLaunchId = launchIdObject ? [launchIdObject unsignedLongLongValue] : 0ULL;
@ -78,9 +77,13 @@ NSImage *qt_mac_create_nsimage(const QPixmap &pm);
auto notificationMsgId = msgObject ? [msgObject intValue] : 0; auto notificationMsgId = msgObject ? [msgObject intValue] : 0;
if (notification.activationType == NSUserNotificationActivationTypeReplied) { if (notification.activationType == NSUserNotificationActivationTypeReplied) {
auto notificationReply = QString::fromUtf8([[[notification response] string] UTF8String]); auto notificationReply = QString::fromUtf8([[[notification response] string] UTF8String]);
manager->notificationReplied(notificationPeerId, notificationMsgId, notificationReply); if (auto manager = _manager.lock()) {
(*manager)->notificationReplied(notificationPeerId, notificationMsgId, notificationReply);
}
} else if (notification.activationType == NSUserNotificationActivationTypeContentsClicked) { } else if (notification.activationType == NSUserNotificationActivationTypeContentsClicked) {
manager->notificationActivated(notificationPeerId, notificationMsgId); if (auto manager = _manager.lock()) {
(*manager)->notificationActivated(notificationPeerId, notificationMsgId);
}
} }
[center removeDeliveredNotification: notification]; [center removeDeliveredNotification: notification];
@ -122,7 +125,7 @@ void CustomNotificationShownHook(QWidget *widget) {
class Manager::Private : public QObject, private base::Subscriber { class Manager::Private : public QObject, private base::Subscriber {
public: public:
Private(); Private(Manager *manager);
void showNotification(PeerData *peer, MsgId msgId, const QString &title, const QString &subtitle, const QString &msg, bool hideNameAndPhoto, bool hideReplyButton); void showNotification(PeerData *peer, MsgId msgId, const QString &title, const QString &subtitle, const QString &msg, bool hideNameAndPhoto, bool hideReplyButton);
void clearAll(); void clearAll();
void clearFromHistory(History *history); void clearFromHistory(History *history);
@ -131,11 +134,14 @@ public:
~Private(); ~Private();
private: private:
NotificationDelegate *_delegate; std::shared_ptr<Manager*> _guarded;
NotificationDelegate *_delegate = nullptr;
}; };
Manager::Private::Private() : _delegate([[NotificationDelegate alloc] init]) { Manager::Private::Private(Manager *manager)
: _guarded(std::make_shared<Manager*>(manager))
, _delegate([[NotificationDelegate alloc] initWithManager:_guarded]) {
updateDelegate(); updateDelegate();
subscribe(Global::RefWorkMode(), [this](DBIWorkMode mode) { subscribe(Global::RefWorkMode(), [this](DBIWorkMode mode) {
// We need to update the delegate _after_ the tray icon change was done in Qt. // We need to update the delegate _after_ the tray icon change was done in Qt.
@ -220,7 +226,7 @@ Manager::Private::~Private() {
} }
Manager::Manager(Window::Notifications::System *system) : NativeManager(system) Manager::Manager(Window::Notifications::System *system) : NativeManager(system)
, _private(std::make_unique<Private>()) { , _private(std::make_unique<Private>(this)) {
} }
Manager::~Manager() = default; Manager::~Manager() = default;