nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2026-02-01 11:28:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed autotype regression preventing self-autotyping. Added re-hiding for special placeholders

Browse Source
This commit is contained in:
Michael Starke
2020-01-28 10:28:42 +01:00
parent 9409887942
commit c85a9cdce1
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MacPass/MPAutotypeDaemon.m
View File

@@ -190,7 +190,10 @@ static MPAutotypeDaemon *_sharedInstance;
} }
- (void)_runAutotypeWithEnvironment:(MPAutotypeEnvironment *)env { - (void)_runAutotypeWithEnvironment:(MPAutotypeEnvironment *)env {
if(env.isSelfTargeting) {
return; // we do not want to target ourselves
}
if(!self.hasNecessaryAutotypePermissions) { if(!self.hasNecessaryAutotypePermissions) {
NSUserNotification *notification = [[NSUserNotification alloc] init]; NSUserNotification *notification = [[NSUserNotification alloc] init];
notification.title = NSLocalizedString(@"AUTOTYPE_NOTIFICATION_PERMISSIONS_MISSING_TITLE", "Title for autotype feedback on missing permissions"); notification.title = NSLocalizedString(@"AUTOTYPE_NOTIFICATION_PERMISSIONS_MISSING_TITLE", "Title for autotype feedback on missing permissions");
@@ -329,6 +332,10 @@ static MPAutotypeDaemon *_sharedInstance;
usleep(globalDelay*NSEC_PER_USEC); usleep(globalDelay*NSEC_PER_USEC);
} }
[command execute]; [command execute];
/* re-hide after every command since this might have put us back up front */
if(environment.hidden) {
[NSApplication.sharedApplication hide:nil];
}
}); });
} }
} }

2
MacPass/MPAutotypeEnvironment.m
View File

@@ -47,7 +47,7 @@
} }
- (BOOL)isSelfTargeting { - (BOOL)isSelfTargeting {
return NSRunningApplication.currentApplication.processIdentifier != _pid; return NSRunningApplication.currentApplication.processIdentifier == _pid;
} }
- (NSDictionary *)_infoDictionaryForApplication:(NSRunningApplication *)application { - (NSDictionary *)_infoDictionaryForApplication:(NSRunningApplication *)application {