nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 23:52:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

dispatch_after instead of performSelector:afterDelay. Converted internal property to iVar

Browse Source
This commit is contained in:
michael starke
2017-10-19 17:06:00 +02:00
parent 392dcc51f0
commit 0dafc89771
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
MacPass/MPDockTileHelper.m
View File

@@ -25,10 +25,9 @@
@interface MPDockTileHelper () { @interface MPDockTileHelper () {
BOOL _pasteboardCleard; BOOL _pasteboardCleard;
NSTimeInterval _timeStamp;
} }
@property (assign) NSTimeInterval timeStamp;
@end @end
@implementation MPDockTileHelper @implementation MPDockTileHelper
@@ -37,14 +36,14 @@
self = [super init]; self = [super init];
if (self) { if (self) {
MPPasteBoardController *controller = [MPPasteBoardController defaultController]; MPPasteBoardController *controller = [MPPasteBoardController defaultController];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didCopyToPastboard:) name:MPPasteBoardControllerDidCopyObjects object:controller]; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(didCopyToPastboard:) name:MPPasteBoardControllerDidCopyObjects object:controller];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didClearPasteboard:) name:MPPasteBoardControllerDidClearClipboard object:controller]; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(didClearPasteboard:) name:MPPasteBoardControllerDidClearClipboard object:controller];
} }
return self; return self;
} }
- (void)didCopyToPastboard:(NSNotification *)notification { - (void)didCopyToPastboard:(NSNotification *)notification {
self.timeStamp = [NSDate timeIntervalSinceReferenceDate]; _timeStamp = NSDate.timeIntervalSinceReferenceDate;
_pasteboardCleard = NO; _pasteboardCleard = NO;
if([MPPasteBoardController defaultController].clearTimeout > 0) { if([MPPasteBoardController defaultController].clearTimeout > 0) {
[self updateBadge]; [self updateBadge];
@@ -54,9 +53,11 @@
- (void)didClearPasteboard:(NSNotification *)notification { - (void)didClearPasteboard:(NSNotification *)notification {
_pasteboardCleard = YES; _pasteboardCleard = YES;
if([MPPasteBoardController defaultController].clearTimeout > 0) { if([MPPasteBoardController defaultController].clearTimeout > 0) {
[[NSApp dockTile] setBadgeLabel:NSLocalizedString(@"CLEARING_PASTEBOARD","")]; NSApp.dockTile.badgeLabel = NSLocalizedString(@"CLEARING_PASTEBOARD", "String displayed at dock badge when clipboard is about to be cleared");
} }
[self performSelector:@selector(clearBadge) withObject:nil afterDelay:1]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self clearBadge];
});
} }
- (void)clearBadge { - (void)clearBadge {
@@ -68,10 +69,12 @@
return; return;
} }
NSTimeInterval timeOut = [MPPasteBoardController defaultController].clearTimeout; NSTimeInterval timeOut = [MPPasteBoardController defaultController].clearTimeout;
NSTimeInterval countDown = timeOut - ([NSDate timeIntervalSinceReferenceDate] - self.timeStamp); NSTimeInterval countDown = timeOut - (NSDate.timeIntervalSinceReferenceDate - _timeStamp);
if(countDown > 0) { if(countDown > 0) {
[[NSApp dockTile] setBadgeLabel:[[NSString alloc] initWithFormat:@"%d", (int)countDown]]; NSApp.dockTile.badgeLabel = [[NSString alloc] initWithFormat:@"%d", (int)countDown];
[self performSelector:@selector(updateBadge) withObject:nil afterDelay:1]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self updateBadge];
});
} }
} }