diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2020-03-04 16:31:07 -0500 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2020-03-04 16:31:07 -0500 |
| commit | e461c018b3b5c95be732924ea0aebba5dc28afcc (patch) | |
| tree | 05ba6e066c9b260f7b2272eaf2eb0ef45a3abb33 | |
| parent | 611336994a33970804c165467d356313e56d02e6 (diff) | |
| download | sdl_ios-e461c018b3b5c95be732924ea0aebba5dc28afcc.tar.gz | |
Fix ChoiceSetManager bug
* If displayCapabilities is nil, allow the transaction queue to run and attempt to show choice sets
| -rw-r--r-- | SmartDeviceLink/SDLChoiceSetManager.m | 2 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLSoftButtonManager.m | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/SmartDeviceLink/SDLChoiceSetManager.m b/SmartDeviceLink/SDLChoiceSetManager.m index 120ca16fb..08d13654f 100644 --- a/SmartDeviceLink/SDLChoiceSetManager.m +++ b/SmartDeviceLink/SDLChoiceSetManager.m @@ -149,7 +149,7 @@ UInt16 const ChoiceCellCancelIdMin = 1; if ([self.currentHMILevel isEqualToEnum:SDLHMILevelNone] || [self.currentSystemContext isEqualToEnum:SDLSystemContextHMIObscured] || [self.currentSystemContext isEqualToEnum:SDLSystemContextAlert] - || ![self.currentWindowCapability hasTextFieldOfName:SDLTextFieldNameMenuName]) { + || (self.currentWindowCapability.textFields != nil && ![self.currentWindowCapability hasTextFieldOfName:SDLTextFieldNameMenuName])) { SDLLogD(@"Suspending the choice set manager transaction queue. Current HMI level is NONE: %@, current system context is HMIObscured or Alert: %@, window capability has MenuName (choice primary text): %@", ([self.currentHMILevel isEqualToEnum:SDLHMILevelNone] ? @"YES" : @"NO"), (([self.currentSystemContext isEqualToEnum:SDLSystemContextHMIObscured] || [self.currentSystemContext isEqualToEnum:SDLSystemContextAlert]) ? @"YES" : @"NO"), ([self.currentWindowCapability hasTextFieldOfName:SDLTextFieldNameMenuName] ? @"YES" : @"NO")); self.transactionQueue.suspended = YES; } else { diff --git a/SmartDeviceLink/SDLSoftButtonManager.m b/SmartDeviceLink/SDLSoftButtonManager.m index 6a676bf14..244e72c47 100644 --- a/SmartDeviceLink/SDLSoftButtonManager.m +++ b/SmartDeviceLink/SDLSoftButtonManager.m @@ -101,7 +101,9 @@ NS_ASSUME_NONNULL_BEGIN } - (void)sdl_updateTransactionQueueSuspended { - if (self.windowCapability.softButtonCapabilities == nil || self.windowCapability.softButtonCapabilities.count == 0 || [self.currentLevel isEqualToEnum:SDLHMILevelNone]) { + if (self.windowCapability.softButtonCapabilities == nil + || self.windowCapability.softButtonCapabilities.count == 0 + || [self.currentLevel isEqualToEnum:SDLHMILevelNone]) { self.transactionQueue.suspended = YES; } else { self.transactionQueue.suspended = NO; |