summaryrefslogtreecommitdiff
path: root/SmartDeviceLink/SDLError.h
diff options
context:
space:
mode:
authorMuller, Alexander (A.) <amulle19@ford.com>2016-10-14 11:17:52 -0700
committerMuller, Alexander (A.) <amulle19@ford.com>2016-10-14 11:17:52 -0700
commit3f2df8b8d61569e7e69e93a8e4bbd2561b7e9936 (patch)
treee697c3f834a91b7d41aa7dd7cf5e9ec6145d7ecf /SmartDeviceLink/SDLError.h
parent280b61d326ac0b46957ea81f80f5fb5fb54f879f (diff)
parentf396ff7f69ef1dc29f6703d174410234ba05857c (diff)
downloadsdl_ios-3f2df8b8d61569e7e69e93a8e4bbd2561b7e9936.tar.gz
Merge remote-tracking branch 'origin/develop' into feature/issue_425_stringly_typed_enum
* origin/develop: Fixed a file manager bug Update to v4.3.0-rc.6 Improved error messaging if you connect to a head unit that doesn’t support files Example app should only send command data on the first non-NONE HMI status, not any NONE Fix a warning regarding format strings Fix an issue where developers could attempt to send a file on a non-ready FileManager If the file manager fails to start, we should continue (e.g. head units that do not support files) Fixed a bug where the File Manager could fail to start without calling its start block Update for 4.3.0-rc.5 Actually fix the podspec…probably Fix Cocoapods podspec not including SmartDeviceLink.h Fix podspec not using the new version number Update for 4.3.0-rc.4 List public headers in podspec Update the README to point to the smartdevicelink.com guides Fix another minor issue in SDLRPCMessage initWithDictionary Fix a warning and analyzer error Updated to include generics for all collection objects. # Conflicts: # README.md # SmartDeviceLink/SDLAmbientLightStatus.h # SmartDeviceLink/SDLAmbientLightStatus.m # SmartDeviceLink/SDLAppHMIType.h # SmartDeviceLink/SDLAppHMIType.m # SmartDeviceLink/SDLAppInterfaceUnregisteredReason.h # SmartDeviceLink/SDLAppInterfaceUnregisteredReason.m # SmartDeviceLink/SDLAudioStreamingState.h # SmartDeviceLink/SDLAudioStreamingState.m # SmartDeviceLink/SDLAudioType.h # SmartDeviceLink/SDLAudioType.m # SmartDeviceLink/SDLBitsPerSample.h # SmartDeviceLink/SDLBitsPerSample.m # SmartDeviceLink/SDLButtonEventMode.h # SmartDeviceLink/SDLButtonEventMode.m # SmartDeviceLink/SDLButtonName.h # SmartDeviceLink/SDLButtonName.m # SmartDeviceLink/SDLButtonPressMode.h # SmartDeviceLink/SDLButtonPressMode.m # SmartDeviceLink/SDLCarModeStatus.h # SmartDeviceLink/SDLCarModeStatus.m # SmartDeviceLink/SDLCharacterSet.h # SmartDeviceLink/SDLCharacterSet.m # SmartDeviceLink/SDLCompassDirection.h # SmartDeviceLink/SDLCompassDirection.m # SmartDeviceLink/SDLComponentVolumeStatus.h # SmartDeviceLink/SDLComponentVolumeStatus.m # SmartDeviceLink/SDLDeviceLevelStatus.h # SmartDeviceLink/SDLDeviceLevelStatus.m # SmartDeviceLink/SDLDimension.h # SmartDeviceLink/SDLDimension.m # SmartDeviceLink/SDLDisplayType.h # SmartDeviceLink/SDLDisplayType.m # SmartDeviceLink/SDLDriverDistractionState.h # SmartDeviceLink/SDLDriverDistractionState.m # SmartDeviceLink/SDLECallConfirmationStatus.h # SmartDeviceLink/SDLECallConfirmationStatus.m # SmartDeviceLink/SDLEmergencyEventType.h # SmartDeviceLink/SDLEmergencyEventType.m # SmartDeviceLink/SDLFileType.h # SmartDeviceLink/SDLFileType.m # SmartDeviceLink/SDLFuelCutoffStatus.h # SmartDeviceLink/SDLFuelCutoffStatus.m # SmartDeviceLink/SDLGlobalProperty.h # SmartDeviceLink/SDLGlobalProperty.m # SmartDeviceLink/SDLHMILevel.h # SmartDeviceLink/SDLHMILevel.m # SmartDeviceLink/SDLHMIZoneCapabilities.h # SmartDeviceLink/SDLHMIZoneCapabilities.m # SmartDeviceLink/SDLIgnitionStableStatus.h # SmartDeviceLink/SDLIgnitionStableStatus.m # SmartDeviceLink/SDLIgnitionStatus.h # SmartDeviceLink/SDLIgnitionStatus.m # SmartDeviceLink/SDLImageFieldName.h # SmartDeviceLink/SDLImageFieldName.m # SmartDeviceLink/SDLImageType.h # SmartDeviceLink/SDLImageType.m # SmartDeviceLink/SDLInteractionMode.h # SmartDeviceLink/SDLInteractionMode.m # SmartDeviceLink/SDLKeyboardEvent.h # SmartDeviceLink/SDLKeyboardEvent.m # SmartDeviceLink/SDLKeyboardLayout.h # SmartDeviceLink/SDLKeyboardLayout.m # SmartDeviceLink/SDLKeypressMode.h # SmartDeviceLink/SDLKeypressMode.m # SmartDeviceLink/SDLLanguage.h # SmartDeviceLink/SDLLanguage.m # SmartDeviceLink/SDLLayoutMode.h # SmartDeviceLink/SDLLayoutMode.m # SmartDeviceLink/SDLLockScreenStatus.h # SmartDeviceLink/SDLLockScreenStatus.m # SmartDeviceLink/SDLMaintenanceModeStatus.h # SmartDeviceLink/SDLMaintenanceModeStatus.m # SmartDeviceLink/SDLMediaClockFormat.h # SmartDeviceLink/SDLMediaClockFormat.m # SmartDeviceLink/SDLPRNDL.h # SmartDeviceLink/SDLPRNDL.m # SmartDeviceLink/SDLPermissionStatus.h # SmartDeviceLink/SDLPermissionStatus.m # SmartDeviceLink/SDLPowerModeQualificationStatus.h # SmartDeviceLink/SDLPowerModeQualificationStatus.m # SmartDeviceLink/SDLPowerModeStatus.h # SmartDeviceLink/SDLPowerModeStatus.m # SmartDeviceLink/SDLPredefinedLayout.h # SmartDeviceLink/SDLPredefinedLayout.m # SmartDeviceLink/SDLPrerecordedSpeech.h # SmartDeviceLink/SDLPrerecordedSpeech.m # SmartDeviceLink/SDLPrimaryAudioSource.h # SmartDeviceLink/SDLPrimaryAudioSource.m # SmartDeviceLink/SDLRPCRequestFactory.h # SmartDeviceLink/SDLRPCRequestFactory.m # SmartDeviceLink/SDLRequestType.h # SmartDeviceLink/SDLRequestType.m # SmartDeviceLink/SDLResult.h # SmartDeviceLink/SDLResult.m # SmartDeviceLink/SDLSamplingRate.h # SmartDeviceLink/SDLSamplingRate.m # SmartDeviceLink/SDLSoftButtonType.h # SmartDeviceLink/SDLSoftButtonType.m # SmartDeviceLink/SDLSpeechCapabilities.h # SmartDeviceLink/SDLSpeechCapabilities.m # SmartDeviceLink/SDLSystemAction.h # SmartDeviceLink/SDLSystemAction.m # SmartDeviceLink/SDLSystemContext.h # SmartDeviceLink/SDLSystemContext.m # SmartDeviceLink/SDLTBTState.h # SmartDeviceLink/SDLTBTState.m # SmartDeviceLink/SDLTTSChunkFactory.h # SmartDeviceLink/SDLTextAlignment.h # SmartDeviceLink/SDLTextAlignment.m # SmartDeviceLink/SDLTextFieldName.h # SmartDeviceLink/SDLTextFieldName.m # SmartDeviceLink/SDLTimerMode.h # SmartDeviceLink/SDLTimerMode.m # SmartDeviceLink/SDLTouchType.h # SmartDeviceLink/SDLTouchType.m # SmartDeviceLink/SDLTriggerSource.h # SmartDeviceLink/SDLTriggerSource.m # SmartDeviceLink/SDLUpdateMode.h # SmartDeviceLink/SDLUpdateMode.m # SmartDeviceLink/SDLVehicleDataActiveStatus.h # SmartDeviceLink/SDLVehicleDataActiveStatus.m # SmartDeviceLink/SDLVehicleDataEventStatus.h # SmartDeviceLink/SDLVehicleDataEventStatus.m # SmartDeviceLink/SDLVehicleDataNotificationStatus.h # SmartDeviceLink/SDLVehicleDataNotificationStatus.m # SmartDeviceLink/SDLVehicleDataResultCode.h # SmartDeviceLink/SDLVehicleDataResultCode.m # SmartDeviceLink/SDLVehicleDataStatus.h # SmartDeviceLink/SDLVehicleDataStatus.m # SmartDeviceLink/SDLVehicleDataType.h # SmartDeviceLink/SDLVehicleDataType.m # SmartDeviceLink/SDLVrCapabilities.h # SmartDeviceLink/SDLVrCapabilities.m # SmartDeviceLink/SDLWarningLightStatus.h # SmartDeviceLink/SDLWarningLightStatus.m # SmartDeviceLink/SDLWiperStatus.h # SmartDeviceLink/SDLWiperStatus.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAmbientLightStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppHMITypeSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppInterfaceUnregisteredReasonSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAudioStreamingStateSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAudioTypeSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLBitsPerSampleSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLButtonEventModeSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLButtonNameSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLButtonPressModeSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCarModeStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCharacterSetSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCompassDirectionSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLComponentVolumeStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDeviceLevelStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDimensionSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDisplayTypeSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDriverDistractionStateSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLECallConfirmationStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLEmergencyEventTypeSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFileTypeSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFuelCutoffStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLGlobalProperySpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMILevelSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLIgnitionStableStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLIgnitionStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageFieldNameSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageTypeSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLInteractionModeSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardEventSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardLayoutSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeypressModeSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLLanguageSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLLayoutModeSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLLockScreenStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMaintenanceModeStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMediaClockFormatSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPRNDLSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPermissionStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPowerModeQualificationStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPowerModeStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPredefinedLayoutSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrerecordedSpeechSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrimaryAudioSource.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLRequestTypeSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLResultSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSamplingRateSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSoftButtonTypeSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSpeechCapabilitiesSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemAction.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemContextSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTBTStateSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextAlignmentSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldNameSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTimerModeSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTouchTypeSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTriggerSource.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLUpdateModeSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataActiveStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataEventStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataNotificationStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataResultCodeSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVrCapabilitiesSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWarningLightStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWiperStatusSpec.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 # SmartDeviceLink_Example/Classes/ProxyManager.m
Diffstat (limited to 'SmartDeviceLink/SDLError.h')
-rw-r--r--SmartDeviceLink/SDLError.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/SmartDeviceLink/SDLError.h b/SmartDeviceLink/SDLError.h
index 17193550c..71472f30a 100644
--- a/SmartDeviceLink/SDLError.h
+++ b/SmartDeviceLink/SDLError.h
@@ -36,6 +36,8 @@ extern SDLErrorDomain *const SDLErrorDomainFileManager;
+ (NSError *)sdl_fileManager_cannotOverwriteError;
+ (NSError *)sdl_fileManager_noKnownFileError;
++ (NSError *)sdl_fileManager_unableToStartError;
++ (NSError *)sdl_fileManager_unableToUploadError;
@end