erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-23 16:17:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #4674 from keymanapp/fix/mac/4058-4528-prevent-duplicate-keyboards-in-list

Browse source 
fix(mac): prevent duplicate keyboards in list
This commit is contained in:
Marc Durdin 2021-03-16 11:03:34 +11:00 • committed by GitHub
commit 231cb83777
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m
View file

@ -835,14 +835,33 @@ CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef
}
- (void)resetActiveKeyboards {
// Remove entries with missing files
NSMutableArray *pathsToRemove = [[NSMutableArray alloc] initWithCapacity:0];
for (NSString *path in self.activeKeyboards) {
if (![[NSFileManager defaultManager] fileExistsAtPath:path])
[pathsToRemove addObject:path];
}
BOOL found = FALSE;
if (pathsToRemove.count > 0) {
[self.activeKeyboards removeObjectsInArray:pathsToRemove];
found = TRUE;
}
// Remove duplicate entries
NSUInteger i = 0;
while(i < [self.activeKeyboards count]) {
NSString *item = self.activeKeyboards[i];
NSUInteger n = [self.activeKeyboards indexOfObject:item inRange: NSMakeRange(i+1, [self.activeKeyboards count]-i-1)];
if(n != NSNotFound) {
[self.activeKeyboards removeObjectAtIndex:n];
found = TRUE;
} else {
i++;
}
}
if (found) {
NSUserDefaults *userData = [NSUserDefaults standardUserDefaults];
[userData setObject:_activeKeyboards forKey:kKMActiveKeyboardsKey];
[userData synchronize];
@ -1328,7 +1347,8 @@ extern const CGKeyCode kProcessPendingBuffer;
for (NSString *kmxFile in [self KMXFilesAtPath:keyboardFolderPath]) {
if (self.debugMode)
NSLog(@"Adding keyboard to list of active keyboards: %@", kmxFile);
[self.activeKeyboards addObject:kmxFile];
if (![self.activeKeyboards containsObject:kmxFile])
[self.activeKeyboards addObject:kmxFile];
}
[self saveActiveKeyboards];
}