Merge remote-tracking branch 'origin/develop' into feature/issue_425_stringly_typed_enum

* origin/develop: (27 commits)
  Revert "Changed deviceScale type to silence build warning"
  Changed deviceScale type to silence build warning
  Change SDLRPCStruct private method to be a class method
  Fixed error reference.
  reverting function renaming in SDLRPCMessage.
  Removed SDLJsonEncoder/Decoder.
  Initial removal of SDLSiphonServer
  Fixed issue with not all instances for SDLRPCMessage function rename applied.
  reverting function renaming in SDLRPCMessage.
  Fixed accidental function renaming.
  Update lock screen to work correctly on iOS 6 - 8
  Fixed issue with not being able to support both Swift 3 and pre-iOS 10 Objective-C.
  Fixed an issue with cocoapods not properly loading icons on pre-iOS 8 devices.
  Updated SDLFunctionID to project instead of private.
  Update version checking code to use what we already use
  Updated assets and support for retrieving bundle images for iOS 6 & 7.
  Touched SDL Example Images.xcassets
  Remove `.xctool.args` and update README with current testing information
  Migrated initWithDictionary to take non-mutable dictionary as parameter.
  Updated SDLFunctionID to be private.
  ...

# Conflicts:
#	SmartDeviceLink-iOS.xcodeproj/project.pbxproj
#	SmartDeviceLink/SDLAirbagStatus.m
#	SmartDeviceLink/SDLAudioPassThruCapabilities.m
#	SmartDeviceLink/SDLBeltStatus.m
#	SmartDeviceLink/SDLBodyInformation.m
#	SmartDeviceLink/SDLButtonCapabilities.m
#	SmartDeviceLink/SDLChangeRegistration.m
#	SmartDeviceLink/SDLClusterModeStatus.m
#	SmartDeviceLink/SDLDIDResult.m
#	SmartDeviceLink/SDLDeviceStatus.m
#	SmartDeviceLink/SDLDisplayCapabilities.m
#	SmartDeviceLink/SDLECallInfo.m
#	SmartDeviceLink/SDLEmergencyEvent.m
#	SmartDeviceLink/SDLGPSData.m
#	SmartDeviceLink/SDLGetVehicleDataResponse.m
#	SmartDeviceLink/SDLHMIPermissions.m
#	SmartDeviceLink/SDLHeadLampStatus.h
#	SmartDeviceLink/SDLHeadLampStatus.m
#	SmartDeviceLink/SDLImage.m
#	SmartDeviceLink/SDLImageField.m
#	SmartDeviceLink/SDLKeyboardProperties.m
#	SmartDeviceLink/SDLMyKey.m
#	SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
#	SmartDeviceLink/SDLOnButtonEvent.m
#	SmartDeviceLink/SDLOnButtonPress.m
#	SmartDeviceLink/SDLOnCommand.m
#	SmartDeviceLink/SDLOnDriverDistraction.m
#	SmartDeviceLink/SDLOnHMIStatus.m
#	SmartDeviceLink/SDLOnKeyboardInput.m
#	SmartDeviceLink/SDLOnLanguageChange.m
#	SmartDeviceLink/SDLOnLockScreenStatus.m
#	SmartDeviceLink/SDLOnSystemRequest.m
#	SmartDeviceLink/SDLOnTBTClientState.m
#	SmartDeviceLink/SDLOnTouchEvent.m
#	SmartDeviceLink/SDLOnVehicleData.m
#	SmartDeviceLink/SDLPerformAudioPassThru.m
#	SmartDeviceLink/SDLPerformInteraction.m
#	SmartDeviceLink/SDLPerformInteractionResponse.m
#	SmartDeviceLink/SDLProxy.m
#	SmartDeviceLink/SDLPutFile.m
#	SmartDeviceLink/SDLRPCResponse.m
#	SmartDeviceLink/SDLRegisterAppInterface.m
#	SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
#	SmartDeviceLink/SDLResetGlobalProperties.m
#	SmartDeviceLink/SDLSetMediaClockTimer.m
#	SmartDeviceLink/SDLShow.m
#	SmartDeviceLink/SDLSingleTireStatus.m
#	SmartDeviceLink/SDLSoftButton.m
#	SmartDeviceLink/SDLSubscribeButton.m
#	SmartDeviceLink/SDLSystemRequest.m
#	SmartDeviceLink/SDLTTSChunk.m
#	SmartDeviceLink/SDLTextField.m
#	SmartDeviceLink/SDLTireStatus.m
#	SmartDeviceLink/SDLUnsubscribeButton.m
#	SmartDeviceLink/SDLVehicleDataResult.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m

1 files changed, 32 insertions, 38 deletions

diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m
index 784d4c5e2..878e1d425 100644
--- a/SmartDeviceLink/SDLPerformInteraction.m
+++ b/SmartDeviceLink/SDLPerformInteraction.m
@@ -11,45 +11,39 @@
 @implementation SDLPerformInteraction
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_PerformInteraction]) {
-    }
-    return self;
-}
-
-- (instancetype)initWithDictionary:(NSMutableDictionary *)dict {
-    if (self = [super initWithDictionary:dict]) {
+    if (self = [super initWithName:SDLNamePerformInteraction]) {
     }
     return self;
 }
 
 - (void)setInitialText:(NSString *)initialText {
     if (initialText != nil) {
-        [parameters setObject:initialText forKey:NAMES_initialText];
+        [parameters setObject:initialText forKey:SDLNameInitialText];
     } else {
-        [parameters removeObjectForKey:NAMES_initialText];
+        [parameters removeObjectForKey:SDLNameInitialText];
     }
 }
 
 - (NSString *)initialText {
-    return [parameters objectForKey:NAMES_initialText];
+    return [parameters objectForKey:SDLNameInitialText];
 }
 
 - (void)setInitialPrompt:(NSMutableArray *)initialPrompt {
     if (initialPrompt != nil) {
-        [parameters setObject:initialPrompt forKey:NAMES_initialPrompt];
+        [parameters setObject:initialPrompt forKey:SDLNameInitialPrompt];
     } else {
-        [parameters removeObjectForKey:NAMES_initialPrompt];
+        [parameters removeObjectForKey:SDLNameInitialPrompt];
     }
 }
 
 - (NSMutableArray *)initialPrompt {
-    NSMutableArray *array = [parameters objectForKey:NAMES_initialPrompt];
+    NSMutableArray *array = [parameters objectForKey:SDLNameInitialPrompt];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
         NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]];
         for (NSDictionary *dict in array) {
-            [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]];
+            [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]];
         }
         return newList;
     }
@@ -57,45 +51,45 @@
 
 - (void)setInteractionMode:(SDLInteractionMode)interactionMode {
     if (interactionMode != nil) {
-        [parameters setObject:interactionMode forKey:NAMES_interactionMode];
+        [parameters setObject:interactionMode forKey:SDLNameInteractionMode];
     } else {
-        [parameters removeObjectForKey:NAMES_interactionMode];
+        [parameters removeObjectForKey:SDLNameInteractionMode];
     }
 }
 
 - (SDLInteractionMode)interactionMode {
-    NSObject *obj = [parameters objectForKey:NAMES_interactionMode];
+    NSObject *obj = [parameters objectForKey:SDLNameInteractionMode];
     return (SDLInteractionMode)obj;
 }
 
 - (void)setInteractionChoiceSetIDList:(NSMutableArray *)interactionChoiceSetIDList {
     if (interactionChoiceSetIDList != nil) {
-        [parameters setObject:interactionChoiceSetIDList forKey:NAMES_interactionChoiceSetIDList];
+        [parameters setObject:interactionChoiceSetIDList forKey:SDLNameInteractionChoiceSetIdList];
     } else {
-        [parameters removeObjectForKey:NAMES_interactionChoiceSetIDList];
+        [parameters removeObjectForKey:SDLNameInteractionChoiceSetIdList];
     }
 }
 
 - (NSMutableArray *)interactionChoiceSetIDList {
-    return [parameters objectForKey:NAMES_interactionChoiceSetIDList];
+    return [parameters objectForKey:SDLNameInteractionChoiceSetIdList];
 }
 
 - (void)setHelpPrompt:(NSMutableArray *)helpPrompt {
     if (helpPrompt != nil) {
-        [parameters setObject:helpPrompt forKey:NAMES_helpPrompt];
+        [parameters setObject:helpPrompt forKey:SDLNameHelpPrompt];
     } else {
-        [parameters removeObjectForKey:NAMES_helpPrompt];
+        [parameters removeObjectForKey:SDLNameHelpPrompt];
     }
 }
 
 - (NSMutableArray *)helpPrompt {
-    NSMutableArray *array = [parameters objectForKey:NAMES_helpPrompt];
+    NSMutableArray *array = [parameters objectForKey:SDLNameHelpPrompt];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
         NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]];
         for (NSDictionary *dict in array) {
-            [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]];
+            [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]];
         }
         return newList;
     }
@@ -103,20 +97,20 @@
 
 - (void)setTimeoutPrompt:(NSMutableArray *)timeoutPrompt {
     if (timeoutPrompt != nil) {
-        [parameters setObject:timeoutPrompt forKey:NAMES_timeoutPrompt];
+        [parameters setObject:timeoutPrompt forKey:SDLNameTimeoutPrompt];
     } else {
-        [parameters removeObjectForKey:NAMES_timeoutPrompt];
+        [parameters removeObjectForKey:SDLNameTimeoutPrompt];
     }
 }
 
 - (NSMutableArray *)timeoutPrompt {
-    NSMutableArray *array = [parameters objectForKey:NAMES_timeoutPrompt];
+    NSMutableArray *array = [parameters objectForKey:SDLNameTimeoutPrompt];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
         NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]];
         for (NSDictionary *dict in array) {
-            [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]];
+            [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]];
         }
         return newList;
     }
@@ -124,32 +118,32 @@
 
 - (void)setTimeout:(NSNumber *)timeout {
     if (timeout != nil) {
-        [parameters setObject:timeout forKey:NAMES_timeout];
+        [parameters setObject:timeout forKey:SDLNameTimeout];
     } else {
-        [parameters removeObjectForKey:NAMES_timeout];
+        [parameters removeObjectForKey:SDLNameTimeout];
     }
 }
 
 - (NSNumber *)timeout {
-    return [parameters objectForKey:NAMES_timeout];
+    return [parameters objectForKey:SDLNameTimeout];
 }
 
 - (void)setVrHelp:(NSMutableArray *)vrHelp {
     if (vrHelp != nil) {
-        [parameters setObject:vrHelp forKey:NAMES_vrHelp];
+        [parameters setObject:vrHelp forKey:SDLNameVRHelp];
     } else {
-        [parameters removeObjectForKey:NAMES_vrHelp];
+        [parameters removeObjectForKey:SDLNameVRHelp];
     }
 }
 
 - (NSMutableArray *)vrHelp {
-    NSMutableArray *array = [parameters objectForKey:NAMES_vrHelp];
+    NSMutableArray *array = [parameters objectForKey:SDLNameVRHelp];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVRHelpItem.class]) {
         return array;
     } else {
         NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]];
         for (NSDictionary *dict in array) {
-            [newList addObject:[[SDLVRHelpItem alloc] initWithDictionary:(NSMutableDictionary *)dict]];
+            [newList addObject:[[SDLVRHelpItem alloc] initWithDictionary:(NSDictionary *)dict]];
         }
         return newList;
     }
@@ -157,14 +151,14 @@
 
 - (void)setInteractionLayout:(SDLLayoutMode)interactionLayout {
     if (interactionLayout != nil) {
-        [parameters setObject:interactionLayout forKey:NAMES_interactionLayout];
+        [parameters setObject:interactionLayout forKey:SDLNameInteractionLayout];
     } else {
-        [parameters removeObjectForKey:NAMES_interactionLayout];
+        [parameters removeObjectForKey:SDLNameInteractionLayout];
     }
 }
 
 - (SDLLayoutMode)interactionLayout {
-    NSObject *obj = [parameters objectForKey:NAMES_interactionLayout];
+    NSObject *obj = [parameters objectForKey:SDLNameInteractionLayout];
     return (SDLLayoutMode)obj;
 }