diff options
| author | NicoleYarroch <nicole@livio.io> | 2018-05-08 10:32:22 -0400 |
|---|---|---|
| committer | NicoleYarroch <nicole@livio.io> | 2018-05-08 10:32:22 -0400 |
| commit | 565171c7f117fe47a3d4e732f21ad7a7e152ded6 (patch) | |
| tree | 52ac57eb69e1c74f858e4e05c71ead6d8afa664f | |
| parent | e641aff7bab6e2c5fa9c16959f429c1cc36f7bd3 (diff) | |
| download | sdl_ios-565171c7f117fe47a3d4e732f21ad7a7e152ded6.tar.gz | |
Fixed text soft buttons not getting uploaded
Signed-off-by: NicoleYarroch <nicole@livio.io>
| -rw-r--r-- | SmartDeviceLink/SDLSoftButtonManager.m | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/SmartDeviceLink/SDLSoftButtonManager.m b/SmartDeviceLink/SDLSoftButtonManager.m index f419616a6..8918cb3b9 100644 --- a/SmartDeviceLink/SDLSoftButtonManager.m +++ b/SmartDeviceLink/SDLSoftButtonManager.m @@ -77,8 +77,15 @@ NS_ASSUME_NONNULL_BEGIN - (void)stop { _softButtonObjects = @[]; _currentMainField1 = nil; + + _inProgressUpdate = nil; + _inProgressHandler = nil; + _hasQueuedUpdate = NO; + _queuedUpdateHandler = nil; _currentLevel = SDLHMILevelNone; - _waitingOnHMILevelUpdateToSetButtons = NO + _displayCapabilities = nil; + _softButtonCapabilities = nil; + _waitingOnHMILevelUpdateToSetButtons = NO; } - (void)setSoftButtonObjects:(NSArray<SDLSoftButtonObject *> *)softButtonObjects { @@ -213,7 +220,7 @@ NS_ASSUME_NONNULL_BEGIN SDLLogV(@"Soft button objects are nil, sending an empty array"); self.inProgressUpdate.softButtons = @[]; } else if (([self sdl_currentStateHasImages] && ![self sdl_allCurrentStateImagesAreUploaded]) - && (self.softButtonCapabilities ? !self.softButtonCapabilities.imageSupported : YES)) { + || (self.softButtonCapabilities ? !self.softButtonCapabilities.imageSupported : YES)) { // The images don't yet exist on the head unit, or we cannot use images, send a text update if possible, otherwise, don't send anything yet NSArray<SDLSoftButton *> *textOnlyButtons = [self sdl_textButtonsForCurrentState]; if (textOnlyButtons != nil) { |