diff options
| author | Muller, Alexander (A.) <amulle19@ford.com> | 2016-11-30 14:53:42 -0800 |
|---|---|---|
| committer | Muller, Alexander (A.) <amulle19@ford.com> | 2016-11-30 14:53:42 -0800 |
| commit | e7f342fda3fea68ceb36bc47e68f2382498f406a (patch) | |
| tree | 09d9fd5a10d333e21768810d10d386270143d934 | |
| parent | 9c7692d95487a4bee6c4fe3a04e45596ad8adfcb (diff) | |
| download | sdl_ios-e7f342fda3fea68ceb36bc47e68f2382498f406a.tar.gz | |
Added missing catch-all initializer for performInteraction.
| -rw-r--r-- | SmartDeviceLink/SDLPerformInteraction.h | 2 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLPerformInteraction.m | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/SmartDeviceLink/SDLPerformInteraction.h b/SmartDeviceLink/SDLPerformInteraction.h index 33033806e..6d81a30be 100644 --- a/SmartDeviceLink/SDLPerformInteraction.h +++ b/SmartDeviceLink/SDLPerformInteraction.h @@ -52,6 +52,8 @@ - (instancetype)initWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode *)interactionMode timeout:(UInt32)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp; +- (instancetype)initWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode *)interactionMode timeout:(UInt32)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp interactionLayout:(SDLLayoutMode *)layout; + /** * @abstract The Text that Displayed when the interaction begins. This text may * be overlaid by the "Listening" prompt during the interaction. Text is diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m index f22d12305..2cabb0036 100644 --- a/SmartDeviceLink/SDLPerformInteraction.m +++ b/SmartDeviceLink/SDLPerformInteraction.m @@ -51,6 +51,10 @@ static UInt16 const SDLDefaultTimeout = 10000; } - (instancetype)initWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpChunks:(NSArray *)helpChunks timeoutChunks:(NSArray *)timeoutChunks interactionMode:(SDLInteractionMode *)interactionMode timeout:(UInt32)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp { + return [self initWithInitialChunks:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:helpChunks timeoutChunks:timeoutChunks interactionMode:interactionMode timeout:timeout vrHelp:vrHelp]; +} + +- (instancetype)initWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode *)interactionMode timeout:(UInt32)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp interactionLayout:(SDLLayoutMode *)layout { self = [self initWithInteractionChoiceSetIdList:interactionChoiceSetIDList]; if (!self) { return nil; @@ -63,7 +67,8 @@ static UInt16 const SDLDefaultTimeout = 10000; self.interactionMode = interactionMode; self.timeout = @(timeout); self.vrHelp = [vrHelp mutableCopy]; - + self.interactionLayout = layout; + return self; } |