From 8f8170cbfbfb1262bc0501fa4e2ff5b7057aa4bb Mon Sep 17 00:00:00 2001 From: Tom Bogle Date: Thu, 14 Jun 2018 23:35:07 -0400 Subject: [PATCH] [Mac] #967 - Changed platform implementation to make spec change Any unrecognized platform tokens will cause it to return false (not a match). --- .../KeymanEngine4Mac/KME/KMEngine.m | 41 +++++++------------ 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/KMEngine.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/KMEngine.m index 653d2c191a..a64c94356c 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/KMEngine.m +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/KMEngine.m @@ -867,34 +867,21 @@ const NSString* kEasterEggKmxName = @"EnglishSpanish.kmx"; } - (BOOL)checkPlatform:(NSString *)platform { - NSArray *values = [platform componentsSeparatedByString:@" "]; + NSArray *values = [[platform lowercaseString] componentsSeparatedByString:@" "]; for (NSString *value in values) { - NSString *lcValue = [value lowercaseString]; - if ([lcValue isEqualToString:@"touch"]) - return NO; - else if ([lcValue isEqualToString:@"windows"]) - return NO; - else if ([lcValue isEqualToString:@"android"]) - return NO; - else if ([lcValue isEqualToString:@"ios"]) - return NO; - else if ([lcValue isEqualToString:@"linux"]) - return NO; - else if ([lcValue isEqualToString:@"tablet"]) - return NO; - else if ([lcValue isEqualToString:@"phone"]) - return NO; - else if ([lcValue isEqualToString:@"web"]) - return NO; - else if ([lcValue isEqualToString:@"ie"]) - return NO; - else if ([lcValue isEqualToString:@"chrome"]) - return NO; - else if ([lcValue isEqualToString:@"firefox"]) - return NO; - else if ([lcValue isEqualToString:@"safari"]) - return NO; - else if ([lcValue isEqualToString:@"opera"]) + if ([value isEqualToString:@"hardware"]) + continue; + else if ([value isEqualToString:@"macosx"]) + continue; + else if ([value isEqualToString:@"mac"]) + continue; + else if ([value isEqualToString:@"macos"]) + continue; + else if ([value isEqualToString:@"desktop"]) + continue; + else if ([value isEqualToString:@"native"]) + continue; + else return NO; }