summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicoleYarroch <nicole@livio.io>2018-04-04 15:53:55 -0400
committerNicoleYarroch <nicole@livio.io>2018-04-04 15:53:55 -0400
commit9732ce606650c0012fb51832dbf5c6dd4a2ff754 (patch)
tree848c9ba4027ef9d313a5da0da47dbb4a4d90be0a
parent5791341b51275d027656e367f8c65ec67156cd30 (diff)
downloadsdl_ios-9732ce606650c0012fb51832dbf5c6dd4a2ff754.tar.gz
Renamed variables in the SDLSystemCapabilityManager
Renamed var prerecordedSpeech to prerecordedSpeechCapabilities Renamed vrCapabilities to vrCapability
-rw-r--r--SmartDeviceLink/SDLSystemCapabilityManager.h6
-rw-r--r--SmartDeviceLink/SDLSystemCapabilityManager.m8
-rw-r--r--SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m4
3 files changed, 9 insertions, 9 deletions
diff --git a/SmartDeviceLink/SDLSystemCapabilityManager.h b/SmartDeviceLink/SDLSystemCapabilityManager.h
index 9a5e591c1..3e7b2d29f 100644
--- a/SmartDeviceLink/SDLSystemCapabilityManager.h
+++ b/SmartDeviceLink/SDLSystemCapabilityManager.h
@@ -89,14 +89,14 @@ NS_ASSUME_NONNULL_BEGIN
*
* Optional, Array of length 1 - 100, of SDLPrerecordedSpeech
*/
-@property (nullable, copy, nonatomic, readonly) NSArray<SDLPrerecordedSpeech> *prerecordedSpeech;
+@property (nullable, copy, nonatomic, readonly) NSArray<SDLPrerecordedSpeech> *prerecordedSpeechCapabilities;
/**
* @see SDLVRCapabilities
*
- * Optional, Array of length 1 - 100, of SDLVRCapabilities
+ * True if the head unit supports voice recognition; false if not.
*/
-@property (nullable, copy, nonatomic, readonly) NSArray<SDLVRCapabilities> *vrCapabilities;
+@property (nonatomic, readonly) BOOL vrCapability;
/**
* @see SDLAudioPassThruCapabilities
diff --git a/SmartDeviceLink/SDLSystemCapabilityManager.m b/SmartDeviceLink/SDLSystemCapabilityManager.m
index 2041ed720..eb08b6770 100644
--- a/SmartDeviceLink/SDLSystemCapabilityManager.m
+++ b/SmartDeviceLink/SDLSystemCapabilityManager.m
@@ -33,8 +33,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nullable, strong, nonatomic, readwrite) SDLPresetBankCapabilities *presetBankCapabilities;
@property (nullable, copy, nonatomic, readwrite) NSArray<SDLHMIZoneCapabilities> *hmiZoneCapabilities;
@property (nullable, copy, nonatomic, readwrite) NSArray<SDLSpeechCapabilities> *speechCapabilities;
-@property (nullable, copy, nonatomic, readwrite) NSArray<SDLPrerecordedSpeech> *prerecordedSpeech;
-@property (nullable, copy, nonatomic, readwrite) NSArray<SDLVRCapabilities> *vrCapabilities;
+@property (nullable, copy, nonatomic, readwrite) NSArray<SDLPrerecordedSpeech> *prerecordedSpeechCapabilities;
+@property (nonatomic, readwrite) BOOL vrCapability;
@property (nullable, copy, nonatomic, readwrite) NSArray<SDLAudioPassThruCapabilities *> *audioPassThruCapabilities;
@property (nullable, copy, nonatomic, readwrite) NSArray<SDLAudioPassThruCapabilities *> *pcmStreamCapabilities;
@property (nullable, strong, nonatomic, readwrite) SDLNavigationCapability *navigationCapability;
@@ -78,8 +78,8 @@ NS_ASSUME_NONNULL_BEGIN
self.presetBankCapabilities = response.presetBankCapabilities;
self.hmiZoneCapabilities = response.hmiZoneCapabilities;
self.speechCapabilities = response.speechCapabilities;
- self.prerecordedSpeech = response.prerecordedSpeech;
- self.vrCapabilities = response.vrCapabilities;
+ self.prerecordedSpeechCapabilities = response.prerecordedSpeech;
+ self.vrCapability = (response.vrCapabilities.count > 1 && response.vrCapabilities.firstObject == SDLVRCapabilitiesText) ? YES : NO;
self.audioPassThruCapabilities = response.audioPassThruCapabilities;
self.pcmStreamCapabilities = response.pcmStreamCapabilities != nil ? @[response.pcmStreamCapabilities] : nil;
}
diff --git a/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m b/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m
index fe48c5675..0b4fc1b9f 100644
--- a/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m
+++ b/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m
@@ -263,8 +263,8 @@ describe(@"System capability manager", ^{
expect(testSystemCapabilityManager.presetBankCapabilities).to(testPresetBankCapabilities != nil ? equal(testPresetBankCapabilities) : beNil());
expect(testSystemCapabilityManager.hmiZoneCapabilities).to(testHMIZoneCapabilities != nil ? equal(testHMIZoneCapabilities) : beNil());
expect(testSystemCapabilityManager.speechCapabilities).to(testSpeechCapabilities != nil ? equal(testSpeechCapabilities) : beNil());
- expect(testSystemCapabilityManager.prerecordedSpeech).to(testPrerecordedSpeechCapabilities != nil ? equal(testPrerecordedSpeechCapabilities) : beNil());
- expect(testSystemCapabilityManager.vrCapabilities).to(testVRCapabilities != nil ? equal(testVRCapabilities) : beNil());
+ expect(testSystemCapabilityManager.prerecordedSpeechCapabilities).to(testPrerecordedSpeechCapabilities != nil ? equal(testPrerecordedSpeechCapabilities) : beNil());
+ expect(testSystemCapabilityManager.vrCapability).to(testVRCapabilities != nil ? equal(testVRCapabilities) : beNil());
expect(testSystemCapabilityManager.audioPassThruCapabilities).to(testAudioPassThruCapabilities != nil ? equal(testAudioPassThruCapabilities) : beNil());
expect(testSystemCapabilityManager.pcmStreamCapabilities).to(testPCMStreamCapabilities != nil ? equal(@[testPCMStreamCapabilities]) : beNil());