diff --git a/MacPass/Base.lproj/EntryInspectorView.xib b/MacPass/Base.lproj/EntryInspectorView.xib index be9971b7..b9dc22ab 100644 --- a/MacPass/Base.lproj/EntryInspectorView.xib +++ b/MacPass/Base.lproj/EntryInspectorView.xib @@ -798,7 +798,7 @@ - + @@ -903,7 +903,7 @@ - + diff --git a/MacPass/EntryView.xib b/MacPass/EntryView.xib index 62f2f9e2..1f1cdb34 100644 --- a/MacPass/EntryView.xib +++ b/MacPass/EntryView.xib @@ -1,8 +1,8 @@ - + - + @@ -45,11 +45,11 @@ - + - + @@ -131,11 +131,11 @@ - + - + @@ -191,7 +191,7 @@ - + diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m index ab0eea2f..c01e5bf2 100644 --- a/MacPass/MPDocument.m +++ b/MacPass/MPDocument.m @@ -568,7 +568,7 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou - (void)setSelectedNodes:(NSArray *)selectedNodes { if(![_selectedNodes isEqualToArray:selectedNodes]) { _selectedNodes = [selectedNodes copy]; - [[NSNotificationCenter defaultCenter] postNotificationName:MPDocumentCurrentItemChangedNotification object:self]; + [NSNotificationCenter.defaultCenter postNotificationName:MPDocumentCurrentItemChangedNotification object:self]; } } @@ -773,7 +773,7 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou return; // sender cannot provide useful data } id obj = [sender representedObject]; - if(![obj isKindOfClass:[NSUUID class]]) { + if(![obj isKindOfClass:NSUUID.class]) { return; // sender cannot provide NSUUID } NSUUID *entryUUID = [sender representedObject]; @@ -783,7 +783,7 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou if(templateEntry && group) { KPKEntry *copy = [templateEntry copyWithTitle:templateEntry.title options:kKPKCopyOptionNone]; - BOOL updatePassword = [[NSUserDefaults standardUserDefaults] boolForKey:kMPSettingsKeyUpdatePasswordOnTemplateEntries]; + BOOL updatePassword = [NSUserDefaults.standardUserDefaults boolForKey:kMPSettingsKeyUpdatePasswordOnTemplateEntries]; if( updatePassword ) { BOOL undoEnabled = self.undoManager.isUndoRegistrationEnabled; [self.undoManager disableUndoRegistration]; @@ -915,7 +915,7 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou keysForFiles[self.fileURL.path.sha1HexDigest] = keyURL.path; } if(keysForFiles) { - [[NSUserDefaults standardUserDefaults] setObject:keysForFiles forKey:kMPSettingsKeyRememeberdKeysForDatabases]; + [NSUserDefaults.standardUserDefaults setObject:keysForFiles forKey:kMPSettingsKeyRememeberdKeysForDatabases]; } } diff --git a/MacPass/MPLockDaemon.m b/MacPass/MPLockDaemon.m index a076f24b..5180f37d 100644 --- a/MacPass/MPLockDaemon.m +++ b/MacPass/MPLockDaemon.m @@ -29,7 +29,7 @@ @property (nonatomic,assign) BOOL lockOnSleep; @property (nonatomic,assign) BOOL lockOnLogout; @property (nonatomic,assign) NSUInteger idleLockTime; -@property (nonatomic,strong) id eventHandler; +@property (nonatomic,strong) id localEventHandler; @property (nonatomic,strong) NSTimer *idleCheckTimer; @property (assign) NSTimeInterval lastLocalEventTime; @@ -55,7 +55,7 @@ static MPLockDaemon *_sharedInstance; NSAssert(_sharedInstance == nil, @"Multiple instances of MPLockDaemon not allowed!"); self = [super init]; if (self) { - NSUserDefaultsController *defaultsController = [NSUserDefaultsController sharedUserDefaultsController]; + NSUserDefaultsController *defaultsController = NSUserDefaultsController.sharedUserDefaultsController; [self bind:NSStringFromSelector(@selector(lockOnSleep)) toObject:defaultsController withKeyPath:[MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeyLockOnSleep] options:nil]; [self bind:NSStringFromSelector(@selector(idleLockTime)) toObject:defaultsController withKeyPath:[MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeyIdleLockTimeOut] options:nil]; [self bind:NSStringFromSelector(@selector(lockOnLogout)) toObject:defaultsController withKeyPath:[MPSettingsHelper defaultControllerPathForKey:kMPSettingskeyLockOnLogout] options:nil]; @@ -65,10 +65,10 @@ static MPLockDaemon *_sharedInstance; - (void)dealloc { /* Notifications */ - [[NSWorkspace sharedWorkspace].notificationCenter removeObserver:self]; + [NSWorkspace.sharedWorkspace.notificationCenter removeObserver:self]; /* Timer */ - [NSEvent removeMonitor:self.eventHandler]; + [NSEvent removeMonitor:self.localEventHandler]; } - (void)setLockOnLogout:(BOOL)lockOnLogout { @@ -87,10 +87,10 @@ static MPLockDaemon *_sharedInstance; if(_lockOnSleep != lockOnSleep) { _lockOnSleep = lockOnSleep; if(_lockOnSleep) { - [[NSWorkspace sharedWorkspace].notificationCenter addObserver:self selector:@selector(_willSleepNotification:) name:NSWorkspaceWillSleepNotification object:nil]; + [NSWorkspace.sharedWorkspace.notificationCenter addObserver:self selector:@selector(_willSleepNotification:) name:NSWorkspaceWillSleepNotification object:nil]; } else { - [[NSWorkspace sharedWorkspace].notificationCenter removeObserver:self name:NSWorkspaceWillSleepNotification object:nil]; + [NSWorkspace.sharedWorkspace.notificationCenter removeObserver:self name:NSWorkspaceWillSleepNotification object:nil]; } } } @@ -118,22 +118,22 @@ static MPLockDaemon *_sharedInstance; if(timer != self.idleCheckTimer) { return; // Wrong timer?! } - NSTimeInterval currentInterval = ([NSDate timeIntervalSinceReferenceDate] - self.lastLocalEventTime); + NSTimeInterval currentInterval = (NSDate.timeIntervalSinceReferenceDate - self.lastLocalEventTime); if(self.idleLockTime < currentInterval) { [((MPAppDelegate *)NSApp.delegate) lockAllDocuments]; /* Reset the timer to full interval */ - [self.idleCheckTimer setFireDate:[NSDate dateWithTimeIntervalSinceNow:_idleLockTime]]; + self.idleCheckTimer.fireDate = [NSDate dateWithTimeIntervalSinceNow:_idleLockTime]; } else { - [self.idleCheckTimer setFireDate:[NSDate dateWithTimeIntervalSinceNow:(_idleLockTime - currentInterval)]]; + self.idleCheckTimer.fireDate = [NSDate dateWithTimeIntervalSinceNow:(_idleLockTime - currentInterval)]; } } - (void)_stopIdleChecking { [self.idleCheckTimer invalidate]; self.idleCheckTimer = nil; - [NSEvent removeMonitor:self.eventHandler]; - self.eventHandler = nil; + [NSEvent removeMonitor:self.localEventHandler]; + self.localEventHandler = nil; } - (void)_updateOrStartIdleChecking { @@ -144,17 +144,15 @@ static MPLockDaemon *_sharedInstance; } else { self.idleCheckTimer = [NSTimer timerWithTimeInterval:self.idleLockTime target:self selector:@selector(_checkIdleTime:) userInfo:nil repeats:YES]; - [[NSRunLoop mainRunLoop] addTimer:self.idleCheckTimer forMode:NSDefaultRunLoopMode]; + [NSRunLoop.mainRunLoop addTimer:self.idleCheckTimer forMode:NSDefaultRunLoopMode]; } /* Create event handler if necessary */ - if(self.eventHandler) { - return; - } - MPLockDaemon __weak *welf = self; - self.eventHandler = [NSEvent addLocalMonitorForEventsMatchingMask:NSAnyEventMask handler:^NSEvent *(NSEvent *theEvent) { - welf.lastLocalEventTime = [NSDate timeIntervalSinceReferenceDate]; - return theEvent; - }]; + if(!self.localEventHandler) { + self.localEventHandler = [NSEvent addLocalMonitorForEventsMatchingMask:NSAnyEventMask handler:^NSEvent *(NSEvent *theEvent) { + self.lastLocalEventTime = NSDate.timeIntervalSinceReferenceDate; + return theEvent; + }]; + } } @end