diff --git a/README.md b/README.md index 55721e600..95bd98695 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ See the [roadmap](https://github.com/smartdevicelink/sdl_ios/wiki/Roadmap) to se You can install this library using [Cocoapods](https://cocoapods.org/pods/SmartDeviceLink-iOS). You can get started with Cocoapods by [following their install guide](https://guides.cocoapods.org/using/getting-started.html#getting-started), and learn how to use Cocoapods to install dependencies [by following this guide](https://guides.cocoapods.org/using/using-cocoapods.html). -In your podfile, you want to add `pod 'SmartDeviceLink-iOS', '~> 4.4'`. Then run `pod install` inside your terminal. With Cocoapods, we support iOS 6.0+. +In your podfile, you want to add `pod 'SmartDeviceLink-iOS', '~> 4.5'`. Then run `pod install` inside your terminal. With Cocoapods, we support iOS 6.0+. ##### Carthage diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec index c544722d6..70ea7dac7 100644 --- a/SmartDeviceLink-iOS.podspec +++ b/SmartDeviceLink-iOS.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "SmartDeviceLink-iOS" -s.version = "4.4.1" +s.version = "4.5.0-beta.1" s.summary = "Connect your app with cars!" s.homepage = "https://github.com/smartdevicelink/SmartDeviceLink-iOS" s.license = { :type => "New BSD", :file => "LICENSE" } diff --git a/SmartDeviceLink/Info.plist b/SmartDeviceLink/Info.plist index 098bfd229..0ab46e104 100644 --- a/SmartDeviceLink/Info.plist +++ b/SmartDeviceLink/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 4.4.1 + 4.5.0-beta.1 CFBundleSignature ???? CFBundleVersion diff --git a/SmartDeviceLink/SDLGetWaypoints.h b/SmartDeviceLink/SDLGetWaypoints.h index 7d3134e61..5a961c3a6 100644 --- a/SmartDeviceLink/SDLGetWaypoints.h +++ b/SmartDeviceLink/SDLGetWaypoints.h @@ -21,6 +21,6 @@ @end __deprecated_msg("Use SDLGetWayPoints instead") -@interface SDLGetWaypoints : SDLGetWayPoints + @interface SDLGetWaypoints : SDLGetWayPoints -@end + @end diff --git a/SmartDeviceLink/SDLGetWaypoints.m b/SmartDeviceLink/SDLGetWaypoints.m index f46f7555c..1e9e2dfd2 100644 --- a/SmartDeviceLink/SDLGetWaypoints.m +++ b/SmartDeviceLink/SDLGetWaypoints.m @@ -20,9 +20,9 @@ - (instancetype)initWithType:(SDLWaypointType *)type { if (!self) { return nil; } - + self.waypointType = type; - + return self; } diff --git a/SmartDeviceLink/SDLGetWaypointsResponse.h b/SmartDeviceLink/SDLGetWaypointsResponse.h index a2456686c..72cc127cb 100644 --- a/SmartDeviceLink/SDLGetWaypointsResponse.h +++ b/SmartDeviceLink/SDLGetWaypointsResponse.h @@ -19,6 +19,6 @@ @end __deprecated_msg("Use SDLGetWayPointsResponse instead") -@interface SDLGetWaypointsResponse : SDLGetWayPointsResponse + @interface SDLGetWaypointsResponse : SDLGetWayPointsResponse -@end + @end diff --git a/SmartDeviceLink/SDLNotificationDispatcher.m b/SmartDeviceLink/SDLNotificationDispatcher.m index 4fed62ee2..cae44a5fd 100644 --- a/SmartDeviceLink/SDLNotificationDispatcher.m +++ b/SmartDeviceLink/SDLNotificationDispatcher.m @@ -24,7 +24,7 @@ - (void)postNotificationName:(NSString *)name infoObject:(nullable id)infoObject if (infoObject != nil) { userInfo = @{SDLNotificationUserInfoObject: infoObject}; } - + dispatch_async(dispatch_get_main_queue(), ^{ [[NSNotificationCenter defaultCenter] postNotificationName:name object:self userInfo:userInfo]; }); diff --git a/SmartDeviceLink/SDLOnWaypointChange.h b/SmartDeviceLink/SDLOnWaypointChange.h index b0828905e..6511dea3d 100644 --- a/SmartDeviceLink/SDLOnWaypointChange.h +++ b/SmartDeviceLink/SDLOnWaypointChange.h @@ -17,6 +17,6 @@ @end __deprecated_msg("Use SDLOnWayPointChange instead") -@interface SDLOnWaypointChange : SDLOnWayPointChange + @interface SDLOnWaypointChange : SDLOnWayPointChange -@end + @end diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m index 2cabb0036..6a3ac3a6f 100644 --- a/SmartDeviceLink/SDLPerformInteraction.m +++ b/SmartDeviceLink/SDLPerformInteraction.m @@ -68,7 +68,7 @@ - (instancetype)initWithInitialChunks:(NSArray *)initialChunks in self.timeout = @(timeout); self.vrHelp = [vrHelp mutableCopy]; self.interactionLayout = layout; - + return self; } diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m index b26a12ee6..fb89d57f7 100644 --- a/SmartDeviceLink/SDLProxy.m +++ b/SmartDeviceLink/SDLProxy.m @@ -49,7 +49,7 @@ typedef void (^URLSessionTaskCompletionHandler)(NSData *data, NSURLResponse *response, NSError *error); typedef void (^URLSessionDownloadTaskCompletionHandler)(NSURL *location, NSURLResponse *response, NSError *error); -NSString *const SDLProxyVersion = @"4.4.1"; +NSString *const SDLProxyVersion = @"4.5.0-beta.1"; const float startSessionTime = 10.0; const float notifyProxyClosedDelay = 0.1; const int POLICIES_CORRELATION_ID = 65535; @@ -386,8 +386,7 @@ - (void)handleRegisterAppInterfaceResponse:(SDLRPCResponse *)response { _streamingMediaManager.displayCapabilties = registerResponse.displayCapabilities; } self.protocol.securityManager = [self securityManagerForMake:registerResponse.vehicleType.make]; - if (self.protocol.securityManager - && [self.protocol.securityManager respondsToSelector:@selector(setAppId:)]) { + if (self.protocol.securityManager && [self.protocol.securityManager respondsToSelector:@selector(setAppId:)]) { self.protocol.securityManager.appId = self.appId; } diff --git a/SmartDeviceLink/SDLSecurityType.h b/SmartDeviceLink/SDLSecurityType.h index 08585f004..c459665f8 100644 --- a/SmartDeviceLink/SDLSecurityType.h +++ b/SmartDeviceLink/SDLSecurityType.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN @protocol SDLSecurityType -@property (copy, nonatomic) NSString* appId; +@property (copy, nonatomic) NSString *appId; - (void)initializeWithAppId:(NSString *)appId completionHandler:(void (^)(NSError *_Nullable error))completionHandler; - (void)stop; diff --git a/SmartDeviceLink/SDLSubscribeWaypoints.h b/SmartDeviceLink/SDLSubscribeWaypoints.h index fd836371e..452536db2 100644 --- a/SmartDeviceLink/SDLSubscribeWaypoints.h +++ b/SmartDeviceLink/SDLSubscribeWaypoints.h @@ -15,6 +15,6 @@ @end __deprecated_msg("Use SDLSubscribeWayPoints instead") -@interface SDLSubscribeWaypoints : SDLSubscribeWayPoints + @interface SDLSubscribeWaypoints : SDLSubscribeWayPoints -@end + @end diff --git a/SmartDeviceLink/SDLSubscribeWaypointsResponse.h b/SmartDeviceLink/SDLSubscribeWaypointsResponse.h index 7a2e1f197..963ac182b 100644 --- a/SmartDeviceLink/SDLSubscribeWaypointsResponse.h +++ b/SmartDeviceLink/SDLSubscribeWaypointsResponse.h @@ -8,6 +8,6 @@ @end __deprecated_msg("Use SDLSubscribeWayPointsResponse instead") -@interface SDLSubscribeWaypointsResponse : SDLSubscribeWayPointsResponse + @interface SDLSubscribeWaypointsResponse : SDLSubscribeWayPointsResponse -@end + @end diff --git a/SmartDeviceLink/SDLUnsubscribeWaypoints.h b/SmartDeviceLink/SDLUnsubscribeWaypoints.h index 2b2be9f7b..bb6a54cb0 100644 --- a/SmartDeviceLink/SDLUnsubscribeWaypoints.h +++ b/SmartDeviceLink/SDLUnsubscribeWaypoints.h @@ -8,6 +8,6 @@ @end __deprecated_msg("Use SDLUnsubscribeWayPoints instead") -@interface SDLUnsubscribeWaypoints : SDLUnsubscribeWayPoints + @interface SDLUnsubscribeWaypoints : SDLUnsubscribeWayPoints -@end + @end diff --git a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h b/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h index 172669569..6df8854e5 100644 --- a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h @@ -8,6 +8,6 @@ @end __deprecated_msg("Use SDLUnsubscribeWayPointsResponse instead") -@interface SDLUnsubscribeWaypointsResponse : SDLUnsubscribeWayPointsResponse + @interface SDLUnsubscribeWaypointsResponse : SDLUnsubscribeWayPointsResponse -@end + @end diff --git a/SmartDeviceLink_Example/Info.plist b/SmartDeviceLink_Example/Info.plist index 351821d0a..763ce529e 100644 --- a/SmartDeviceLink_Example/Info.plist +++ b/SmartDeviceLink_Example/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.4.0 + 4.5.0-beta.1 CFBundleSignature ???? CFBundleVersion diff --git a/docs/Classes.html b/docs/Classes.html index 93b93e95f..160cf74d8 100644 --- a/docs/Classes.html +++ b/docs/Classes.html @@ -83,7 +83,9 @@

Section Contents

  • SDLGetDTCsResponse
  • SDLGetVehicleData
  • SDLGetVehicleDataResponse
  • +
  • SDLGetWayPoints
  • SDLGetWaypoints
  • +
  • SDLGetWayPointsResponse
  • SDLGetWaypointsResponse
  • SDLGlobalProperty
  • SDLHMICapabilities
  • @@ -140,6 +142,7 @@

    Section Contents

  • SDLOnTBTClientState
  • SDLOnTouchEvent
  • SDLOnVehicleData
  • +
  • SDLOnWayPointChange
  • SDLOnWaypointChange
  • SDLPRNDL
  • SDLParameterPermissions
  • @@ -213,7 +216,9 @@

    Section Contents

  • SDLSubscribeButtonResponse
  • SDLSubscribeVehicleData
  • SDLSubscribeVehicleDataResponse
  • +
  • SDLSubscribeWayPoints
  • SDLSubscribeWaypoints
  • +
  • SDLSubscribeWayPointsResponse
  • SDLSubscribeWaypointsResponse
  • SDLSyncMsgVersion
  • SDLSyncPData
  • @@ -242,7 +247,9 @@

    Section Contents

  • SDLUnsubscribeButtonResponse
  • SDLUnsubscribeVehicleData
  • SDLUnsubscribeVehicleDataResponse
  • +
  • SDLUnsubscribeWayPoints
  • SDLUnsubscribeWaypoints
  • +
  • SDLUnsubscribeWayPointsResponse
  • SDLUnsubscribeWaypointsResponse
  • SDLUpdateMode
  • SDLUpdateTurnList
  • @@ -2039,13 +2046,36 @@

    Swift

    +

    + SDLGetWayPoints +

    + +

    Undocumented

    + + See more + + + + +

    SDLGetWaypoints

    Undocumented

    - See more + + + + + +

    + SDLGetWayPointsResponse +

    + +

    Undocumented

    + + See more @@ -2057,7 +2087,6 @@

    Undocumented

    - See more @@ -3157,13 +3186,24 @@

    Swift

    +

    + SDLOnWayPointChange +

    + +

    Undocumented

    + + See more + + + + +

    SDLOnWaypointChange

    Undocumented

    - See more @@ -4664,8 +4704,8 @@

    Swift

    -

    - SDLSubscribeWaypoints +

    + SDLSubscribeWayPoints

    A SDLSubscribeWaypoints can be sent to subscribe @@ -4680,15 +4720,37 @@

    Objective-C

    -
    @interface SDLSubscribeWaypoints : SDLRPCRequest
    +
    @interface SDLSubscribeWayPoints : SDLRPCRequest

    Swift

    -
    class SDLSubscribeWaypoints : SDLRPCRequest
    +
    class SDLSubscribeWayPoints : SDLRPCRequest
    +

    + SDLSubscribeWaypoints +

    + +

    Undocumented

    + + + + + + +

    + SDLSubscribeWayPointsResponse +

    + +

    Undocumented

    + + + + + +

    SDLSubscribeWaypointsResponse

    @@ -5243,6 +5305,17 @@

    Swift

    +

    + SDLUnsubscribeWayPoints +

    + +

    Undocumented

    + + + + + +

    SDLUnsubscribeWaypoints

    @@ -5254,6 +5327,17 @@

    +

    + SDLUnsubscribeWayPointsResponse +

    + +

    Undocumented

    + + + + + +

    SDLUnsubscribeWaypointsResponse

    diff --git a/docs/Classes/SDLGetWaypoints.html b/docs/Classes/SDLGetWaypoints.html index 17ea3202a..eccd857b1 100644 --- a/docs/Classes/SDLGetWaypoints.html +++ b/docs/Classes/SDLGetWaypoints.html @@ -1,4 +1,4 @@ -

    SDLGetWaypoints Class Reference

    +

    SDLGetWayPoints Class Reference

    Section Contents

    diff --git a/docs/Classes/SDLGetWaypointsResponse.html b/docs/Classes/SDLGetWaypointsResponse.html index 24d98c36e..b485b1739 100644 --- a/docs/Classes/SDLGetWaypointsResponse.html +++ b/docs/Classes/SDLGetWaypointsResponse.html @@ -1,4 +1,4 @@ -

    SDLGetWaypointsResponse Class Reference

    +

    SDLGetWayPointsResponse Class Reference

    Section Contents

    diff --git a/docs/Classes/SDLOnWaypointChange.html b/docs/Classes/SDLOnWaypointChange.html index 31f7a4e0f..be37a886f 100644 --- a/docs/Classes/SDLOnWaypointChange.html +++ b/docs/Classes/SDLOnWaypointChange.html @@ -1,4 +1,4 @@ -

    SDLOnWaypointChange Class Reference

    +

    SDLOnWayPointChange Class Reference

    Section Contents

    diff --git a/docs/Classes/SDLPerformInteraction.html b/docs/Classes/SDLPerformInteraction.html index 3af74c633..b0927195e 100644 --- a/docs/Classes/SDLPerformInteraction.html +++ b/docs/Classes/SDLPerformInteraction.html @@ -12,6 +12,7 @@

    Section Contents

  • -initWithInitialPrompt:initialText:interactionChoiceSetIDList:helpPrompt:timeoutPrompt:interactionMode:timeout:
  • -initWithInitialPrompt:initialText:interactionChoiceSetIDList:helpPrompt:timeoutPrompt:interactionMode:timeout:vrHelp:
  • -initWithInitialChunks:initialText:interactionChoiceSetIDList:helpChunks:timeoutChunks:interactionMode:timeout:vrHelp:
  • +
  • -initWithInitialChunks:initialText:interactionChoiceSetIDList:helpChunks:timeoutChunks:interactionMode:timeout:vrHelp:interactionLayout:
  • initialText
  • initialPrompt
  • interactionMode
  • @@ -189,6 +190,21 @@

    Objective-C

    +

    + -initWithInitialChunks:initialText:interactionChoiceSetIDList:helpChunks:timeoutChunks:interactionMode:timeout:vrHelp:interactionLayout: +

    + +

    Undocumented

    + + + +

    Objective-C

    +
    @interface SDLPerformInteraction : SDLRPCRequest
    + + + + +

    initialText

    diff --git a/docs/Constants.html b/docs/Constants.html index d1563e76e..f006b9b76 100644 --- a/docs/Constants.html +++ b/docs/Constants.html @@ -26,6 +26,7 @@

    Section Contents

  • SDLDidReceiveGenericResponse
  • SDLDidReceiveGetDTCsResponse
  • SDLDidReceiveGetVehicleDataResponse
  • +
  • SDLDidReceiveGetWaypointsResponse
  • SDLDidReceiveListFilesResponse
  • SDLDidReceivePerformAudioPassThruResponse
  • SDLDidReceivePerformInteractionResponse
  • @@ -45,11 +46,13 @@

    Section Contents

  • SDLDidReceiveSpeakResponse
  • SDLDidReceiveSubscribeButtonResponse
  • SDLDidReceiveSubscribeVehicleDataResponse
  • +
  • SDLDidReceiveSubscribeWaypointsResponse
  • SDLDidReceiveSyncPDataResponse
  • SDLDidReceiveUpdateTurnListResponse
  • SDLDidReceiveUnregisterAppInterfaceResponse
  • SDLDidReceiveUnsubscribeButtonResponse
  • SDLDidReceiveUnsubscribeVehicleDataResponse
  • +
  • SDLDidReceiveUnsubscribeWaypointsResponse
  • SDLDidChangeDriverDistractionStateNotification
  • SDLDidChangeHMIStatusNotification
  • SDLDidReceiveAudioPassThruNotification
  • @@ -68,6 +71,7 @@

    Section Contents

  • SDLDidChangeTurnByTurnStateNotification
  • SDLDidReceiveTouchEventNotification
  • SDLDidReceiveVehicleDataNotification
  • +
  • SDLDidReceiveWaypointNotification
  • SDLProtocolSecurityErrorDomain
  • SDLErrorDomainStreamingMediaVideo
  • SDLErrorDomainStreamingMediaAudio
  • @@ -335,6 +339,17 @@

    +

    + SDLDidReceiveGetWaypointsResponse +

    + +

    Undocumented

    + + + + + +

    SDLDidReceiveListFilesResponse

    @@ -544,6 +559,17 @@

    +

    + SDLDidReceiveSubscribeWaypointsResponse +

    + +

    Undocumented

    + + + + + +

    SDLDidReceiveSyncPDataResponse

    @@ -599,6 +625,17 @@

    +

    + SDLDidReceiveUnsubscribeWaypointsResponse +

    + +

    Undocumented

    + + + + + +

    SDLDidChangeDriverDistractionStateNotification

    @@ -797,6 +834,17 @@

    +

    + SDLDidReceiveWaypointNotification +

    + +

    Undocumented

    + + + + + +

    SDLProtocolSecurityErrorDomain

    diff --git a/docs/Protocols/SDLProxyListener.html b/docs/Protocols/SDLProxyListener.html index efb3a93c8..75a3e820b 100644 --- a/docs/Protocols/SDLProxyListener.html +++ b/docs/Protocols/SDLProxyListener.html @@ -25,6 +25,7 @@

    Section Contents

  • -onGenericResponse:
  • -onGetDTCsResponse:
  • -onGetVehicleDataResponse:
  • +
  • -onGetWayPointsResponse:
  • -onListFilesResponse:
  • -onReceivedLockScreenIcon:
  • -onOnAppInterfaceUnregistered:
  • @@ -43,6 +44,7 @@

    Section Contents

  • -onOnTBTClientState:
  • -onOnTouchEvent:
  • -onOnVehicleData:
  • +
  • -onOnWayPointChange:
  • -onPerformAudioPassThruResponse:
  • -onPerformInteractionResponse:
  • -onPutFileResponse:
  • @@ -61,11 +63,13 @@

    Section Contents

  • -onSpeakResponse:
  • -onSubscribeButtonResponse:
  • -onSubscribeVehicleDataResponse:
  • +
  • -onSubscribeWayPointsResponse:
  • -onSyncPDataResponse:
  • -onUpdateTurnListResponse:
  • -onUnregisterAppInterfaceResponse:
  • -onUnsubscribeButtonResponse:
  • -onUnsubscribeVehicleDataResponse:
  • +
  • -onUnsubscribeWayPointsResponse:
  • Overview

    @@ -316,6 +320,17 @@

    +

    + -onGetWayPointsResponse: +

    + +

    Undocumented

    + + + + + +

    -onListFilesResponse:

    @@ -514,6 +529,17 @@

    +

    + -onOnWayPointChange: +

    + +

    Undocumented

    + + + + + +

    -onPerformAudioPassThruResponse:

    @@ -712,6 +738,17 @@

    +

    + -onSubscribeWayPointsResponse: +

    + +

    Undocumented

    + + + + + +

    -onSyncPDataResponse:

    @@ -767,4 +804,15 @@

    +

    + -onUnsubscribeWayPointsResponse: +

    + +

    Undocumented

    + + + + + + diff --git a/docs/Protocols/SDLSecurityType.html b/docs/Protocols/SDLSecurityType.html index a3ad3061f..b19263ba7 100644 --- a/docs/Protocols/SDLSecurityType.html +++ b/docs/Protocols/SDLSecurityType.html @@ -3,6 +3,7 @@

    SDLSecurityType Protocol Reference

    Section Contents