diff options
39 files changed, 46 insertions, 40 deletions
diff --git a/.gitignore b/.gitignore index bc5b40def..2297b4869 100644 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,5 @@ profile ############ Carthage.pkg SmartDeviceLink-iOS/Carthage/Build -SmartDeviceLink-iOS/Carthage/Checkouts
\ No newline at end of file +SmartDeviceLink-iOS/Carthage/Checkouts +SmartDeviceLink-iOS/infer-out diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/EAAccessory+SDLProtocols.h b/SmartDeviceLink-iOS/SmartDeviceLink/EAAccessory+SDLProtocols.h index 41ccfdce9..417b5b07b 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/EAAccessory+SDLProtocols.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/EAAccessory+SDLProtocols.h @@ -2,7 +2,7 @@ // EAAccessory+SyncProtocols.h // -@import ExternalAccessory; +#import <ExternalAccessory/ExternalAccessory.h> @interface EAAccessory (SDLProtocols) diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/EAAccessoryManager+SDLProtocols.h b/SmartDeviceLink-iOS/SmartDeviceLink/EAAccessoryManager+SDLProtocols.h index 80b7d3a2d..b4b39d943 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/EAAccessoryManager+SDLProtocols.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/EAAccessoryManager+SDLProtocols.h @@ -2,7 +2,7 @@ // EAAccessoryManager+SyncProtocols.h // -@import ExternalAccessory; +#import <ExternalAccessory/ExternalAccessory.h> @interface EAAccessoryManager (SDLProtocols) diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLAbstractTransport.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLAbstractTransport.h index dd9a1f054..a8a1f61be 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLAbstractTransport.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLAbstractTransport.h @@ -1,6 +1,6 @@ // SDLAbstractTransport.h -@import Foundation; +#import <Foundation/Foundation.h> #import "SDLTransportDelegate.h" diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLConsoleController.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLConsoleController.h index 55e6425a7..9fdfb062f 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLConsoleController.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLConsoleController.h @@ -1,8 +1,8 @@ // SDLConsoleController.h // -@import Foundation; -@import UIKit; +#import <Foundation/Foundation.h> +#import <UIKit/UIKit.h> #import "SDLDebugTool.h" diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLDebugTool.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLDebugTool.h index 18683a8de..cd9bdbd44 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLDebugTool.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLDebugTool.h @@ -2,7 +2,7 @@ // -@import Foundation; +#import <Foundation/Foundation.h> #import "SDLDebugToolConsole.h" @class SDLRPCMessage; diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLDecoder.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLDecoder.h index 06eda85f7..061c169b7 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLDecoder.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLDecoder.h @@ -2,7 +2,7 @@ // -@import Foundation; +#import <Foundation/Foundation.h> @protocol SDLDecoder <NSObject> diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLEncoder.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLEncoder.h index b36367c5a..ac8fba9ee 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLEncoder.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLEncoder.h @@ -2,7 +2,7 @@ // -@import Foundation; +#import <Foundation/Foundation.h> @protocol SDLEncoder <NSObject> diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLEnum.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLEnum.h index 0824dc349..216ea49cb 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLEnum.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLEnum.h @@ -2,7 +2,7 @@ // -@import Foundation; +#import <Foundation/Foundation.h> @interface SDLEnum : NSObject { diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLFunctionID.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLFunctionID.h index 06a161079..382fda3be 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLFunctionID.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLFunctionID.h @@ -2,7 +2,7 @@ // -@import Foundation; +#import <Foundation/Foundation.h> @interface SDLFunctionID : NSObject { diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLHexUtility.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLHexUtility.h index cbd1bd0b6..0c06818e5 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLHexUtility.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLHexUtility.h @@ -3,7 +3,7 @@ // SmartDeviceLink // -@import Foundation; +#import <Foundation/Foundation.h> @interface SDLHexUtility : NSObject diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPTransport.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPTransport.h index c019bfacc..ff082b9b3 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPTransport.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPTransport.h @@ -1,7 +1,7 @@ // SDLIAPTransport.h // -@import ExternalAccessory; +#import <ExternalAccessory/ExternalAccessory.h> #import "SDLAbstractTransport.h" #import "SDLIAPSessionDelegate.h" diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPTransport.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPTransport.m index fe00f6adf..a1612e0a7 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPTransport.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPTransport.m @@ -2,8 +2,8 @@ // -@import Foundation; -@import UIKit; +#import <Foundation/Foundation.h> +#import <UIKit/UIKit.h> #import "SDLIAPTransport.h" #import "SDLDebugTool.h" diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLJingle.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLJingle.h index 0908cee0c..c2052e997 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLJingle.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLJingle.h @@ -2,7 +2,7 @@ // -@import Foundation; +#import <Foundation/Foundation.h> @interface SDLJingle : NSObject {} diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLJsonDecoder.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLJsonDecoder.h index 116435e2a..906e61749 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLJsonDecoder.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLJsonDecoder.h @@ -1,7 +1,7 @@ // SDLJsonDecoder.h // -@import Foundation; +#import <Foundation/Foundation.h> #import "SDLDecoder.h" diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLJsonEncoder.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLJsonEncoder.h index e0d65ee53..63569ee45 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLJsonEncoder.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLJsonEncoder.h @@ -1,7 +1,7 @@ // SDLJsonEncoder.h // -@import Foundation; +#import <Foundation/Foundation.h> #import "SDLEncoder.h" diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLLockScreenManager.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLLockScreenManager.h index e640f9587..ee8750e83 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLLockScreenManager.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLLockScreenManager.h @@ -3,7 +3,7 @@ // SmartDeviceLink // -@import Foundation; +#import <Foundation/Foundation.h> @class SDLHMILevel; @class SDLLockScreenStatus; diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLObjectWithPriority.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLObjectWithPriority.h index 2f2c5d0f2..b1731c5c9 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLObjectWithPriority.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLObjectWithPriority.h @@ -3,7 +3,7 @@ // SmartDeviceLink // -@import Foundation; +#import <Foundation/Foundation.h> @interface SDLObjectWithPriority : NSObject diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLPolicyDataParser.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLPolicyDataParser.h index f29ed812c..4e005f9fe 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLPolicyDataParser.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLPolicyDataParser.h @@ -2,7 +2,7 @@ // PolicyDataParser.h // -@import Foundation; +#import <Foundation/Foundation.h> @interface SDLPolicyDataParser : NSObject diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLPolicyDataParser.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLPolicyDataParser.m index e25818d5a..02202e2ef 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLPolicyDataParser.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLPolicyDataParser.m @@ -28,8 +28,11 @@ } - (void)parsePolicyData:(NSData *)data { + if (data == nil) { + return; + } + @try { - Byte *bytes = (Byte*)data.bytes; Byte firstByte = bytes[0]; diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLPrioritizedObjectCollection.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLPrioritizedObjectCollection.h index 90a7ddc15..8cf90c805 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLPrioritizedObjectCollection.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLPrioritizedObjectCollection.h @@ -3,7 +3,7 @@ // SmartDeviceLink // -@import Foundation; +#import <Foundation/Foundation.h> @interface SDLPrioritizedObjectCollection : NSObject diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolHeader.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolHeader.h index 9337a085b..1360298ce 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolHeader.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolHeader.h @@ -1,7 +1,7 @@ // SDLProtocolHeader.h // -@import Foundation; +#import <Foundation/Foundation.h> typedef NS_ENUM(UInt8, SDLFrameType) { diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessage.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessage.h index 8508ca868..9a4750de3 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessage.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessage.h @@ -1,7 +1,7 @@ // SDLSmartDeviceLinkProtocolMessage.h // -@import Foundation; +#import <Foundation/Foundation.h> @class SDLProtocolHeader; diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessageAssembler.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessageAssembler.h index 427d18b5f..e4fc0f405 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessageAssembler.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessageAssembler.h @@ -1,7 +1,7 @@ // SDLSmartDeviceLinkProtocolMessageAssembler.h // -@import Foundation; +#import <Foundation/Foundation.h> @class SDLProtocolMessage; diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessageDisassembler.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessageDisassembler.h index b510aa428..10f6f2860 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessageDisassembler.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessageDisassembler.h @@ -1,7 +1,7 @@ // SDLSmartDeviceLinkProtocolMessageDisassembler.h // -@import Foundation; +#import <Foundation/Foundation.h> @class SDLProtocolMessage; diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m index a337ce4b8..2f6e9b019 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m @@ -2,8 +2,8 @@ #import "SDLProxy.h" -@import UIKit; -@import ExternalAccessory; +#import <UIKit/UIKit.h> +#import <ExternalAccessory/ExternalAccessory.h> #import <objc/runtime.h> #import "SDLAbstractTransport.h" diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxyFactory.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxyFactory.h index e9168321a..f5aa22eb9 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxyFactory.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxyFactory.h @@ -1,7 +1,7 @@ // SDLProxyFactory.h // -@import Foundation; +#import <Foundation/Foundation.h> #import "SDLProxyListener.h" diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLQueryAppsManager.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLQueryAppsManager.m index 6c4e14485..50127bf50 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLQueryAppsManager.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLQueryAppsManager.m @@ -4,7 +4,7 @@ #import "SDLQueryAppsManager.h" -@import UIKit; +#import <UIKit/UIKit.h> #import "SDLDebugTool.h" diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCMessageType.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCMessageType.h index bc40ee938..35f841687 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCMessageType.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCMessageType.h @@ -1,7 +1,7 @@ // SDLRPCMessageType.h // -@import Foundation; +#import <Foundation/Foundation.h> typedef NS_ENUM(Byte, SDLRPCMessageType) { SDLRPCMessageTypeRequest = 0, diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCPayload.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCPayload.h index 06b36215b..1a490d956 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCPayload.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCPayload.h @@ -2,7 +2,7 @@ // -@import Foundation; +#import <Foundation/Foundation.h> #import "SDLRPCMessageType.h" diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCRequestFactory.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCRequestFactory.h index 5c695b2b4..bfd0157bf 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCRequestFactory.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCRequestFactory.h @@ -1,7 +1,7 @@ // SDLRPCRequestFactory.h // -@import Foundation; +#import <Foundation/Foundation.h> @class SDLAddCommand; @class SDLAddSubMenu; diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCStruct.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCStruct.h index a0283d86d..eca851d28 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCStruct.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCStruct.h @@ -2,7 +2,7 @@ // SDLRPCStruct.h -@import Foundation; +#import <Foundation/Foundation.h> @interface SDLRPCStruct : NSObject { NSMutableDictionary* store; diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSendLocation.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSendLocation.h index ccebcdecd..cec60c422 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSendLocation.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSendLocation.h @@ -2,7 +2,7 @@ // SDLSendLocation.h // SmartDeviceLink -@import Foundation; +#import <Foundation/Foundation.h> #import "SDLImage.h" #import "SDLRPCRequest.h" diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSiphonServer.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSiphonServer.h index c2e97561f..4a01754a6 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSiphonServer.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSiphonServer.h @@ -2,7 +2,7 @@ // -@import Foundation; +#import <Foundation/Foundation.h> @interface SDLSiphonServer : NSObject <NSStreamDelegate,NSNetServiceDelegate> {} diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLTTSChunkFactory.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLTTSChunkFactory.h index d52509bc4..1097f05bd 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLTTSChunkFactory.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLTTSChunkFactory.h @@ -1,7 +1,7 @@ // SDLTTSChunkFactory.h // -@import Foundation; +#import <Foundation/Foundation.h> @class SDLTTSChunk; @class SDLSpeechCapabilities; diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLV1ProtocolHeader.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLV1ProtocolHeader.m index bcb0999cb..9e072edbe 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLV1ProtocolHeader.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLV1ProtocolHeader.m @@ -53,6 +53,7 @@ const int V1PROTOCOL_HEADERSIZE = 8; } - (void)parse:(NSData *)data { + NSParameterAssert(data != nil); NSAssert(data.length >= _size, @"Error: insufficient data available to parse V1 header."); Byte *bytePointer = (Byte *)data.bytes; diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLV2ProtocolHeader.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLV2ProtocolHeader.m index e7acec9cf..10cb7248f 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLV2ProtocolHeader.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLV2ProtocolHeader.m @@ -61,6 +61,7 @@ const int V2PROTOCOL_HEADERSIZE = 12; } - (void)parse:(NSData *)data { + NSParameterAssert(data != nil); NSAssert(data.length >= _size, @"Error: insufficient data available to parse V2 header."); Byte *bytePointer = (Byte *)data.bytes; diff --git a/SmartDeviceLink-iOS/SmartDeviceLink_Example/Classes/ConnectionAnimatedTransition.h b/SmartDeviceLink-iOS/SmartDeviceLink_Example/Classes/ConnectionAnimatedTransition.h index c3f87c958..a09f1fa77 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink_Example/Classes/ConnectionAnimatedTransition.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink_Example/Classes/ConnectionAnimatedTransition.h @@ -4,7 +4,7 @@ #import <Foundation/Foundation.h> -@import UIKit; +#import <UIKit/UIKit.h> @interface ConnectionAnimatedTransition : NSObject <UIViewControllerAnimatedTransitioning> diff --git a/SmartDeviceLink-iOS/SmartDeviceLink_Example/Classes/ConnectionTransitionContext.h b/SmartDeviceLink-iOS/SmartDeviceLink_Example/Classes/ConnectionTransitionContext.h index c7a94d309..eda85adef 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink_Example/Classes/ConnectionTransitionContext.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink_Example/Classes/ConnectionTransitionContext.h @@ -4,7 +4,7 @@ #import <Foundation/Foundation.h> -@import UIKit; +#import <UIKit/UIKit.h> typedef NS_ENUM(NSUInteger, ConnectionTransitionDirection) { |