summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Fischer <joeljfischer@gmail.com>2020-08-28 11:08:59 -0400
committerJoel Fischer <joeljfischer@gmail.com>2020-08-28 11:08:59 -0400
commit865821d208d5fd7ddc6572e8674129925c24e02a (patch)
tree6b3b0ae22ffa581ddff9941c66b659e71704d8d3
parent095f322b3e4fd7540ba9d8b83ba7cfdb03c06c41 (diff)
downloadsdl_ios-865821d208d5fd7ddc6572e8674129925c24e02a.tar.gz
Fixes for T&G manager updates when display or hmi level update
-rw-r--r--SmartDeviceLink/SDLTextAndGraphicManager.m10
1 files changed, 2 insertions, 8 deletions
diff --git a/SmartDeviceLink/SDLTextAndGraphicManager.m b/SmartDeviceLink/SDLTextAndGraphicManager.m
index 1be655481..d7edb7b98 100644
--- a/SmartDeviceLink/SDLTextAndGraphicManager.m
+++ b/SmartDeviceLink/SDLTextAndGraphicManager.m
@@ -131,7 +131,7 @@ NS_ASSUME_NONNULL_BEGIN
return queue;
}
-/// Suspend the queue if the soft button capabilities are nil (we assume that soft buttons are not supported)
+/// Suspend the queue if the window capabilities are nil (we assume that text and graphics are not supported yet)
/// OR if the HMI level is NONE since we want to delay sending RPCs until we're in non-NONE
- (void)sdl_updateTransactionQueueSuspended {
if (self.windowCapability == nil || [self.currentLevel isEqualToEnum:SDLHMILevelNone]) {
@@ -340,7 +340,7 @@ NS_ASSUME_NONNULL_BEGIN
// Auto-send an updated show
if ([self sdl_hasData]) {
- [self updateWithCompletionHandler:nil];
+ [self sdl_updateWithCompletionHandler:nil];
}
}
@@ -351,14 +351,8 @@ NS_ASSUME_NONNULL_BEGIN
return;
}
- SDLHMILevel oldLevel = self.currentLevel;
self.currentLevel = hmiStatus.hmiLevel;
[self sdl_updateTransactionQueueSuspended];
-
- // Auto-send an updated show if we were in NONE and now we are not
- if ([oldLevel isEqualToString:SDLHMILevelNone] && ![self.currentLevel isEqualToString:SDLHMILevelNone] && self.waitingOnHMILevelUpdateToUpdate) {
- [self sdl_updateWithCompletionHandler:nil];
- }
}
@end