summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicoleYarroch <nicole@livio.io>2018-05-08 13:33:47 -0400
committerNicoleYarroch <nicole@livio.io>2018-05-08 13:33:47 -0400
commit7ff35a2189c37c3481de695653c2f663caf2d26b (patch)
tree82663e34f0e9c94e5bf07657a8978f3f9a71d433
parent05bae735e989dc7d476be84244d5b31f27a595c9 (diff)
downloadsdl_ios-7ff35a2189c37c3481de695653c2f663caf2d26b.tar.gz
Attempted to fix `DeleteCommand`s failing
Signed-off-by: NicoleYarroch <nicole@livio.io>
-rw-r--r--SmartDeviceLink/SDLTextAndGraphicManager.h2
-rw-r--r--SmartDeviceLink/SDLTextAndGraphicManager.m4
-rw-r--r--SmartDeviceLink/SDLVoiceCommandManager.m3
3 files changed, 5 insertions, 4 deletions
diff --git a/SmartDeviceLink/SDLTextAndGraphicManager.h b/SmartDeviceLink/SDLTextAndGraphicManager.h
index 584c941be..fa5eeff9d 100644
--- a/SmartDeviceLink/SDLTextAndGraphicManager.h
+++ b/SmartDeviceLink/SDLTextAndGraphicManager.h
@@ -48,7 +48,7 @@ typedef void(^SDLTextAndGraphicUpdateCompletionHandler)(NSError *__nullable erro
/**
If you want to make a graphic blank, set it to this artwork
*/
-@property (strong, nonatomic, readonly) SDLArtwork *blankArtwork;
+@property (strong, nonatomic, readonly, nullable) SDLArtwork *blankArtwork;
@property (assign, nonatomic, getter=isBatchingUpdates) BOOL batchUpdates;
diff --git a/SmartDeviceLink/SDLTextAndGraphicManager.m b/SmartDeviceLink/SDLTextAndGraphicManager.m
index 76a3d8aae..3ee556dcc 100644
--- a/SmartDeviceLink/SDLTextAndGraphicManager.m
+++ b/SmartDeviceLink/SDLTextAndGraphicManager.m
@@ -52,7 +52,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (strong, nonatomic, nullable) SDLDisplayCapabilities *displayCapabilities;
@property (strong, nonatomic, nullable) SDLHMILevel currentLevel;
-@property (strong, nonatomic) SDLArtwork *blankArtwork;
+@property (strong, nonatomic, nullable) SDLArtwork *blankArtwork;
@property (assign, nonatomic) BOOL isDirty;
@@ -614,7 +614,7 @@ NS_ASSUME_NONNULL_BEGIN
return (_hasQueuedUpdate || _queuedUpdateHandler != nil);
}
-- (SDLArtwork *)blankArtwork {
+- (nullable SDLArtwork *)blankArtwork {
if (_blankArtwork != nil) {
return _blankArtwork;
}
diff --git a/SmartDeviceLink/SDLVoiceCommandManager.m b/SmartDeviceLink/SDLVoiceCommandManager.m
index d1883d648..d25ebc266 100644
--- a/SmartDeviceLink/SDLVoiceCommandManager.m
+++ b/SmartDeviceLink/SDLVoiceCommandManager.m
@@ -201,7 +201,8 @@ UInt32 const VoiceCommandIdMin = 1900000000;
- (NSArray<SDLDeleteCommand *> *)sdl_deleteCommandsForVoiceCommands:(NSArray<SDLVoiceCommand *> *)voiceCommands {
NSMutableArray<SDLDeleteCommand *> *mutableDeletes = [NSMutableArray array];
for (SDLVoiceCommand *command in voiceCommands) {
- SDLDeleteCommand *delete = [[SDLDeleteCommand alloc] initWithId:command.commandId];
+ SDLDeleteCommand *delete = [[SDLDeleteCommand alloc] init];
+ delete.cmdID = @(command.commandId);
[mutableDeletes addObject:delete];
}