diff options
author | Joel Fischer <joeljfischer@gmail.com> | 2019-04-05 15:43:28 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-05 15:43:28 -0400 |
commit | 4c0a0821c2909a4fcad11996b9a1591e38c7d27c (patch) | |
tree | 7e92da4cbcb4408403976eaa924e2f684e282f14 | |
parent | 583cde91ea6868a03b05b49e48771f9016413c32 (diff) | |
parent | 574de6dac7264c5624914381ac0269926d408d10 (diff) | |
download | sdl_ios-4c0a0821c2909a4fcad11996b9a1591e38c7d27c.tar.gz |
Merge pull request #1226 from smartdevicelink/bugfix/issue-1218-Remove-class-check-for-actualLanguage-
Removed check for class type
-rw-r--r-- | SmartDeviceLink/SDLLifecycleManager.m | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/SmartDeviceLink/SDLLifecycleManager.m b/SmartDeviceLink/SDLLifecycleManager.m index 23eebd272..6eb36ebb3 100644 --- a/SmartDeviceLink/SDLLifecycleManager.m +++ b/SmartDeviceLink/SDLLifecycleManager.m @@ -333,7 +333,7 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready"; BOOL delegateCanUpdateLifecycle = [self.delegate respondsToSelector:@selector(managerShouldUpdateLifecycleToLanguage:)]; // language mismatch? but actual language is a supported language? and delegate has implemented method? - if ([actualLanguage isKindOfClass:[NSString class]] && ![actualLanguage isEqualToEnum:desiredLanguage] && [supportedLanguages containsObject:actualLanguage] && delegateCanUpdateLifecycle) { + if (![actualLanguage isEqualToEnum:desiredLanguage] && [supportedLanguages containsObject:actualLanguage] && delegateCanUpdateLifecycle) { [self sdl_transitionToState:SDLLifecycleStateUpdatingConfiguration]; } else { [self sdl_transitionToState:SDLLifecycleStateSettingUpManagers]; @@ -344,7 +344,6 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready"; // we can expect that the delegate has implemented the update method and the actual language is a supported language SDLLanguage actualLanguage = self.registerResponse.language; - if ([actualLanguage isKindOfClass:[NSString class]]) { SDLLifecycleConfigurationUpdate *configUpdate = [self.delegate managerShouldUpdateLifecycleToLanguage:actualLanguage]; if (configUpdate) { @@ -369,7 +368,6 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready"; changeRegistration.vrSynonyms = configUpdate.voiceRecognitionCommandNames; [self sendConnectionManagerRequest:changeRegistration withResponseHandler:nil]; - } } [self sdl_transitionToState:SDLLifecycleStateSettingUpManagers]; |