diff options
author | Joel Fischer <joeljfischer@gmail.com> | 2016-05-09 16:53:01 -0400 |
---|---|---|
committer | Joel Fischer <joeljfischer@gmail.com> | 2016-05-09 16:53:01 -0400 |
commit | c328bfb45d2db3e0836dbd720e1b3c170a7d4d48 (patch) | |
tree | f577b91c4004578ad96a5abbc0d28dc84ec41840 | |
parent | 298d0eac118186b2261eee8817f7112f8b5d99eb (diff) | |
parent | 09e8e82b96db1bc818f11e3ade538ced60465e54 (diff) | |
download | sdl_ios-c328bfb45d2db3e0836dbd720e1b3c170a7d4d48.tar.gz |
Merge branch 'master' into develop
37 files changed, 160 insertions, 141 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b69c166a..d9f005a72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# 4.1.1 Release Notes +### Bug Fixes +* Fixed passing in wrong type, causing SDL Protocol v1 to fail. +* Fix `SDLRPCStruct` subclasses generating an incorrect description when logged. + +### Other +* Some repository files are now linked into the Xcode project. +* Updated testing dependencies for Xcode 7.3 compatibility. + # 4.1.0 Release Notes ### Enhancements * The `LAUNCH_APP` system request was implemented. diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec index ea303f4b6..1dd33ae57 100644 --- a/SmartDeviceLink-iOS.podspec +++ b/SmartDeviceLink-iOS.podspec @@ -1,14 +1,14 @@ Pod::Spec.new do |s| - s.name = "SmartDeviceLink-iOS" - s.version = "4.1.0" - s.summary = "Connect your app with cars!" - s.homepage = "https://github.com/smartdevicelink/SmartDeviceLink-iOS" - s.license = { :type => "New BSD", :file => "LICENSE" } - s.author = { "SmartDeviceLink Team" => "joel@livio.io" } - s.platform = :ios, "6.0" - s.source = { :git => "https://github.com/smartdevicelink/sdl_ios.git", :tag => "4.1.0" } - s.source_files = "SmartDeviceLink-iOS/SmartDeviceLink/*.{h,m}" - s.requires_arc = true +s.name = "SmartDeviceLink-iOS" +s.version = "4.1.1" +s.summary = "Connect your app with cars!" +s.homepage = "https://github.com/smartdevicelink/SmartDeviceLink-iOS" +s.license = { :type => "New BSD", :file => "LICENSE" } +s.author = { "SmartDeviceLink Team" => "joel@livio.io" } +s.platform = :ios, "6.0" +s.source = { :git => "https://github.com/smartdevicelink/sdl_ios.git", :tag => s.version.to_s } +s.source_files = "SmartDeviceLink-iOS/SmartDeviceLink/*.{h,m}" +s.requires_arc = true end diff --git a/SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj index 3aaca83f4..23b15a664 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj +++ b/SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj @@ -1106,6 +1106,11 @@ 5D1464331C99AC0900727339 /* OCMock.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = OCMock.framework.dSYM; path = Carthage/Build/iOS/OCMock.framework.dSYM; sourceTree = "<group>"; }; 5D1464341C99AC0900727339 /* Quick.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = Quick.framework.dSYM; path = Carthage/Build/iOS/Quick.framework.dSYM; sourceTree = "<group>"; }; 5D1464351C99AC0900727339 /* OCMock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OCMock.framework; path = Carthage/Build/iOS/OCMock.framework; sourceTree = "<group>"; }; + 5D3759BC1CE12E810088C60E /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = CHANGELOG.md; path = ../../CHANGELOG.md; sourceTree = "<group>"; }; + 5D3759BD1CE12E810088C60E /* DEPENDENCIES.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = DEPENDENCIES.md; path = ../../DEPENDENCIES.md; sourceTree = "<group>"; }; + 5D3759BE1CE12E810088C60E /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; name = LICENSE; path = ../../LICENSE; sourceTree = "<group>"; }; + 5D3759BF1CE12E810088C60E /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../../README.md; sourceTree = "<group>"; }; + 5D3759C01CE12E810088C60E /* SmartDeviceLink-iOS.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; name = "SmartDeviceLink-iOS.podspec"; path = "../../SmartDeviceLink-iOS.podspec"; sourceTree = "<group>"; }; 5D4019AF1A76EC350006B0C2 /* SmartDeviceLink-Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "SmartDeviceLink-Example.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 5D4029D31A76F0340006B0C2 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = SmartDeviceLink_Example/Images.xcassets; sourceTree = SOURCE_ROOT; }; 5D4029D51A76F0410006B0C2 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = SmartDeviceLink_Example/Info.plist; sourceTree = SOURCE_ROOT; }; @@ -2855,6 +2860,11 @@ 5D5934EE1A85160900687FB9 /* Protocol */, 5D5934ED1A85160400687FB9 /* Proxy */, 5D61FA201A84237100846EE7 /* SmartDeviceLink.h */, + 5D3759BC1CE12E810088C60E /* CHANGELOG.md */, + 5D3759BD1CE12E810088C60E /* DEPENDENCIES.md */, + 5D3759BE1CE12E810088C60E /* LICENSE */, + 5D3759BF1CE12E810088C60E /* README.md */, + 5D3759C01CE12E810088C60E /* SmartDeviceLink-iOS.podspec */, 5D61FA1E1A84237100846EE7 /* Supporting Files */, ); path = SmartDeviceLink; @@ -4124,7 +4134,6 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; EMBEDDED_CONTENT_CONTAINS_SWIFT = NO; FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", "$(DEVELOPER_FRAMEWORKS_DIR)", "$(PROJECT_DIR)/Carthage/Build/iOS", @@ -4160,7 +4169,6 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; EMBEDDED_CONTENT_CONTAINS_SWIFT = NO; FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", "$(DEVELOPER_FRAMEWORKS_DIR)", "$(PROJECT_DIR)/Carthage/Build/iOS", diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/Info.plist b/SmartDeviceLink-iOS/SmartDeviceLink/Info.plist index 5284837db..76d0c69e8 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/Info.plist +++ b/SmartDeviceLink-iOS/SmartDeviceLink/Info.plist @@ -15,7 +15,7 @@ <key>CFBundlePackageType</key> <string>FMWK</string> <key>CFBundleShortVersionString</key> - <string>4.1.0</string> + <string>4.1.1</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLAddCommand.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLAddCommand.m index b0de0f49e..e9630665e 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLAddCommand.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLAddCommand.m @@ -4,9 +4,9 @@ #import "SDLAddCommand.h" -#import "SDLNames.h" -#import "SDLMenuParams.h" #import "SDLImage.h" +#import "SDLMenuParams.h" +#import "SDLNames.h" @implementation SDLAddCommand diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLAlert.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLAlert.m index 35f31b094..ddc7fdc3a 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLAlert.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLAlert.m @@ -3,8 +3,8 @@ #import "SDLAlert.h" #import "SDLNames.h" -#import "SDLTTSChunk.h" #import "SDLSoftButton.h" +#import "SDLTTSChunk.h" @implementation SDLAlert diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLAlertManeuver.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLAlertManeuver.m index 6223c7dac..81717506f 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLAlertManeuver.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLAlertManeuver.m @@ -5,8 +5,8 @@ #import "SDLAlertManeuver.h" #import "SDLNames.h" -#import "SDLTTSChunk.h" #import "SDLSoftButton.h" +#import "SDLTTSChunk.h" @implementation SDLAlertManeuver diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLChangeRegistration.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLChangeRegistration.m index 5ea0f733f..00a7de885 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLChangeRegistration.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLChangeRegistration.m @@ -4,8 +4,8 @@ #import "SDLChangeRegistration.h" -#import "SDLNames.h" #import "SDLLanguage.h" +#import "SDLNames.h" @implementation SDLChangeRegistration diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLCreateInteractionChoiceSet.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLCreateInteractionChoiceSet.m index b4c32df5e..32324d46e 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLCreateInteractionChoiceSet.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLCreateInteractionChoiceSet.m @@ -4,8 +4,8 @@ #import "SDLCreateInteractionChoiceSet.h" -#import "SDLNames.h" #import "SDLChoice.h" +#import "SDLNames.h" @implementation SDLCreateInteractionChoiceSet diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLDebugTool.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLDebugTool.h index 41e6fbc5b..0e487303b 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLDebugTool.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLDebugTool.h @@ -2,8 +2,8 @@ // -#import <Foundation/Foundation.h> #import "SDLDebugToolConsole.h" +#import <Foundation/Foundation.h> @class SDLRPCMessage; diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLDebugTool.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLDebugTool.m index b2222a7ca..1f0312c9c 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLDebugTool.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLDebugTool.m @@ -2,10 +2,10 @@ // #import "SDLDebugTool.h" +#import "NSThread+ThreadIndex.h" +#import "SDLHexUtility.h" #import "SDLRPCMessage.h" #import "SDLSiphonServer.h" -#import "SDLHexUtility.h" -#import "NSThread+ThreadIndex.h" #define LOG_ERROR_ENABLED @@ -29,10 +29,10 @@ if (!self) { return nil; } - + _debugToLogFile = NO; _logQueue = dispatch_queue_create("com.sdl.log.file", DISPATCH_QUEUE_SERIAL); - + return self; } @@ -42,7 +42,7 @@ dispatch_once(&onceToken, ^{ sharedTool = [[self.class alloc] init]; }); - + return sharedTool; } @@ -161,19 +161,19 @@ - (void)sdl_enableDebugToLogFile { [SDLDebugTool logInfo:@"Enabling Log File" withType:SDLDebugType_Debug]; - + self.debugToLogFile = YES; - + //Delete Log File If It Exists NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); NSString *documentsDirectory = [paths objectAtIndex:0]; NSString *filePath = [documentsDirectory stringByAppendingPathComponent:@"smartdevicelink.log"]; - + NSFileManager *manager = [NSFileManager defaultManager]; if ([manager fileExistsAtPath:filePath]) { [manager removeItemAtPath:filePath error:nil]; } - + // Create log file [manager createFileAtPath:filePath contents:nil attributes:nil]; self.logFileHandle = [NSFileHandle fileHandleForWritingAtPath:filePath]; @@ -197,16 +197,16 @@ if (!self.debugToLogFile || info == NULL || info.length == 0) { return; } - + dispatch_async(self.logQueue, ^{ // Create timestamp string, add it in front of the message to be logged NSDate *currentDate = [NSDate date]; NSString *dateString = [self.logDateFormatter stringFromDate:currentDate]; NSString *outputString = [dateString stringByAppendingFormat:@": %@\n", info]; - + // File write takes an NSData, so convert string to data. NSData *dataToLog = [outputString dataUsingEncoding:NSUTF8StringEncoding]; - + if (self.logFileHandle != nil) { [self.logFileHandle seekToEndOfFile]; [self.logFileHandle writeData:dataToLog]; @@ -221,7 +221,7 @@ _logDateFormatter = [[NSDateFormatter alloc] init]; [_logDateFormatter setDateFormat:@"MM/dd/YY HH:mm:ss.SSS"]; } - + return _logDateFormatter; } diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLGlobals.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLGlobals.h index b3778f62e..2b6fe2c47 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLGlobals.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLGlobals.h @@ -8,7 +8,7 @@ #import <Foundation/Foundation.h> -#define SDL_SYSTEM_VERSION_LESS_THAN(version) ([[[UIDevice currentDevice] systemVersion] compare:version options:NSNumericSearch] == NSOrderedAscending) +#define SDL_SYSTEM_VERSION_LESS_THAN(version) ([[[UIDevice currentDevice] systemVersion] compare:version options:NSNumericSearch] == NSOrderedAscending) @interface SDLGlobals : NSObject diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLHMIPermissions.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLHMIPermissions.m index 1876a7137..29555bf59 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLHMIPermissions.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLHMIPermissions.m @@ -4,8 +4,8 @@ #import "SDLHMIPermissions.h" -#import "SDLNames.h" #import "SDLHMILevel.h" +#import "SDLNames.h" @implementation SDLHMIPermissions diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPSession.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPSession.h index 5a1251fda..d21343894 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPSession.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPSession.h @@ -2,9 +2,9 @@ // SDLIAPSession.h // -#import <Foundation/Foundation.h> -#import <ExternalAccessory/ExternalAccessory.h> #import "SDLIAPSessionDelegate.h" +#import <ExternalAccessory/ExternalAccessory.h> +#import <Foundation/Foundation.h> @class SDLStreamDelegate; diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPSession.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPSession.m index 131885965..5020b2081 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPSession.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPSession.m @@ -2,10 +2,10 @@ // SDLIAPSession.m // -#import "SDLDebugTool.h" #import "SDLIAPSession.h" -#import "SDLTimer.h" +#import "SDLDebugTool.h" #import "SDLStreamDelegate.h" +#import "SDLTimer.h" @interface SDLIAPSession () @@ -48,7 +48,7 @@ if ((self.easession = [[EASession alloc] initWithAccessory:_accessory forProtocol:_protocol])) { __strong typeof(self) strongSelf = weakSelf; - + [SDLDebugTool logInfo:@"Created Session Object"]; strongSelf.streamDelegate.streamErrorHandler = [self streamErroredHandler]; diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPTransport.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPTransport.m index e7ba64962..5cf4ceb21 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPTransport.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPTransport.m @@ -5,15 +5,15 @@ #import <Foundation/Foundation.h> #import <UIKit/UIKit.h> -#import "SDLIAPTransport.h" +#import "EAAccessoryManager+SDLProtocols.h" #import "SDLDebugTool.h" #import "SDLGlobals.h" -#import "SDLSiphonServer.h" +#import "SDLIAPSession.h" #import "SDLIAPTransport.h" +#import "SDLIAPTransport.h" +#import "SDLSiphonServer.h" #import "SDLStreamDelegate.h" -#import "EAAccessoryManager+SDLProtocols.h" #import "SDLTimer.h" -#import "SDLIAPSession.h" #import <CommonCrypto/CommonDigest.h> @@ -180,7 +180,7 @@ int const streamOpenTimeoutSeconds = 2; __weak typeof(self) weakSelf = self; void (^elapsedBlock)(void) = ^{ __strong typeof(weakSelf) strongSelf = weakSelf; - + [SDLDebugTool logInfo:@"Protocol Index Timeout"]; [strongSelf.controlSession stop]; strongSelf.controlSession.streamDelegate = nil; @@ -418,37 +418,37 @@ int const streamOpenTimeoutSeconds = 2; const double min_value = 0.0; const double max_value = 10.0; double range_length = max_value - min_value; - + static double delay = 0; - + // HAX: This pull the app name and hashes it in an attempt to provide a more even distribution of retry delays. The evidence that this does so is anecdotal. A more ideal solution would be to use a list of known, installed SDL apps on the phone to try and deterministically generate an even delay. if (delay == 0) { NSString *appName = [[NSProcessInfo processInfo] processName]; if (appName == nil) { appName = @"noname"; } - + // Run the app name through an md5 hasher const char *ptr = [appName UTF8String]; unsigned char md5Buffer[CC_MD5_DIGEST_LENGTH]; CC_MD5(ptr, (unsigned int)strlen(ptr), md5Buffer); - + // Generate a string of the hex hash NSMutableString *output = [NSMutableString stringWithString:@"0x"]; for (int i = 0; i < 8; i++) { [output appendFormat:@"%02X", md5Buffer[i]]; } - + // Transform the string into a number between 0 and 1 unsigned long long firstHalf; NSScanner *pScanner = [NSScanner scannerWithString:output]; [pScanner scanHexLongLong:&firstHalf]; double hashBasedValueInRange0to1 = ((double)firstHalf) / 0xffffffffffffffff; - + // Transform the number into a number between min and max delay = ((range_length * hashBasedValueInRange0to1) + min_value); } - + return delay; } diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnButtonEvent.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnButtonEvent.m index c8d9797f2..d112d88ea 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnButtonEvent.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnButtonEvent.m @@ -3,8 +3,8 @@ #import "SDLOnButtonEvent.h" -#import "SDLButtonName.h" #import "SDLButtonEventMode.h" +#import "SDLButtonName.h" #import "SDLNames.h" diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformInteraction.m index f5eec2fa9..de6c3622f 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformInteraction.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformInteraction.m @@ -4,9 +4,9 @@ #import "SDLPerformInteraction.h" -#import "SDLNames.h" #import "SDLInteractionMode.h" #import "SDLLayoutMode.h" +#import "SDLNames.h" #import "SDLTTSChunk.h" #import "SDLVRHelpItem.h" diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocol.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocol.m index cee0d7791..bb6db1814 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocol.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocol.m @@ -2,24 +2,24 @@ // -#import "SDLJsonEncoder.h" #import "SDLFunctionID.h" +#import "SDLJsonEncoder.h" +#import "SDLAbstractTransport.h" +#import "SDLDebugTool.h" #import "SDLGlobals.h" -#import "SDLRPCRequest.h" +#import "SDLPrioritizedObjectCollection.h" #import "SDLProtocol.h" #import "SDLProtocolHeader.h" #import "SDLProtocolMessage.h" -#import "SDLV2ProtocolHeader.h" #import "SDLProtocolMessageDisassembler.h" #import "SDLProtocolReceivedMessageRouter.h" -#import "SDLRPCPayload.h" -#import "SDLDebugTool.h" -#import "SDLPrioritizedObjectCollection.h" #import "SDLRPCNotification.h" +#import "SDLRPCPayload.h" +#import "SDLRPCRequest.h" #import "SDLRPCResponse.h" -#import "SDLAbstractTransport.h" #import "SDLTimer.h" +#import "SDLV2ProtocolHeader.h" @interface SDLProtocol () { @@ -324,7 +324,7 @@ - (void)handleProtocolEndSessionACK:(SDLServiceType)serviceType { // Remove the session id [self sdl_removeSessionIdForServiceType:serviceType]; - + for (id<SDLProtocolListener> listener in self.protocolDelegateTable.allObjects) { if ([listener respondsToSelector:@selector(handleProtocolEndSessionACK:)]) { [listener handleProtocolEndSessionACK:serviceType]; diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessage.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessage.m index e96c61455..f68810123 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessage.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessage.m @@ -2,12 +2,12 @@ // -#import "SDLProtocolHeader.h" #import "SDLProtocolMessage.h" +#import "SDLFunctionID.h" +#import "SDLProtocolHeader.h" +#import "SDLRPCPayload.h" #import "SDLV1ProtocolMessage.h" #import "SDLV2ProtocolMessage.h" -#import "SDLRPCPayload.h" -#import "SDLFunctionID.h" @interface SDLProtocolMessage () diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessageDisassembler.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessageDisassembler.m index 3fa82c9f6..76d722956 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessageDisassembler.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolMessageDisassembler.m @@ -1,9 +1,9 @@ // SDLProtocolMessageDisassembler.m // +#import "SDLProtocolMessageDisassembler.h" #import "SDLProtocolHeader.h" #import "SDLProtocolMessage.h" -#import "SDLProtocolMessageDisassembler.h" @implementation SDLProtocolMessageDisassembler diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolReceivedMessageRouter.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolReceivedMessageRouter.m index fb72e9b0d..5ea7c6e63 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolReceivedMessageRouter.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProtocolReceivedMessageRouter.m @@ -4,9 +4,9 @@ // This class gets handed the SDLProtocol messages as they are received and decides what happens to them and where they are sent on to. #import "SDLProtocolReceivedMessageRouter.h" +#import "SDLDebugTool.h" #import "SDLProtocolMessage.h" #import "SDLProtocolMessageAssembler.h" -#import "SDLDebugTool.h" @interface SDLProtocolReceivedMessageRouter () diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m index 48e1fe275..0fe44f31e 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m @@ -2,8 +2,8 @@ #import "SDLProxy.h" -#import <UIKit/UIKit.h> #import <ExternalAccessory/ExternalAccessory.h> +#import <UIKit/UIKit.h> #import <objc/runtime.h> #import "SDLAbstractTransport.h" @@ -19,25 +19,25 @@ #import "SDLLanguage.h" #import "SDLLayoutMode.h" #import "SDLLockScreenManager.h" +#import "SDLLockScreenManager.h" #import "SDLNames.h" #import "SDLOnHMIStatus.h" #import "SDLOnSystemRequest.h" #import "SDLPolicyDataParser.h" +#import "SDLPolicyDataParser.h" #import "SDLProtocol.h" #import "SDLProtocolMessage.h" +#import "SDLProtocolMessage.h" #import "SDLPutFile.h" -#import "SDLRequestType.h" +#import "SDLRPCPayload.h" #import "SDLRPCPayload.h" #import "SDLRPCRequestFactory.h" #import "SDLRPCResponse.h" +#import "SDLRequestType.h" #import "SDLSiphonServer.h" #import "SDLStreamingMediaManager.h" #import "SDLSystemContext.h" #import "SDLSystemRequest.h" -#import "SDLRPCPayload.h" -#import "SDLPolicyDataParser.h" -#import "SDLLockScreenManager.h" -#import "SDLProtocolMessage.h" #import "SDLTimer.h" #import "SDLURLSession.h" @@ -45,7 +45,7 @@ typedef void (^URLSessionTaskCompletionHandler)(NSData *data, NSURLResponse *response, NSError *error); typedef void (^URLSessionDownloadTaskCompletionHandler)(NSURL *location, NSURLResponse *response, NSError *error); -NSString *const SDLProxyVersion = @"4.1.0"; +NSString *const SDLProxyVersion = @"4.1.1"; const float startSessionTime = 10.0; const float notifyProxyClosedDelay = 0.1; const int POLICIES_CORRELATION_ID = 65535; @@ -206,7 +206,7 @@ const int POLICIES_CORRELATION_ID = 65535; NSString *logMessage = [NSString stringWithFormat:@"StartSession (response)\nSessionId: %d for serviceType %d", sessionID, serviceType]; [SDLDebugTool logInfo:logMessage withType:SDLDebugType_RPC toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName]; - + if (serviceType == SDLServiceType_RPC) { [self invokeMethodOnDelegates:@selector(onProxyOpened) withObject:nil]; } @@ -259,7 +259,7 @@ const int POLICIES_CORRELATION_ID = 65535; // From the function name, create the corresponding RPCObject and initialize it NSString *functionClassName = [NSString stringWithFormat:@"SDL%@", functionName]; - SDLRPCMessage *newMessage = [[NSClassFromString(functionClassName) alloc] initWithDictionary:dict]; + SDLRPCMessage *newMessage = [[NSClassFromString(functionClassName) alloc] initWithDictionary:[dict mutableCopy]]; // Log the RPC message NSString *logMessage = [NSString stringWithFormat:@"%@", newMessage]; @@ -395,7 +395,7 @@ const int POLICIES_CORRELATION_ID = 65535; [SDLDebugTool logInfo:[NSString stringWithFormat:@"Launch App failure: invalid URL sent from module: %@", request.url] withType:SDLDebugType_RPC toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName]; return; } - // If system version is less than 9.0 http://stackoverflow.com/a/5337804/1370927 + // If system version is less than 9.0 http://stackoverflow.com/a/5337804/1370927 if (SDL_SYSTEM_VERSION_LESS_THAN(@"9.0")) { // Return early if we can't openURL because openURL will crash instead of fail silently in < 9.0 if (![[UIApplication sharedApplication] canOpenURL:URLScheme]) { @@ -486,35 +486,37 @@ const int POLICIES_CORRELATION_ID = 65535; return; } - [self sdl_uploadData:request.bulkData toURLString:request.url completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { - NSString *logMessage = nil; - if (error != nil) { - logMessage = [NSString stringWithFormat:@"OnSystemRequest (HTTP response) = ERROR: %@", error.localizedDescription]; - [SDLDebugTool logInfo:logMessage withType:SDLDebugType_RPC toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName]; - return; - } - - if (data.length == 0) { - [SDLDebugTool logInfo:@"OnSystemRequest (HTTP response) failure: no data returned" withType:SDLDebugType_RPC toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName]; - return; - } - - // Show the HTTP response - NSString *responseLogString = [NSString stringWithFormat:@"OnSystemRequest (HTTP) response: %@", response]; - [SDLDebugTool logInfo:responseLogString withType:SDLDebugType_RPC toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName]; - - // Create the SystemRequest RPC to send to module. - SDLPutFile *putFile = [[SDLPutFile alloc] init]; - putFile.fileType = [SDLFileType JSON]; - putFile.correlationID = @(POLICIES_CORRELATION_ID); - putFile.syncFileName = @"response_data"; - putFile.bulkData = data; - - // Send and log RPC Request - logMessage = [NSString stringWithFormat:@"SystemRequest (request)\n%@\nData length=%lu", [request serializeAsDictionary:2], (unsigned long)data.length]; - [SDLDebugTool logInfo:logMessage withType:SDLDebugType_RPC toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName]; - [self sendRPC:putFile]; - }]; + [self sdl_uploadData:request.bulkData + toURLString:request.url + completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { + NSString *logMessage = nil; + if (error != nil) { + logMessage = [NSString stringWithFormat:@"OnSystemRequest (HTTP response) = ERROR: %@", error.localizedDescription]; + [SDLDebugTool logInfo:logMessage withType:SDLDebugType_RPC toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName]; + return; + } + + if (data.length == 0) { + [SDLDebugTool logInfo:@"OnSystemRequest (HTTP response) failure: no data returned" withType:SDLDebugType_RPC toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName]; + return; + } + + // Show the HTTP response + NSString *responseLogString = [NSString stringWithFormat:@"OnSystemRequest (HTTP) response: %@", response]; + [SDLDebugTool logInfo:responseLogString withType:SDLDebugType_RPC toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName]; + + // Create the SystemRequest RPC to send to module. + SDLPutFile *putFile = [[SDLPutFile alloc] init]; + putFile.fileType = [SDLFileType JSON]; + putFile.correlationID = @(POLICIES_CORRELATION_ID); + putFile.syncFileName = @"response_data"; + putFile.bulkData = data; + + // Send and log RPC Request + logMessage = [NSString stringWithFormat:@"SystemRequest (request)\n%@\nData length=%lu", [request serializeAsDictionary:2], (unsigned long)data.length]; + [SDLDebugTool logInfo:logMessage withType:SDLDebugType_RPC toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName]; + [self sendRPC:putFile]; + }]; } /** @@ -557,7 +559,7 @@ const int POLICIES_CORRELATION_ID = 65535; * @param urlString The URL the data should be POSTed to * @param completionHandler A completion handler of what to do when the server responds */ -- (void)sdl_uploadData:(NSData * _Nonnull)data toURLString:(NSString * _Nonnull)urlString completionHandler:(URLSessionTaskCompletionHandler _Nullable)completionHandler { +- (void)sdl_uploadData:(NSData *_Nonnull)data toURLString:(NSString *_Nonnull)urlString completionHandler:(URLSessionTaskCompletionHandler _Nullable)completionHandler { // NSURLRequest configuration NSURL *url = [NSURL URLWithString:urlString]; NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url]; diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxyFactory.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxyFactory.m index dc1a0b752..b2320c641 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxyFactory.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxyFactory.m @@ -5,9 +5,9 @@ #import "SDLDebugTool.h" #import "SDLIAPTransport.h" -#import "SDLTCPTransport.h" #import "SDLProtocol.h" #import "SDLProxy.h" +#import "SDLTCPTransport.h" @implementation SDLProxyFactory diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCRequestFactory.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCRequestFactory.m index 88ba28518..44f9848a8 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCRequestFactory.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCRequestFactory.m @@ -2,12 +2,10 @@ // #import "SDLRPCRequestFactory.h" -#import <UIKit/UIKit.h> -#import <CoreTelephony/CTTelephonyNetworkInfo.h> #import <CoreTelephony/CTCarrier.h> +#import <CoreTelephony/CTTelephonyNetworkInfo.h> +#import <UIKit/UIKit.h> -#import "SDLMenuParams.h" -#import "SDLTTSChunkFactory.h" #import "SDLAddCommand.h" #import "SDLAddSubMenu.h" #import "SDLAlert.h" @@ -29,6 +27,7 @@ #import "SDLImage.h" #import "SDLInteractionMode.h" #import "SDLListFiles.h" +#import "SDLMenuParams.h" #import "SDLPerformAudioPassThru.h" #import "SDLPerformInteraction.h" #import "SDLPutFile.h" @@ -51,6 +50,7 @@ #import "SDLSubscribeVehicleData.h" #import "SDLSyncMsgVersion.h" #import "SDLTTSChunk.h" +#import "SDLTTSChunkFactory.h" #import "SDLUnregisterAppInterface.h" #import "SDLUnsubscribeButton.h" #import "SDLUnsubscribeVehicleData.h" diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCStruct.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCStruct.m index 86c352f1d..dd96fff5d 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCStruct.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCStruct.m @@ -79,7 +79,7 @@ } - (NSString *)description { - return [NSString stringWithFormat:@"RPC Struct (%@) %@", [self class], [store description]]; + return [store description]; } - (void)dealloc { diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLReadDIDResponse.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLReadDIDResponse.m index c9ec4ec4c..08c5477f6 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLReadDIDResponse.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLReadDIDResponse.m @@ -4,8 +4,8 @@ #import "SDLReadDIDResponse.h" -#import "SDLNames.h" #import "SDLDIDResult.h" +#import "SDLNames.h" @implementation SDLReadDIDResponse diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRegisterAppInterface.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRegisterAppInterface.m index b10917f94..318d5dfa7 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRegisterAppInterface.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRegisterAppInterface.m @@ -8,8 +8,8 @@ #import "SDLDeviceInfo.h" #import "SDLLanguage.h" #import "SDLNames.h" -#import "SDLTTSChunk.h" #import "SDLSyncMsgVersion.h" +#import "SDLTTSChunk.h" @implementation SDLRegisterAppInterface diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLResetGlobalProperties.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLResetGlobalProperties.m index 8e0a05f41..350f96de0 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLResetGlobalProperties.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLResetGlobalProperties.m @@ -4,8 +4,8 @@ #import "SDLResetGlobalProperties.h" -#import "SDLNames.h" #import "SDLGlobalProperty.h" +#import "SDLNames.h" @implementation SDLResetGlobalProperties diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSiphonServer.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSiphonServer.m index 8c2efeff0..dbb433424 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSiphonServer.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSiphonServer.m @@ -14,13 +14,13 @@ //#define DEBUG_SIPHON //Uncomment to have output to NSLog. #import "SDLSiphonServer.h" +#import "SDLDebugTool.h" #include <CFNetwork/CFNetwork.h> -#include <sys/socket.h> #include <netinet/in.h> -#include <sys/types.h> #include <string.h> +#include <sys/socket.h> +#include <sys/types.h> #include <unistd.h> -#import "SDLDebugTool.h" typedef enum { fromApp = 0x01, diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLStreamDelegate.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLStreamDelegate.m index c9f1f5671..6c2db6c34 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLStreamDelegate.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLStreamDelegate.m @@ -2,8 +2,8 @@ // SDLtreamDelegate.m // -#import "SDLDebugTool.h" #import "SDLStreamDelegate.h" +#import "SDLDebugTool.h" @interface SDLStreamDelegate () { dispatch_queue_t _input_stream_queue; diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLTCPTransport.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLTCPTransport.m index 54eb63423..81fc9c555 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLTCPTransport.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLTCPTransport.m @@ -6,14 +6,14 @@ #import "SDLDebugTool.h" #import "SDLHexUtility.h" #import <errno.h> +#import <netdb.h> +#import <netinet/in.h> #import <signal.h> #import <stdio.h> -#import <unistd.h> -#import <sys/types.h> #import <sys/socket.h> +#import <sys/types.h> #import <sys/wait.h> -#import <netinet/in.h> -#import <netdb.h> +#import <unistd.h> // C function forward declarations. @@ -127,7 +127,7 @@ int call_socket(const char *hostname, const char *port) { gethostname(localhost, sizeof localhost); hostname = (const char *)&localhost; } - + //getaddrinfo setup if ((status = getaddrinfo(hostname, port, &hints, &servinfo)) != 0) { fprintf(stderr, "getaddrinfo error: %s\n", gai_strerror(status)); diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLUpdateTurnList.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLUpdateTurnList.m index de6ecc595..7063c9c29 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLUpdateTurnList.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLUpdateTurnList.m @@ -5,8 +5,8 @@ #import "SDLUpdateTurnList.h" #import "SDLNames.h" -#import "SDLTurn.h" #import "SDLSoftButton.h" +#import "SDLTurn.h" @implementation SDLUpdateTurnList diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLV1ProtocolMessage.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLV1ProtocolMessage.m index f7c60a7a0..736dd0b13 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLV1ProtocolMessage.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLV1ProtocolMessage.m @@ -1,9 +1,9 @@ // SDLV1ProtocolMessage.m // +#import "SDLV1ProtocolMessage.h" #import "SDLJsonDecoder.h" #import "SDLProtocolHeader.h" -#import "SDLV1ProtocolMessage.h" @implementation SDLV1ProtocolMessage diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLV2ProtocolMessage.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLV2ProtocolMessage.m index 6d048b71d..683c10335 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLV2ProtocolMessage.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLV2ProtocolMessage.m @@ -1,12 +1,12 @@ // SDLSmartDeviceLinkV2ProtocolMessage.m // +#import "SDLV2ProtocolMessage.h" #import "SDLFunctionID.h" #import "SDLJsonDecoder.h" #import "SDLNames.h" #import "SDLProtocolHeader.h" #import "SDLRPCPayload.h" -#import "SDLV2ProtocolMessage.h" @implementation SDLV2ProtocolMessage diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLVehicleDataResult.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLVehicleDataResult.m index 3a0849f87..e395717eb 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLVehicleDataResult.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLVehicleDataResult.m @@ -4,8 +4,8 @@ #import "SDLVehicleDataResult.h" #import "SDLNames.h" -#import "SDLVehicleDataType.h" #import "SDLVehicleDataResultCode.h" +#import "SDLVehicleDataType.h" @implementation SDLVehicleDataResult diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SmartDeviceLink.h b/SmartDeviceLink-iOS/SmartDeviceLink/SmartDeviceLink.h index 61a92e141..1bfbcb655 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SmartDeviceLink.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SmartDeviceLink.h @@ -14,8 +14,8 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; /***** Proxy *****/ #import "SDLProxy.h" -#import "SDLProxyListener.h" #import "SDLProxyFactory.h" +#import "SDLProxyListener.h" #import "SDLStreamingMediaManager.h" #import "SDLTTSChunkFactory.h" @@ -27,15 +27,15 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; /***** Transport *****/ #import "SDLAbstractTransport.h" -#import "SDLIAPTransport.h" #import "SDLIAPSessionDelegate.h" +#import "SDLIAPTransport.h" #import "SDLTCPTransport.h" #import "SDLTransportDelegate.h" /***** Protocol *****/ -#import "SDLProtocolListener.h" #import "SDLAbstractProtocol.h" #import "SDLProtocol.h" +#import "SDLProtocolListener.h" // Header #import "SDLProtocolHeader.h" @@ -47,10 +47,10 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; // Superclasses #import "SDLEnum.h" #import "SDLRPCMessage.h" -#import "SDLRPCStruct.h" #import "SDLRPCNotification.h" #import "SDLRPCRequest.h" #import "SDLRPCResponse.h" +#import "SDLRPCStruct.h" // Factories #import "SDLRPCRequestFactory.h" @@ -148,8 +148,8 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; #import "SDLOnCommand.h" #import "SDLOnDriverDistraction.h" #import "SDLOnEncodedSyncPData.h" -#import "SDLOnHashChange.h" #import "SDLOnHMIStatus.h" +#import "SDLOnHashChange.h" #import "SDLOnKeyboardInput.h" #import "SDLOnLanguageChange.h" #import "SDLOnLockScreenStatus.h" @@ -168,16 +168,16 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; #import "SDLButtonCapabilities.h" #import "SDLChoice.h" #import "SDLClusterModeStatus.h" +#import "SDLDIDResult.h" #import "SDLDeviceInfo.h" #import "SDLDeviceStatus.h" -#import "SDLDIDResult.h" #import "SDLDisplayCapabilities.h" #import "SDLECallInfo.h" #import "SDLEmergencyEvent.h" #import "SDLGPSData.h" -#import "SDLHeadLampStatus.h" #import "SDLHMICapabilities.h" #import "SDLHMIPermissions.h" +#import "SDLHeadLampStatus.h" #import "SDLImage.h" #import "SDLImageField.h" #import "SDLImageResolution.h" @@ -193,16 +193,16 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; #import "SDLSoftButtonCapabilities.h" #import "SDLStartTime.h" #import "SDLSyncMsgVersion.h" +#import "SDLTTSChunk.h" #import "SDLTextField.h" #import "SDLTireStatus.h" #import "SDLTouchCoord.h" #import "SDLTouchEvent.h" #import "SDLTouchEventCapabilities.h" -#import "SDLTTSChunk.h" #import "SDLTurn.h" +#import "SDLVRHelpItem.h" #import "SDLVehicleDataResult.h" #import "SDLVehicleType.h" -#import "SDLVRHelpItem.h" // Enums #import "SDLAmbientLightStatus.h" @@ -242,16 +242,16 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; #import "SDLLockScreenStatus.h" #import "SDLMaintenanceModeStatus.h" #import "SDLMediaClockFormat.h" +#import "SDLPRNDL.h" #import "SDLPermissionStatus.h" #import "SDLPowerModeQualificationStatus.h" #import "SDLPowerModeStatus.h" #import "SDLPredefinedLayout.h" #import "SDLPrerecordedSpeech.h" #import "SDLPrimaryAudioSource.h" -#import "SDLPRNDL.h" +#import "SDLRPCMessageType.h" #import "SDLRequestType.h" #import "SDLResult.h" -#import "SDLRPCMessageType.h" #import "SDLSamplingRate.h" #import "SDLSoftButtonType.h" #import "SDLSpeechCapabilities.h" @@ -264,12 +264,12 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; #import "SDLTouchType.h" #import "SDLTriggerSource.h" #import "SDLUpdateMode.h" +#import "SDLVRCapabilities.h" #import "SDLVehicleDataActiveStatus.h" #import "SDLVehicleDataEventStatus.h" #import "SDLVehicleDataNotificationStatus.h" #import "SDLVehicleDataResultCode.h" #import "SDLVehicleDataStatus.h" #import "SDLVehicleDataType.h" -#import "SDLVRCapabilities.h" #import "SDLWarningLightStatus.h" #import "SDLWiperStatus.h" |