diff --git a/CHANGELOG.md b/CHANGELOG.md
index f141cf03d..3bcfbf9b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,18 +1,49 @@
-# 6.2.3
+# Changelog
+## 6.3.0
+### Versions
+* Supports [SDL RPC Spec 5.1.0](https://github.com/smartdevicelink/rpc_spec/releases/tag/5.1.0) and [SDL Protocol Spec 5.2.0](https://github.com/smartdevicelink/protocol_spec/releases/tag/5.2.0).
+
+### Enhancements
+* Support dynamic adding / deleting of menu items when they need to be replaced instead of a full delete / add (https://www.github.com/smartdevicelink/sdl_ios/issues/1144).
+* The library can now be used via the [Accio Package Manager](https://github.com/JamitLabs/Accio) (https://www.github.com/smartdevicelink/sdl_ios/issues/1229).
+* Update to Swift 5.0 (https://www.github.com/smartdevicelink/sdl_ios/issues/1245).
+* Add RPC subscription methods to `SDLManager` for ease of use (https://www.github.com/smartdevicelink/sdl_ios/issues/1257).
+* Support subscribing to SystemCapabilities with the SystemCapabilityManager (https://www.github.com/smartdevicelink/sdl_ios/issues/1271).
+* Support pushing raw PCM audio buffers into the `SDLAudioStreamManager` (https://www.github.com/smartdevicelink/sdl_ios/issues/1275).
+
+### Bug Fixes
+* Fix soft button manager entering an infinite loop if artwork fails to upload (https://www.github.com/smartdevicelink/sdl_ios/issues/1177).
+* Deprecate RPC superclass initializers as they are not for public use (https://www.github.com/smartdevicelink/sdl_ios/issues/1204).
+* Fixed the audio stream manager shutting down when the device app was in the background. It now stays active when the app is in the background (https://www.github.com/smartdevicelink/sdl_ios/issues/1224).
+* Fixed Alert RPC documentation (https://www.github.com/smartdevicelink/sdl_ios/issues/1233).
+* Fix soft button multiple transitions failing (https://www.github.com/smartdevicelink/sdl_ios/issues/1234).
+* Fixed numerous IAP transport issues with a near full rewrite of the related classes (https://www.github.com/smartdevicelink/sdl_ios/issues/1239, https://www.github.com/smartdevicelink/sdl_ios/issues/1263, https://www.github.com/smartdevicelink/sdl_ios/issues/1316, https://www.github.com/smartdevicelink/sdl_ios/issues/1321).
+* Fixed `SDLManager` delegate methods not getting called in certain circumstances (https://www.github.com/smartdevicelink/sdl_ios/issues/1243, https://www.github.com/smartdevicelink/sdl_ios/issues/1264).
+* Fixed `SDLManager.stop` crashes in certain circumstances (https://www.github.com/smartdevicelink/sdl_ios/issues/1268).
+* Fixed inaccessible `SDLAudioStreamManager` API (https://www.github.com/smartdevicelink/sdl_ios/issues/1283).
+* Fix setting `SDLChoiceSet``vrHelpItems` outside of the initializer not properly setting their position indexes (https://www.github.com/smartdevicelink/sdl_ios/issues/1291).
+
+### Example Apps
+* Fixed `resetConnection` causing a crash (https://www.github.com/smartdevicelink/sdl_ios/issues/1237).
+
+### Dependencies
+* Updated BiSON dependency to v1.2.0 to fix potential buffer overruns (https://www.github.com/smartdevicelink/sdl_ios/issues/1280, https://www.github.com/smartdevicelink/sdl_ios/issues/1285).
+
+## 6.2.3
### Versions
* Supports [SDL RPC Spec 5.1.0](https://github.com/smartdevicelink/rpc_spec/releases/tag/5.1.0) and [SDL Protocol Spec 5.2.0](https://github.com/smartdevicelink/protocol_spec/releases/tag/5.2.0).
### Bug Fixes
* Fix all lockscreen related crashes when SDL is setup before the main window exists (https://www.github.com/smartdevicelink/sdl_ios/issues/1258).
-# 6.2.2
+## 6.2.2
### Versions
* Supports [SDL RPC Spec 5.1.0](https://github.com/smartdevicelink/rpc_spec/releases/tag/5.1.0) and [SDL Protocol Spec 5.2.0](https://github.com/smartdevicelink/protocol_spec/releases/tag/5.2.0).
### Bug Fixes
* Add an explicit exception if SDL is setup before the app's window. The app's window **must** be setup before SDL is started (https://www.github.com/smartdevicelink/sdl_ios/issues/1255).
-# 6.2.1
+## 6.2.1
### Versions
* Supports [SDL RPC Spec 5.1.0](https://github.com/smartdevicelink/rpc_spec/releases/tag/5.1.0) and [SDL Protocol Spec 5.2.0](https://github.com/smartdevicelink/protocol_spec/releases/tag/5.2.0).
@@ -28,7 +59,7 @@
* The example apps will now auto-reconnect if disconnected physically from the head unit (https://www.github.com/smartdevicelink/sdl_ios/issues/1237).
* Update the example swift app to Swift 5 (https://www.github.com/smartdevicelink/sdl_ios/issues/1172, https://www.github.com/smartdevicelink/sdl_ios/issues/1243, https://www.github.com/smartdevicelink/sdl_ios/issues/1245).
-# 6.2.0
+## 6.2.0
### Versions
* Supports [SDL RPC Spec 5.1.0](https://github.com/smartdevicelink/rpc_spec/releases/tag/5.1.0) and [SDL Protocol Spec 5.2.0](https://github.com/smartdevicelink/protocol_spec/releases/tag/5.2.0).
@@ -61,27 +92,27 @@
* Fixed head units that don't support choice set `menuName` required parameter causing issues. Proper errors will now be thrown. (https://github.com/smartdevicelink/sdl_ios/issues/1220)
* Fixed app attempting a reconnect after being unregistered for a `PROTOCOL_VIOLATION`. (https://github.com/smartdevicelink/sdl_ios/issues/1223)
-# 6.1.2
+## 6.1.2
### Bug Fixes
* Fix external accessories never reconnecting if connected over both Bluetooth and USB when one transport is disconnected (https://github.com/smartdevicelink/sdl_ios/issues/1113).
-# 6.1.1
+## 6.1.1
### Bug Fixes
* Fix possible crash when checking text fields in the screen manager (https://github.com/smartdevicelink/sdl_ios/issues/1122).
* Fix possible crash when checking language field of `RegisterAppInterfaceResponse` in `SDLLifecycleManager` (https://github.com/smartdevicelink/sdl_ios/issues/1127).
-# 6.1.0 (Since RC 2)
+## 6.1.0 (Since RC 2)
### Versions
* Supports [SDL RPC Spec 5.0.0](https://github.com/smartdevicelink/rpc_spec/releases/tag/5.0.0) and [SDL Protocol Spec 5.1.0](https://github.com/smartdevicelink/protocol_spec/releases/tag/5.1.0).
### Changes
* None
-# 6.1.0 Release Candidate 2
+## 6.1.0 Release Candidate 2
### Bug Fixes
* If a RegisterAppInterface or SetDisplayLayout fail, don't set displayCapabilities to nil in the screen manager [#1108](https://github.com/smartdevicelink/sdl_ios/issues/1108).
-# 6.1.0 Release Candidate 1
+## 6.1.0 Release Candidate 1
### Enhancements
* `PlayPause` button name has been added for subscription [#246](https://github.com/smartdevicelink/sdl_ios/issues/246).
* Added the ability to play an audio file (such as a jingle) through `TTSChunk`, which may be used in an `Alert` or `Speak` RPC, for example [SDL-0014] [#524](https://github.com/smartdevicelink/sdl_ios/issues/524).
@@ -114,27 +145,27 @@
* Fix setting CarWindow `rootViewController` not on main thread [#1101](https://github.com/smartdevicelink/sdl_ios/issues/1101).
* Add audio transcode files to default log module map [#1103](https://github.com/smartdevicelink/sdl_ios/issues/1103).
-# 6.0.2
+## 6.0.2
### Bug Fixes
* Video streaming apps put into a phone background state can now properly stop the video streaming when it leaves a streamable HMI state. [#1047](https://github.com/smartdevicelink/sdl_ios/issues/1047)
-# 6.0.1
+## 6.0.1
### Bug Fixes
* Fixed a crash that could occur in development circumstances if the head unit returns "-1" for an enum
* Fixed manually sent Show RPCs causing issues when changing layouts.
-# 6.0.0 (Changes since RC1)
+## 6.0.0 (Changes since RC1)
* None
-# 6.0.0 Release Candidate 2 (Changes since RC1)
+## 6.0.0 Release Candidate 2 (Changes since RC1)
### Bug Fixes
* Fixes generated file names being too long for some SDL implementations. [#976](https://github.com/smartdevicelink/sdl_ios/issues/976)
* Unauthorized apps will no longer spin in a reconnection loop. [#977](https://github.com/smartdevicelink/sdl_ios/issues/977)
* Fixes needing to clean every time one switches building the example apps. [#982](https://github.com/smartdevicelink/sdl_ios/issues/982)
* Speeds up video streaming resets when app goes from background -> foreground on the phone. [#979](https://github.com/smartdevicelink/sdl_ios/issues/979)
-# 6.0.0 Release Candidate 1
+## 6.0.0 Release Candidate 1
### Breaking Changes
* Remove `SDLProxy`, `SDLProtocol`, `SDLTransport` and related classes and protocols. [SDL-0016] [#454](https://github.com/smartdevicelink/sdl_ios/issues/454) [SDL-0017] [#525](https://github.com/smartdevicelink/sdl_ios/issues/525) [SDL-0019] [#603](https://github.com/smartdevicelink/sdl_ios/issues/603)
@@ -160,7 +191,7 @@
* Fix SDLShow initializer crashes. [#966](https://github.com/smartdevicelink/sdl_ios/issues/966)
* Fix mediaTrack field on ScreenManager. [#968](https://github.com/smartdevicelink/sdl_ios/issues/968)
-# 5.2.0
+## 5.2.0
### Enhancements
* Add a screen manager which currently handles text, graphics, and soft buttons [SDL-0134] [#862](https://github.com/smartdevicelink/sdl_ios/issues/862)
* Add soft button object and states, which allow for declaratively designing soft buttons with multiple states
@@ -186,11 +217,11 @@
* Work around a module `ListFiles` bug on previous SDL Core versions [#827](https://github.com/smartdevicelink/sdl_ios/issues/827)
* CarWindow will no longer crash on iOS 9 [#904](https://github.com/smartdevicelink/sdl_ios/issues/904)
-# 5.1.1
+## 5.1.1
### Bug Fixes
* Fixed import statement, allows for Cocoapods release
-# 5.1.0
+## 5.1.0
### Enhancements
* Log unsuccessful RPC responses automatically [#811](https://github.com/smartdevicelink/sdl_ios/issues/811).
* IAP Transport reconnection optimizations [#816](https://github.com/smartdevicelink/sdl_ios/issues/816).
@@ -212,19 +243,19 @@
### Other
* Remove an unused testing library from the Cartfile [#823](https://github.com/smartdevicelink/sdl_ios/issues/823).
-# 5.0.0
+## 5.0.0
No changes since RC3
-# 5.0.0 Release Candidate 3 (changes since RC 2)
+## 5.0.0 Release Candidate 3 (changes since RC 2)
### Bug Fixes
* Fix a possible crash if the List Files request from the FileManager fails due to disconnection or unregistration.
-# 5.0.0 Release Candidate 2 (changes since RC 1)
+## 5.0.0 Release Candidate 2 (changes since RC 1)
### Bug Fixes
* Fixed podspec
* Focus manager will only activate on iOS 9+, it uses APIs only available on iOS 9+
-# 5.0.0 Release Notes
+## 5.0.0 Release Notes
### Breaking Changes
* `SDLProxy.streamingMediaManager` is now removed. If you wish to use a streaming media manager, you must use `SDLManager.streamingMediaManager`. The streaming media manager has been entirely redesigned and now takes into account both phone and head unit app lifecycles [SDL-0033](https://github.com/smartdevicelink/sdl_ios/issues/583). There is now a streaming media configuration added to `SDLConfiguration`.
* `SDLJingle` constants have been removed [#7](https://github.com/smartdevicelink/sdl_ios/issues/7).
@@ -271,20 +302,20 @@ No changes since RC3
* `SDLOnLockScreenStatus` does not use constants for property keys [#497](https://github.com/smartdevicelink/sdl_ios/issues/497).
* Removed deprecated methods [#679](https://github.com/smartdevicelink/sdl_ios/issues/679).
-# 4.7.4 Release Notes
+## 4.7.4 Release Notes
### Bug Fixes
* Fix for connecting video streaming on Core 4.4.0 (to be released) and above.
-# 4.7.3 Release Notes
+## 4.7.3 Release Notes
### Bug Fixes
* Performance fixes for streaming video.
* Fixes for background connection on IAP transports.
-# 4.7.2 Release Notes
+## 4.7.2 Release Notes
### Bug Fixes
* Fixes some head units not connecting properly due to the start service payload length not being set properly.
-# 4.7.1 Release Notes
+## 4.7.1 Release Notes
### Breaking Changes
* This bumps up the minimum supported version to 7.0 due to Xcode 9 changes. The upcoming v5.0.0 will raise the minimum version to 8.0.
@@ -295,12 +326,12 @@ No changes since RC3
* Any tests must now be run on Xcode 9.
* The travis config file has been updated to run on Xcode 9.
-# 4.7.0 Release Notes (since RC 1)
+## 4.7.0 Release Notes (since RC 1)
### Bug Fixes
* Fixed payloads being created with nil data causing a crash [#715](https://github.com/smartdevicelink/sdl_ios/issues/715).
* Fixed documentation warnings.
-# 4.7.0 Release Candidate 1
+## 4.7.0 Release Candidate 1
### Enhancements
* This library implements RPC Spec v4.5.0, Protocol Spec v5.0.0.
* Added App type enum: `PROJECTION`, for an app that uses video streaming for its interface yet is not a navigation app [SDL-0031](https://github.com/smartdevicelink/sdl_evolution/blob/master/proposals/0031-mobile-projection.md).
@@ -325,28 +356,28 @@ No changes since RC3
### Other
* Added a note to the documentation regarding file name length maximums [#640](https://github.com/smartdevicelink/sdl_ios/issues/640).
-# 4.6.1 Release Notes
+## 4.6.1 Release Notes
### Bug Fixes
* Fixes a bug where an app would crash if connected while the app is foregrounded and the vehicle is already in motion.
### Example App
* Now compiles correctly.
-# 4.6.0 Release Notes (since RC 2)
+## 4.6.0 Release Notes (since RC 2)
### Example App
* Added a command to send a `GetVehicleData`.
### Known Issues
* On DEBUG builds of an app, if a connected Sync Gen 3 head unit goes through a normal shut down sequence (key out, door open), the app will crash. This will not occur on RELEASE builds.
-# 4.6.0 Release Candidate 2 Release Notes (since RC 1)
+## 4.6.0 Release Candidate 2 Release Notes (since RC 1)
### Bug Fixes
* Altered the connection timeframe from 0-10 seconds to 1.5-9.5 seconds to improve connection reliability. (SDL-0067)
### Example App
* Fixes a bug causing a crash upon unexpected IAP disconnection and reconnection.
-# 4.6.0 Release Candidate 1 Release Notes
+## 4.6.0 Release Candidate 1 Release Notes
### Bug Fixes
* Fix setting lifecycle configuration `appType` to `nil`.
* If an array would return `NSNull`, return an empty array instead.
@@ -362,7 +393,7 @@ No changes since RC3
### Known Issues
* When an app is connected over USB, the USB is disconnected, then reconnected, the app will crash.
-# 4.5.5 Release Notes
+## 4.5.5 Release Notes
### Bug Fixes
* Added a check for if `SDLManager` is already started and prevent starting it again.
* Prevent infinite loops in IAP transport.
@@ -370,7 +401,7 @@ No changes since RC3
### Example App
* Fixed incorrectly setting button state on disconnect.
-# 4.5.4 Release Notes
+## 4.5.4 Release Notes
### Bug Fixes
* Streaming video will not crash if data is unexpectedly NULL.
* SDL now compiles on Xcode 8.3.
@@ -378,12 +409,12 @@ No changes since RC3
* Internal state machines now throw more descriptive exceptions.
-# 4.5.3 Release Notes
+## 4.5.3 Release Notes
### Bug Fixes
* `SDLManager`'s `delegate` method `hmiLevel:didChangeToLevel:` now only triggers when the HMI level changes, instead of whenever an `onHMIStatus` is received.
* Fixed a few crashes in `SDLStreamingMediaManager` for navigation video streaming.
-# 4.5.2 Release Notes
+## 4.5.2 Release Notes
### Bug Fixes
* Fixed unhandled Register App Interface Response warnings causing the manager to disconnect.
* Fixed `SDLManager stop` not actually stopping SDL.
@@ -393,16 +424,16 @@ No changes since RC3
### Example Project
* Connect / Disconnect button appearance fixed.
-# 4.5.1 Release Notes
+## 4.5.1 Release Notes
### Bug Fixes
* Fixed large file transfers not properly setting their offset.
* Check for nil before attempting to send an RPC request.
-# 4.5.0 Release Notes (Since Beta 2)
+## 4.5.0 Release Notes (Since Beta 2)
### Bug Fixes
* Fixed an issue attempting to upload an app icon when the head unit does not support images.
-# 4.5.0 Beta 2 Release Notes
+## 4.5.0 Beta 2 Release Notes
### Bug Fixes
* Fixed an issue with printing incorrect Frame Data when logging.
* Fixed an issue with SDLLocationDetails' properties being incorrectly stored.
@@ -410,14 +441,14 @@ No changes since RC3
* Fixed an issue with a SDLPerformInteraction initializer causing an infinite loop.
* Fixed an issue with uploading a nil SDLFile would cause an infinite loop.
-# 4.5.0 Beta 1 Release Notes
+## 4.5.0 Beta 1 Release Notes
### Bug Fixes
* Altered how Security libraries get the app id so they can start downloads faster.
* Fixed a number of RPC initializers to have correct number sizes.
* Fixed a video session crash in rare instances when the compression session was NULL.
* Fixed waypoint RPCs missing response and notification dispatchers and incorrect spelling on some classes (the old classes are deprecated).
-# 4.4.1 Release Notes
+## 4.4.1 Release Notes
### Bug Fixes
* Subscribing to waypoints should now work (new feature & RPC in v4.4.0).
@@ -425,7 +456,7 @@ No changes since RC3
* Fixes a few failing tests that were overlooked.
* `SDLUploadFileOperation`s now use the built-in cancel mechanism instead of its own internal flag.
-# 4.4.0 Release Notes
+## 4.4.0 Release Notes
### Features
* [SDL-0003] Adds SendLocation and associated data types.
* [SDL-0004] Adds Waypointing as a feature for Last Mile Navigation.
@@ -437,7 +468,7 @@ No changes since RC3
### Tests
* Fixes an issue where tests would fail to compile.
-# 4.3.0 Release Notes (Since RC 6 + Highlights)
+## 4.3.0 Release Notes (Since RC 6 + Highlights)
### Highlights
* Adds a lifecycle manager to replace `SDLProxy` and manages much more of the lifecycle based on a declarative `SDLConfiguration`.
* Adds a file manager to streamline uploading and deleting files.
@@ -463,15 +494,15 @@ No changes since RC3
### Example App
* The example app now shows some example Permission Manager usage and logs to console a few permission manager observer blocks.
-# 4.3.0 Release Candidate 6 Release Notes (Since RC 5)
+## 4.3.0 Release Candidate 6 Release Notes (Since RC 5)
### Bug Fixes
* Fixed several bugs and improved error messaging around what should happen if File Manager fails to start, for example because the head unit does not support files.
-# 4.3.0 Release Candidate 5 Release Notes (Since RC 4)
+## 4.3.0 Release Candidate 5 Release Notes (Since RC 4)
### Bug Fixes
* Fixed an issue where "SmartDeviceLink.h" would not be available through cocoapods.
-# 4.3.0 Release Candidate 4 Release Notes (Since RC 3)
+## 4.3.0 Release Candidate 4 Release Notes (Since RC 3)
### Bug Fixes
* Notification constants should now be compatible both with Swift 3 and with iOS 6/7.
* Fixed a few issues with the lock screen and iOS 6/7 support.
@@ -482,14 +513,14 @@ No changes since RC3
* Removed xctest testing framework, now just uses xcodebuild.
* Explicitly specify which headers are public in Cocoapods spec.
-# 4.3.0 Release Candidate 3 Release Notes (Since RC 2)
+## 4.3.0 Release Candidate 3 Release Notes (Since RC 2)
### Bug Fixes
* Fixed a bug where large putfiles would crash.
### Other
* Updated to base v4.2.4
-# 4.3.0 Release Candidate 2 Release Notes (Since RC 1)
+## 4.3.0 Release Candidate 2 Release Notes (Since RC 1)
### Bug Fixes
* Updated project to Xcode 8 settings and turn on additional warnings and analyzer settings.
* Fixed `SDLConsoleController` not using `NSLocalizedString` macro.
@@ -499,7 +530,7 @@ No changes since RC3
### Example App
* Add iTunes file sharing to the example app to allow for easier file log retrieval.
-# 4.3.0 Release Candidate 1 Release Notes (Since Beta 4)
+## 4.3.0 Release Candidate 1 Release Notes (Since Beta 4)
### Enhancements
* Removed all usages of NSLog. Now all logs can be turned on or off.
* SDL logs are now off by default in the default lifecycle configuration, console logs are on by default in the debug lifecycle configuration.
@@ -516,14 +547,14 @@ No changes since RC3
* Fixed UI buttons not updating upon connecting.
* Added a soft button.
-# 4.3.0 Beta 4 Release Notes (Since Beta 3)
+## 4.3.0 Beta 4 Release Notes (Since Beta 3)
### Enhancements
* Fix resource bundle not being included via cocoapods, causing a failure on the default lock screen. Also added better failure messages. The resource bundle will still have to be manually added to your app's copy resources build phase.
* Reduced resource bundle size by optimizing lock screen images.
* RPC handlers are no longer readonly and can now be set outside of the init.
* Improved the example app with additional code and features to see how the new dev api works. Stay tuned for a few additional features.
-# 4.3.0 Beta 3 Release Notes (Since Beta 2)
+## 4.3.0 Beta 3 Release Notes (Since Beta 2)
### Breaking Changes
* `resumeHash` is now a configuration property and is not automatically handled.
* `SDLFile` and `SDLArtwork` initializers no longer contain "ephemeral", these are renamed to simply start with "file" since they are the default case.
@@ -561,7 +592,7 @@ No changes since RC3
* Fixed some instance variables not having generics.
* Updated code to match v4.2.3.
-# 4.3.0 Beta 2 Release Notes (Since Beta 1)
+## 4.3.0 Beta 2 Release Notes (Since Beta 1)
### Enhancements
* Starting up `SDLManager` now requires a block which will pass back an error if it failed.
* `SDLManager` now provides a method to call in `AppDelegate applicationWillTerminate:` that will prevent killed apps from being unable to re-register.
@@ -572,7 +603,7 @@ No changes since RC3
### Other
* Currently removed automatic resumption. Resumption will return in a future build as a manual configuration pass in.
-# 4.3.0 Beta 1 Release Notes (Since Alpha 1)
+## 4.3.0 Beta 1 Release Notes (Since Alpha 1)
### Breaking Changes
* State machine transition names are no longer public to allow for behind the scenes changes without minor or major version changes.
@@ -585,7 +616,7 @@ No changes since RC3
* SDLLockScreenManager should use less RAM.
* Fixed test failures.
-# 4.3.0 Alpha 1 Release Notes
+## 4.3.0 Alpha 1 Release Notes
### Deprecations
* Deprecate SDLProxy in favor of SDLManager. A future major release will remove and alter many public APIs, but they will not be deprecated in this release because they will not be replaced in this release.
@@ -600,7 +631,7 @@ No changes since RC3
* Particular RPCs can now have an additional block used with them that can be called under certain conditions. For example, RPCs that create buttons (such as soft buttons) can have a block handler that will be called when an event occurs on the button.
* Underlying the new high-level API are a few dispatchers, particularly the Notification Dispatcher which sends many notifications when new RPC notifications and responses are sent from the remote head unit. This may be used by the developer now, but will become less useful as more managers are released.
-# 4.2.4 Release Notes
+## 4.2.4 Release Notes
### Bug Fixes
* Fixed Touch Manager not always firing single touches.
@@ -608,19 +639,19 @@ No changes since RC3
* Updated testing frameworks to support Xcode 8.
* Updated example app to support Xcode 8.
-# 4.2.3 Release Notes
+## 4.2.3 Release Notes
### Bug Fixes
* Fixed HTTPS URL schemes not properly uploading data (#432, #438).
-# 4.2.2 Release Notes
+## 4.2.2 Release Notes
### Bug Fixes
* Fixed HTTP URL schemes not being properly altered to HTTPS to account for App Transport Security (#432, #436).
-# 4.2.1 Release Notes
+## 4.2.1 Release Notes
### Bug Fixes
* Fixed SDLStreamingMediaManager encryption status not being set properly (#433, #434).
-# 4.2.0 Release Notes (since Beta 1)
+## 4.2.0 Release Notes (since Beta 1)
### Enhancements
* The Streaming Media Manager will now provide a CVPixelBufferPool with default settings so that you don't have to create one yourself.
* Modified Streaming Media Manager `videoSessionAuthenticated` to be `videoSessionEncrypted` and modify the value based on the Start Session ACK encryption flag.
@@ -631,7 +662,7 @@ No changes since RC3
### Other
* Documentation updates.
-# 4.2.0 Beta 1 Release Notes
+## 4.2.0 Beta 1 Release Notes
### Enhancements
* Add an AppInfo struct to RegisterAppInterface automatically with some application details, so that the head unit may automatically launch some apps via IAP if supported (#398, #431).
* Add a touch manager to the streaming media manager. The touch manager will watch for touch events and generate gesture recognizer-like callbacks (#402, #423).
@@ -642,18 +673,18 @@ No changes since RC3
* Store sessionIds and service metadata together in the protocol code (#350).
* Fixed a streaming media manager enum casing issue by deprecating the incorrect cased enum and adding a correctly cased one (#383, #411).
-# 4.1.5 Release Notes
+## 4.1.5 Release Notes
### Bug Fixes
* Since Apple is disallowing virtually all HTTP requests in Jan. 2017, SDLURLSession will now take all HTTP requests and attempt them over HTTPS. Some cars off the line still have HTTP URLs hardcoded into them, therefore this is a necessary precaution.
-# 4.1.4 Release Notes
+## 4.1.4 Release Notes
### Bug Fixes
* Fixed exception causing app to crash when SDL Core disconnects in TCP debug mode. Warning: The app may enter an undefined connection state as there is currently no retry strategy in TCP debug mode.
### Other
* Update test frameworks
-# 4.1.3 Release Notes
+## 4.1.3 Release Notes
### Enhancements
* Fix unit tests attempting to be built against Xcode 7.1 instead of Xcode 7.3. (#413)
* Auto-upload Carthage archives on tag Travis builds. (#413)
@@ -666,14 +697,14 @@ No changes since RC3
### Other
* Shift project and code files into the root directory, removing the SmartDeviceLink-iOS directory. (#404)
-# 4.1.2 Release Notes
+## 4.1.2 Release Notes
### Bugfixes
* Enable additional static analyzer rules for Xcode 7.3, fix an associated nullability issue.
### Other
* New .gitignore rule to help carthage submodule users.
-# 4.1.1 Release Notes
+## 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.
@@ -682,7 +713,7 @@ No changes since RC3
* Some repository files are now linked into the Xcode project.
* Updated testing dependencies for Xcode 7.3 compatibility.
-# 4.1.0 Release Notes
+## 4.1.0 Release Notes
### Enhancements
* The `LAUNCH_APP` system request was implemented.
* The proxy now tracks application state and relays that information to the Head Unit on v4 and above.
@@ -701,7 +732,7 @@ No changes since RC3
### Deprecations
* Methods relating to sending heartbeat have been deprecated. This should not affect your app in any way. These lower-level classes will be removed in future versions.
-# 4.0.3 Release Notes
+## 4.0.3 Release Notes
### Enhancements
* Implement HTTP System Requests for policy updates
@@ -714,7 +745,7 @@ No changes since RC3
* Moved templates and CONTRIBUTING to .github
* Enable code coverage by default when testing
-# 4.0.2 Release Notes
+## 4.0.2 Release Notes
### Bug Fixes
* Debug logging is a bit better designed and is faster, and file logging happens on a separate queue.
@@ -731,12 +762,12 @@ No changes since RC3
* Travis CI builds are fixed
* Pull-Request and Issue templates have been added
-# 4.0.1 Release notes
+## 4.0.1 Release notes
### Bug Fixes
* Fixed some implicit `self` captures with blocks.
-# 4.0.0 Release Notes (pre-release)
+## 4.0.0 Release Notes (pre-release)
## Final Release (2015-10-5)
* Example app plist updated with required [ATS](https://developer.apple.com/library/prerelease/ios/technotes/App-Transport-Security-Technote/) keys.
diff --git a/Example Apps/Example ObjC/ButtonManager.m b/Example Apps/Example ObjC/ButtonManager.m
index 786d5027b..4befdf726 100644
--- a/Example Apps/Example ObjC/ButtonManager.m
+++ b/Example Apps/Example ObjC/ButtonManager.m
@@ -135,6 +135,9 @@ - (SDLSoftButtonObject *)sdlex_softButtonImagesVisibleWithManager:(SDLManager *)
SDLSoftButtonObject *object = [weakself.sdlManager.screenManager softButtonObjectNamed:ImagesVisibleSoftButton];
[object transitionToNextState];
+ SDLSoftButtonObject *textButton = [weakself.sdlManager.screenManager softButtonObjectNamed:TextVisibleSoftButton];
+ [textButton transitionToNextState];
+
SDLLogD(@"Image visibility soft button press fired %d", weakself.imagesEnabled);
}];
diff --git a/Example Apps/Example ObjC/ProxyManager.m b/Example Apps/Example ObjC/ProxyManager.m
index 525f31766..453e843eb 100644
--- a/Example Apps/Example ObjC/ProxyManager.m
+++ b/Example Apps/Example ObjC/ProxyManager.m
@@ -54,7 +54,7 @@ - (instancetype)init {
return self;
}
-- (void)startManager {
+- (void)sdlex_startManager {
__weak typeof (self) weakSelf = self;
[self.sdlManager startWithReadyHandler:^(BOOL success, NSError * _Nullable error) {
if (!success) {
@@ -76,7 +76,10 @@ - (void)startManager {
}
- (void)stopConnection {
- [self.sdlManager stop];
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self.sdlManager stop];
+ });
+
[self sdlex_updateProxyState:ProxyStateStopped];
}
@@ -106,10 +109,14 @@ + (SDLLifecycleConfiguration *)sdlex_tcpLifecycleConfiguration {
}
- (void)sdlex_setupConfigurationWithLifecycleConfiguration:(SDLLifecycleConfiguration *)lifecycleConfiguration {
+ if (self.sdlManager != nil) {
+ // Manager already created, just start it again.
+ [self sdlex_startManager];
+ return;
+ }
SDLConfiguration *config = [SDLConfiguration configurationWithLifecycle:lifecycleConfiguration lockScreen:[SDLLockScreenConfiguration enabledConfigurationWithAppIcon:[UIImage imageNamed:ExampleAppLogoName] backgroundColor:nil] logging:[self.class sdlex_logConfiguration] fileManager:[SDLFileManagerConfiguration defaultConfiguration]];
self.sdlManager = [[SDLManager alloc] initWithConfiguration:config delegate:self];
-
- [self startManager];
+ [self sdlex_startManager];
}
+ (SDLLifecycleConfiguration *)sdlex_setLifecycleConfigurationPropertiesOnConfiguration:(SDLLifecycleConfiguration *)config {
diff --git a/Example Apps/Example ObjC/SmartDeviceLink-Example-ObjC-Info.plist b/Example Apps/Example ObjC/SmartDeviceLink-Example-ObjC-Info.plist
index d5b5c33a3..db70c2cae 100644
--- a/Example Apps/Example ObjC/SmartDeviceLink-Example-ObjC-Info.plist
+++ b/Example Apps/Example ObjC/SmartDeviceLink-Example-ObjC-Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 6.2.3
+ 6.3.0
CFBundleSignature
????
CFBundleVersion
diff --git a/Example Apps/Example ObjC/VehicleDataManager.m b/Example Apps/Example ObjC/VehicleDataManager.m
index 999a22616..cc2ee46fa 100644
--- a/Example Apps/Example ObjC/VehicleDataManager.m
+++ b/Example Apps/Example ObjC/VehicleDataManager.m
@@ -37,7 +37,7 @@ - (instancetype)initWithManager:(SDLManager *)manager refreshUIHandler:(RefreshU
_refreshUIHandler = refreshUIHandler;
_vehicleOdometerData = @"";
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(vehicleDataNotification:) name:SDLDidReceiveVehicleDataNotification object:nil];
+ [_sdlManager subscribeToRPC:SDLDidReceiveVehicleDataNotification withObserver:self selector:@selector(vehicleDataNotification:)];
[self sdlex_resetOdometer];
return self;
@@ -112,7 +112,7 @@ - (void)vehicleDataNotification:(SDLRPCNotificationNotification *)notification {
}
SDLOnVehicleData *onVehicleData = (SDLOnVehicleData *)notification.notification;
- self.vehicleOdometerData = [NSString stringWithFormat:@"%@: %@ kph", VehicleDataOdometerName, onVehicleData.odometer];
+ self.vehicleOdometerData = [NSString stringWithFormat:@"%@: %@ km", VehicleDataOdometerName, onVehicleData.odometer];
if (!self.refreshUIHandler) { return; }
self.refreshUIHandler();
diff --git a/Example Apps/Example Swift/ProxyManager.swift b/Example Apps/Example Swift/ProxyManager.swift
index fbedae0d5..40a703e4a 100644
--- a/Example Apps/Example Swift/ProxyManager.swift
+++ b/Example Apps/Example Swift/ProxyManager.swift
@@ -43,6 +43,12 @@ extension ProxyManager {
///
/// - Parameter connectionType: The type of transport layer to use.
func start(with proxyTransportType: ProxyTransportType) {
+ guard sdlManager == nil else {
+ // Manager already created, just start it again.
+ startManager()
+ return
+ }
+
delegate?.didChangeProxyState(ProxyState.searching)
sdlManager = SDLManager(configuration: proxyTransportType == .iap ? ProxyManager.connectIAP() : ProxyManager.connectTCP(), delegate: self)
startManager()
@@ -55,7 +61,10 @@ extension ProxyManager {
return
}
- sdlManager.stop()
+ DispatchQueue.main.async { [weak self] in
+ self?.sdlManager.stop()
+ }
+
delegate?.didChangeProxyState(.stopped)
}
}
diff --git a/Example Apps/Example Swift/SmartDeviceLink-Example-Swift-Info.plist b/Example Apps/Example Swift/SmartDeviceLink-Example-Swift-Info.plist
index 31e903f97..d3ab6c871 100644
--- a/Example Apps/Example Swift/SmartDeviceLink-Example-Swift-Info.plist
+++ b/Example Apps/Example Swift/SmartDeviceLink-Example-Swift-Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 6.2.3
+ 6.3.0
CFBundleSignature
????
CFBundleVersion
diff --git a/Example Apps/Example Swift/VehicleDataManager.swift b/Example Apps/Example Swift/VehicleDataManager.swift
index c5e2b187e..1d78edd42 100644
--- a/Example Apps/Example Swift/VehicleDataManager.swift
+++ b/Example Apps/Example Swift/VehicleDataManager.swift
@@ -23,7 +23,7 @@ class VehicleDataManager: NSObject {
super.init()
resetOdometer()
- NotificationCenter.default.addObserver(self, selector: #selector(vehicleDataNotification(_:)), name: .SDLDidReceiveVehicleData, object: nil)
+ self.sdlManager.subscribe(to: .SDLDidReceiveVehicleData, observer: self, selector: #selector(vehicleDataNotification(_:)))
}
}
diff --git a/Package.swift b/Package.swift
new file mode 100644
index 000000000..5d8f0c602
--- /dev/null
+++ b/Package.swift
@@ -0,0 +1,23 @@
+// swift-tools-version:5.0
+import PackageDescription
+
+let package = Package(
+ name: "SmartDeviceLink",
+ products: [
+ .library(name: "SmartDeviceLink", targets: ["SmartDeviceLink"]),
+ .library(name: "SmartDeviceLinkSwift", targets: ["SmartDeviceLinkSwift"])
+ ],
+ targets: [
+ .target(
+ name: "SmartDeviceLink",
+ path: "SmartDeviceLink"
+ ),
+ .target(
+ name: "SmartDeviceLinkSwift",
+ dependencies: [
+ "SmartDeviceLink"
+ ],
+ path: "SmartDeviceLinkSwift"
+ ),
+ ]
+)
diff --git a/README.md b/README.md
index 1a6c9ea38..3193abbc3 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@
[![CocoaPods Downloads](https://img.shields.io/cocoapods/dt/SmartDeviceLink-iOS.svg?maxAge=172800)](https://cocoapods.org/pods/SmartDeviceLink-iOS)
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
[![Slack Status](http://sdlslack.herokuapp.com/badge.svg)](http://slack.smartdevicelink.com)
+[![Accio supported](https://img.shields.io/badge/Accio-supported-0A7CF5.svg?style=flat)](https://github.com/JamitLabs/Accio)
# SmartDeviceLink (SDL)
@@ -35,6 +36,18 @@ See the [changelog](https://github.com/smartdevicelink/sdl_ios/blob/master/CHANG
### Installing
+#### Accio
+
+You can install this library using [Accio/SwiftPM](https://github.com/JamitLabs/Accio) documentation page. Please follow the steps to install and initialization Accio into a current or new application.
+
+In your Package.swift file , you want to add `.package(url: "https://github.com/smartdevicelink/sdl_ios.git", .from: "6.2.3"),` to the dependencies array. Then add `SmartDeviceLink` to the targets dependencies array.
+
+Please see [Mainifest format](https://github.com/apple/swift-package-manager/blob/master/Documentation/PackageDescriptionV4.md) to specify dependencies to a specific branch / version of SDL.
+
+###### Swift
+
+If you are building a Swift app, then add this instead `SmartDeviceLinkSwift` to the targets dependencies array.
+
##### Cocoapods
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).
diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec
index 96c419654..0b91c7649 100644
--- a/SmartDeviceLink-iOS.podspec
+++ b/SmartDeviceLink-iOS.podspec
@@ -1,13 +1,13 @@
Pod::Spec.new do |s|
s.name = "SmartDeviceLink-iOS"
-s.version = "6.2.3"
+s.version = "6.3.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" => "developer@smartdevicelink.com" }
s.platform = :ios, "8.0"
-s.dependency 'BiSON', '~> 1.1.1'
+s.dependency 'BiSON', '~> 1.2.0'
s.source = { :git => "https://github.com/smartdevicelink/sdl_ios.git", :tag => s.version.to_s }
s.requires_arc = true
s.resource_bundles = { 'SmartDeviceLink' => ['SmartDeviceLink/Assets/**/*'] }
@@ -42,6 +42,7 @@ ss.public_header_files = [
'SmartDeviceLink/SDLArtwork.h',
'SmartDeviceLink/SDLAudioControlData.h',
'SmartDeviceLink/SDLAudioControlCapabilities.h',
+'SmartDeviceLink/SDLAudioFile.h',
'SmartDeviceLink/SDLAudioPassThruCapabilities.h',
'SmartDeviceLink/SDLAudioStreamingState.h',
'SmartDeviceLink/SDLAudioStreamingIndicator.h',
@@ -204,6 +205,7 @@ ss.public_header_files = [
'SmartDeviceLink/SDLMediaServiceManifest.h',
'SmartDeviceLink/SDLMediaType.h',
'SmartDeviceLink/SDLMenuCell.h',
+'SmartDeviceLink/SDLMenuManagerConstants.h',
'SmartDeviceLink/SDLMenuParams.h',
'SmartDeviceLink/SDLMetadataTags.h',
'SmartDeviceLink/SDLMetadataType.h',
diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
index 183bfcf37..6c7379d26 100644
--- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
+++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
@@ -1004,6 +1004,9 @@
5D6F7A351BC5B9B60070BF37 /* SDLLockScreenViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D6F7A331BC5B9B60070BF37 /* SDLLockScreenViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
5D6F7A361BC5B9B60070BF37 /* SDLLockScreenViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D6F7A341BC5B9B60070BF37 /* SDLLockScreenViewController.m */; };
5D6F7A3E1BC811FC0070BF37 /* SDLAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5D6F7A3D1BC811FC0070BF37 /* SDLAssets.xcassets */; };
+ 5D75960D22972F830013207C /* TestSystemCapabilityObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D75960C22972F830013207C /* TestSystemCapabilityObserver.m */; };
+ 5D75961122972FCA0013207C /* SDLSystemCapabilityObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D75960F22972FCA0013207C /* SDLSystemCapabilityObserver.h */; };
+ 5D75961222972FCA0013207C /* SDLSystemCapabilityObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D75961022972FCA0013207C /* SDLSystemCapabilityObserver.m */; };
5D76E31C1D3805FF00647CFA /* SDLLockScreenManagerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D76E31B1D3805FF00647CFA /* SDLLockScreenManagerSpec.m */; };
5D76E3211D39742300647CFA /* SDLViewControllerPresentable.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D76E3201D39742300647CFA /* SDLViewControllerPresentable.h */; };
5D76E3241D39767000647CFA /* SDLLockScreenPresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D76E3221D39767000647CFA /* SDLLockScreenPresenter.h */; };
@@ -1073,7 +1076,7 @@
5D9FC29E1FD8813900ACA5C2 /* SDLAudioStreamManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D9FC29C1FD8813900ACA5C2 /* SDLAudioStreamManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
5D9FC29F1FD8813900ACA5C2 /* SDLAudioStreamManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D9FC29D1FD8813900ACA5C2 /* SDLAudioStreamManager.m */; };
5D9FC2A21FD8814A00ACA5C2 /* SDLAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D9FC2A01FD8814A00ACA5C2 /* SDLAudioFile.m */; };
- 5D9FC2A31FD8814A00ACA5C2 /* SDLAudioFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D9FC2A11FD8814A00ACA5C2 /* SDLAudioFile.h */; };
+ 5D9FC2A31FD8814A00ACA5C2 /* SDLAudioFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D9FC2A11FD8814A00ACA5C2 /* SDLAudioFile.h */; settings = {ATTRIBUTES = (Public, ); }; };
5D9FC2A61FD8815800ACA5C2 /* SDLPCMAudioConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D9FC2A41FD8815800ACA5C2 /* SDLPCMAudioConverter.h */; };
5D9FC2A71FD8815800ACA5C2 /* SDLPCMAudioConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D9FC2A51FD8815800ACA5C2 /* SDLPCMAudioConverter.m */; };
5D9FDA8F1F2A7D3400A495C8 /* bson_array.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D9FDA891F2A7D3400A495C8 /* bson_array.c */; };
@@ -1088,6 +1091,12 @@
5DA026901AD44EE700019F86 /* SDLDialNumberResponseSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DA0268F1AD44EE700019F86 /* SDLDialNumberResponseSpec.m */; };
5DA102A41D4122C700C15826 /* NSMutableDictionary+SafeRemove.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DA102A21D4122C700C15826 /* NSMutableDictionary+SafeRemove.h */; };
5DA102A51D4122C700C15826 /* NSMutableDictionary+SafeRemove.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DA102A31D4122C700C15826 /* NSMutableDictionary+SafeRemove.m */; };
+ 5DA150C72271FDC20032928D /* SDLSoftButtonTransitionOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DA150C52271FDC20032928D /* SDLSoftButtonTransitionOperation.h */; };
+ 5DA150C82271FDC20032928D /* SDLSoftButtonTransitionOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DA150C62271FDC20032928D /* SDLSoftButtonTransitionOperation.m */; };
+ 5DA150CD2271FE180032928D /* SDLSoftButtonReplaceOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DA150CB2271FE180032928D /* SDLSoftButtonReplaceOperation.h */; };
+ 5DA150CE2271FE180032928D /* SDLSoftButtonReplaceOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DA150CC2271FE180032928D /* SDLSoftButtonReplaceOperation.m */; };
+ 5DA150D1227367580032928D /* SDLSoftButtonTransitionOperationSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DA150D0227367580032928D /* SDLSoftButtonTransitionOperationSpec.m */; };
+ 5DA150D32273676A0032928D /* SDLSoftButtonReplaceOperationSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DA150D22273676A0032928D /* SDLSoftButtonReplaceOperationSpec.m */; };
5DA22CB71D075CF200245F5F /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DA22CB31D075CF200245F5F /* Nimble.framework */; };
5DA22CB81D075CF200245F5F /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DA22CB41D075CF200245F5F /* OCMock.framework */; };
5DA22CBA1D075CF200245F5F /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DA22CB61D075CF200245F5F /* Quick.framework */; };
@@ -1220,8 +1229,17 @@
5DF40B26208FA7DE00DD6FDA /* SDLMenuManagerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DF40B25208FA7DE00DD6FDA /* SDLMenuManagerSpec.m */; };
5DF40B28208FDA9700DD6FDA /* SDLVoiceCommandManagerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DF40B27208FDA9700DD6FDA /* SDLVoiceCommandManagerSpec.m */; };
5DFFB9151BD7C89700DB3F04 /* SDLConnectionManagerType.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DFFB9141BD7C89700DB3F04 /* SDLConnectionManagerType.h */; };
+ 752ECDB6228B4D6B00D945F4 /* SDLDynamicMenuUpdateAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = 752ECDB4228B4D6B00D945F4 /* SDLDynamicMenuUpdateAlgorithm.h */; };
+ 752ECDB7228B4D6B00D945F4 /* SDLDynamicMenuUpdateAlgorithm.m in Sources */ = {isa = PBXBuildFile; fileRef = 752ECDB5228B4D6B00D945F4 /* SDLDynamicMenuUpdateAlgorithm.m */; };
+ 752ECDB9228C42E100D945F4 /* SDLMenuRunScoreSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 752ECDB8228C42E100D945F4 /* SDLMenuRunScoreSpec.m */; };
+ 752ECDBB228C532600D945F4 /* SDLMenuUpdateAlgorithmSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 752ECDBA228C532600D945F4 /* SDLMenuUpdateAlgorithmSpec.m */; };
+ 755F176222A00B7C0041B9CB /* SDLMenuManagerConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 755F176122A00B7C0041B9CB /* SDLMenuManagerConstants.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 756C62762289F11F008B57A2 /* SDLDynamicMenuUpdateRunScore.h in Headers */ = {isa = PBXBuildFile; fileRef = 756C62742289F11F008B57A2 /* SDLDynamicMenuUpdateRunScore.h */; };
+ 756C62772289F11F008B57A2 /* SDLDynamicMenuUpdateRunScore.m in Sources */ = {isa = PBXBuildFile; fileRef = 756C62752289F11F008B57A2 /* SDLDynamicMenuUpdateRunScore.m */; };
880245A420F79C3400ED195B /* SDLFileManagerConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 880245A220F79C3400ED195B /* SDLFileManagerConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
880245A520F79C3400ED195B /* SDLFileManagerConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 880245A320F79C3400ED195B /* SDLFileManagerConfiguration.m */; };
+ 8803DCEF22C2B84B00FBB7CE /* SDLBackgroundTaskManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 8803DCED22C2B84B00FBB7CE /* SDLBackgroundTaskManager.h */; };
+ 8803DCF022C2B84B00FBB7CE /* SDLBackgroundTaskManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8803DCEE22C2B84B00FBB7CE /* SDLBackgroundTaskManager.m */; };
880D267A220DDD1000B3F496 /* SDLWeatherServiceDataSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 880D2679220DDD1000B3F496 /* SDLWeatherServiceDataSpec.m */; };
880D267D220DE5DF00B3F496 /* SDLWeatherServiceManifest.h in Headers */ = {isa = PBXBuildFile; fileRef = 880D267B220DE5DF00B3F496 /* SDLWeatherServiceManifest.h */; settings = {ATTRIBUTES = (Public, ); }; };
880D267E220DE5DF00B3F496 /* SDLWeatherServiceManifest.m in Sources */ = {isa = PBXBuildFile; fileRef = 880D267C220DE5DF00B3F496 /* SDLWeatherServiceManifest.m */; };
@@ -1229,12 +1247,15 @@
880E35B42088F75A00181259 /* SDLSystemCapabilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 880E35B22088F75A00181259 /* SDLSystemCapabilityManager.m */; };
880E35B52088F75A00181259 /* SDLSystemCapabilityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 880E35B32088F75A00181259 /* SDLSystemCapabilityManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
880E35B82088F78E00181259 /* SDLSystemCapabilityManagerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 880E35B72088F78E00181259 /* SDLSystemCapabilityManagerSpec.m */; };
+ 880FE6272267AE5300723732 /* SDLIAPConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 880FE6252267AE5300723732 /* SDLIAPConstants.h */; };
+ 880FE6282267AE5300723732 /* SDLIAPConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 880FE6262267AE5300723732 /* SDLIAPConstants.m */; };
8815D0EF22330753000F24E6 /* SDLRPCRequestNotification.h in Headers */ = {isa = PBXBuildFile; fileRef = 88D6F17E22319FE000D4BFB3 /* SDLRPCRequestNotification.h */; settings = {ATTRIBUTES = (Public, ); }; };
8815D0F022330765000F24E6 /* SDLRPCRequestNotificationSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C23E8522297BD500EA171F /* SDLRPCRequestNotificationSpec.m */; };
8815D0F122330781000F24E6 /* SDLRPCRequestNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D6F17D22319FE000D4BFB3 /* SDLRPCRequestNotification.m */; };
8816772922208B82001FACFF /* SDLNavigationInstructionSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8816772822208B82001FACFF /* SDLNavigationInstructionSpec.m */; };
8816772C222097C3001FACFF /* SDLNavigationServiceData.h in Headers */ = {isa = PBXBuildFile; fileRef = 8816772A222097C3001FACFF /* SDLNavigationServiceData.h */; settings = {ATTRIBUTES = (Public, ); }; };
8816772D222097C3001FACFF /* SDLNavigationServiceData.m in Sources */ = {isa = PBXBuildFile; fileRef = 8816772B222097C3001FACFF /* SDLNavigationServiceData.m */; };
+ 8817C2802289F4B900DB2DEC /* SDLIAPDataSessionDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 8817C27F2289F41D00DB2DEC /* SDLIAPDataSessionDelegate.h */; };
8818ADD82100FC18007D6F19 /* SDLTurnSignal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8818ADD62100FC18007D6F19 /* SDLTurnSignal.h */; settings = {ATTRIBUTES = (Public, ); }; };
8818ADD92100FC18007D6F19 /* SDLTurnSignal.m in Sources */ = {isa = PBXBuildFile; fileRef = 8818ADD72100FC18007D6F19 /* SDLTurnSignal.m */; };
8818ADDD2100FE0C007D6F19 /* SDLTurnSignalSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8818ADDC2100FE0C007D6F19 /* SDLTurnSignalSpec.m */; };
@@ -1355,14 +1376,21 @@
88B58DC922204C9E0011B063 /* SDLNavigationActionSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88B58DC822204C9E0011B063 /* SDLNavigationActionSpec.m */; };
88B848C31F45E1A600DED768 /* TestResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 88B848C21F45E1A600DED768 /* TestResponse.m */; };
88B848C91F462E3600DED768 /* TestFileProgressResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 88B848C81F462E3600DED768 /* TestFileProgressResponse.m */; };
+ 88BCEA922266250B00BB7E70 /* SDLIAPControlSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 88BCEA902266250B00BB7E70 /* SDLIAPControlSession.h */; };
+ 88BCEA932266250B00BB7E70 /* SDLIAPControlSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 88BCEA912266250B00BB7E70 /* SDLIAPControlSession.m */; };
+ 88BCEA952266592D00BB7E70 /* SDLIAPControlSessionSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88BCEA942266592D00BB7E70 /* SDLIAPControlSessionSpec.m */; };
88C23E8822297C6000EA171F /* SDLRPCResponseNotificationSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C23E8722297C6000EA171F /* SDLRPCResponseNotificationSpec.m */; };
88C23E8A22297DE400EA171F /* SDLRPCNotificationNotificationSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C23E8922297DE400EA171F /* SDLRPCNotificationNotificationSpec.m */; };
88C282CA220CD17200D02F90 /* SDLGetFileResponseSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C282C9220CD17200D02F90 /* SDLGetFileResponseSpec.m */; };
88C37F632204EBF000901DC6 /* SDLAppServiceData.h in Headers */ = {isa = PBXBuildFile; fileRef = 88C37F612204EBF000901DC6 /* SDLAppServiceData.h */; settings = {ATTRIBUTES = (Public, ); }; };
88C37F642204EBF000901DC6 /* SDLAppServiceData.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C37F622204EBF000901DC6 /* SDLAppServiceData.m */; };
88D2AAE41F682BB20078D5B2 /* SDLLogConstantsSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D2AAE31F682BB20078D5B2 /* SDLLogConstantsSpec.m */; };
+ 88D3EBC92267949D00493C38 /* SDLIAPDataSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 88D3EBC72267949D00493C38 /* SDLIAPDataSession.h */; };
+ 88D3EBCA2267949D00493C38 /* SDLIAPDataSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D3EBC82267949D00493C38 /* SDLIAPDataSession.m */; };
88D5EB37220CD95000EC3782 /* SDLWeatherServiceData.h in Headers */ = {isa = PBXBuildFile; fileRef = 88D5EB35220CD95000EC3782 /* SDLWeatherServiceData.h */; settings = {ATTRIBUTES = (Public, ); }; };
88D5EB38220CD95000EC3782 /* SDLWeatherServiceData.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D5EB36220CD95000EC3782 /* SDLWeatherServiceData.m */; };
+ 88D99DB52289C82F0039E047 /* SDLIAPControlSessionDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 88D99DB42289BFBE0039E047 /* SDLIAPControlSessionDelegate.h */; };
+ 88DDD0F9229ECA57002F9623 /* SDLIAPConstantsSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88DDD0F8229ECA57002F9623 /* SDLIAPConstantsSpec.m */; };
88DF998D22035CC600477AC1 /* EAAccessory+OCMock.m in Sources */ = {isa = PBXBuildFile; fileRef = 88DF998C22035CC600477AC1 /* EAAccessory+OCMock.m */; };
88DF998F22035D1700477AC1 /* SDLIAPSessionSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88DF998E22035D1700477AC1 /* SDLIAPSessionSpec.m */; };
88DF999122035D5A00477AC1 /* SDLIAPTransportSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88DF999022035D5A00477AC1 /* SDLIAPTransportSpec.m */; };
@@ -1381,6 +1409,7 @@
88EED83B1F33BECB00E6C42E /* SDLHapticRectSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88EED83A1F33BECB00E6C42E /* SDLHapticRectSpec.m */; };
88EED83E1F33C5A400E6C42E /* SDLSendHapticData.h in Headers */ = {isa = PBXBuildFile; fileRef = 88EED83C1F33C5A400E6C42E /* SDLSendHapticData.h */; settings = {ATTRIBUTES = (Public, ); }; };
88EED83F1F33C5A400E6C42E /* SDLSendHapticData.m in Sources */ = {isa = PBXBuildFile; fileRef = 88EED83D1F33C5A400E6C42E /* SDLSendHapticData.m */; };
+ 88F37A4D226F84BE00DF119B /* SDLIAPDataSessionSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F37A4C226F84BE00DF119B /* SDLIAPDataSessionSpec.m */; };
88F50D5F220B720E00F34648 /* SDLPerformAppServiceInteractionSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F50D5E220B720E00F34648 /* SDLPerformAppServiceInteractionSpec.m */; };
88F65133220C6DC300CAF321 /* SDLWeatherAlertSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F65132220C6DC300CAF321 /* SDLWeatherAlertSpec.m */; };
88F65136220C74FD00CAF321 /* SDLWeatherData.h in Headers */ = {isa = PBXBuildFile; fileRef = 88F65134220C74FD00CAF321 /* SDLWeatherData.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1477,9 +1506,6 @@
E4139D1E1F6017770005B6EA /* SDLLifecycleConfigurationUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = E4139D1C1F6017770005B6EA /* SDLLifecycleConfigurationUpdate.m */; };
E9C32B911AB20BA200F283AF /* SDLIAPSession.h in Headers */ = {isa = PBXBuildFile; fileRef = E9C32B891AB20BA200F283AF /* SDLIAPSession.h */; };
E9C32B921AB20BA200F283AF /* SDLIAPSession.m in Sources */ = {isa = PBXBuildFile; fileRef = E9C32B8A1AB20BA200F283AF /* SDLIAPSession.m */; };
- E9C32B931AB20BA200F283AF /* SDLIAPSessionDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = E9C32B8B1AB20BA200F283AF /* SDLIAPSessionDelegate.h */; };
- E9C32B941AB20BA200F283AF /* SDLStreamDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = E9C32B8C1AB20BA200F283AF /* SDLStreamDelegate.h */; };
- E9C32B951AB20BA200F283AF /* SDLStreamDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E9C32B8D1AB20BA200F283AF /* SDLStreamDelegate.m */; };
E9C32B961AB20BA200F283AF /* SDLTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = E9C32B8E1AB20BA200F283AF /* SDLTimer.h */; };
E9C32B971AB20BA200F283AF /* SDLTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = E9C32B8F1AB20BA200F283AF /* SDLTimer.m */; };
E9C32B9C1AB20C5900F283AF /* EAAccessory+SDLProtocols.h in Headers */ = {isa = PBXBuildFile; fileRef = E9C32B981AB20C5900F283AF /* EAAccessory+SDLProtocols.h */; };
@@ -2632,6 +2658,10 @@
5D6F7A331BC5B9B60070BF37 /* SDLLockScreenViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLLockScreenViewController.h; sourceTree = ""; };
5D6F7A341BC5B9B60070BF37 /* SDLLockScreenViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLLockScreenViewController.m; sourceTree = ""; };
5D6F7A3D1BC811FC0070BF37 /* SDLAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = SDLAssets.xcassets; path = Assets/SDLAssets.xcassets; sourceTree = ""; };
+ 5D75960B22972F830013207C /* TestSystemCapabilityObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TestSystemCapabilityObserver.h; path = DevAPISpecs/TestSystemCapabilityObserver.h; sourceTree = ""; };
+ 5D75960C22972F830013207C /* TestSystemCapabilityObserver.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = TestSystemCapabilityObserver.m; path = DevAPISpecs/TestSystemCapabilityObserver.m; sourceTree = ""; };
+ 5D75960F22972FCA0013207C /* SDLSystemCapabilityObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLSystemCapabilityObserver.h; sourceTree = ""; };
+ 5D75961022972FCA0013207C /* SDLSystemCapabilityObserver.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLSystemCapabilityObserver.m; sourceTree = ""; };
5D76E31B1D3805FF00647CFA /* SDLLockScreenManagerSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLLockScreenManagerSpec.m; path = DevAPISpecs/SDLLockScreenManagerSpec.m; sourceTree = ""; };
5D76E3201D39742300647CFA /* SDLViewControllerPresentable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLViewControllerPresentable.h; sourceTree = ""; };
5D76E3221D39767000647CFA /* SDLLockScreenPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLLockScreenPresenter.h; sourceTree = ""; };
@@ -2717,6 +2747,12 @@
5DA0268F1AD44EE700019F86 /* SDLDialNumberResponseSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLDialNumberResponseSpec.m; sourceTree = ""; };
5DA102A21D4122C700C15826 /* NSMutableDictionary+SafeRemove.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableDictionary+SafeRemove.h"; sourceTree = ""; };
5DA102A31D4122C700C15826 /* NSMutableDictionary+SafeRemove.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableDictionary+SafeRemove.m"; sourceTree = ""; };
+ 5DA150C52271FDC20032928D /* SDLSoftButtonTransitionOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLSoftButtonTransitionOperation.h; sourceTree = ""; };
+ 5DA150C62271FDC20032928D /* SDLSoftButtonTransitionOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLSoftButtonTransitionOperation.m; sourceTree = ""; };
+ 5DA150CB2271FE180032928D /* SDLSoftButtonReplaceOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLSoftButtonReplaceOperation.h; sourceTree = ""; };
+ 5DA150CC2271FE180032928D /* SDLSoftButtonReplaceOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLSoftButtonReplaceOperation.m; sourceTree = ""; };
+ 5DA150D0227367580032928D /* SDLSoftButtonTransitionOperationSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SDLSoftButtonTransitionOperationSpec.m; path = DevAPISpecs/SDLSoftButtonTransitionOperationSpec.m; sourceTree = ""; };
+ 5DA150D22273676A0032928D /* SDLSoftButtonReplaceOperationSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLSoftButtonReplaceOperationSpec.m; sourceTree = ""; };
5DA22CB31D075CF200245F5F /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = sdl_ios/Carthage/Build/iOS/Nimble.framework; sourceTree = ""; };
5DA22CB41D075CF200245F5F /* OCMock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OCMock.framework; path = sdl_ios/Carthage/Build/iOS/OCMock.framework; sourceTree = ""; };
5DA22CB61D075CF200245F5F /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = sdl_ios/Carthage/Build/iOS/Quick.framework; sourceTree = ""; };
@@ -2849,8 +2885,17 @@
5DF40B25208FA7DE00DD6FDA /* SDLMenuManagerSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SDLMenuManagerSpec.m; path = DevAPISpecs/SDLMenuManagerSpec.m; sourceTree = ""; };
5DF40B27208FDA9700DD6FDA /* SDLVoiceCommandManagerSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SDLVoiceCommandManagerSpec.m; path = DevAPISpecs/SDLVoiceCommandManagerSpec.m; sourceTree = ""; };
5DFFB9141BD7C89700DB3F04 /* SDLConnectionManagerType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLConnectionManagerType.h; sourceTree = ""; };
+ 752ECDB4228B4D6B00D945F4 /* SDLDynamicMenuUpdateAlgorithm.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLDynamicMenuUpdateAlgorithm.h; sourceTree = ""; };
+ 752ECDB5228B4D6B00D945F4 /* SDLDynamicMenuUpdateAlgorithm.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLDynamicMenuUpdateAlgorithm.m; sourceTree = ""; };
+ 752ECDB8228C42E100D945F4 /* SDLMenuRunScoreSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLMenuRunScoreSpec.m; sourceTree = ""; };
+ 752ECDBA228C532600D945F4 /* SDLMenuUpdateAlgorithmSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLMenuUpdateAlgorithmSpec.m; sourceTree = ""; };
+ 755F176122A00B7C0041B9CB /* SDLMenuManagerConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLMenuManagerConstants.h; sourceTree = ""; };
+ 756C62742289F11F008B57A2 /* SDLDynamicMenuUpdateRunScore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLDynamicMenuUpdateRunScore.h; sourceTree = ""; };
+ 756C62752289F11F008B57A2 /* SDLDynamicMenuUpdateRunScore.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLDynamicMenuUpdateRunScore.m; sourceTree = ""; };
880245A220F79C3400ED195B /* SDLFileManagerConfiguration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLFileManagerConfiguration.h; sourceTree = ""; };
880245A320F79C3400ED195B /* SDLFileManagerConfiguration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLFileManagerConfiguration.m; sourceTree = ""; };
+ 8803DCED22C2B84B00FBB7CE /* SDLBackgroundTaskManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLBackgroundTaskManager.h; sourceTree = ""; };
+ 8803DCEE22C2B84B00FBB7CE /* SDLBackgroundTaskManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLBackgroundTaskManager.m; sourceTree = ""; };
880D2679220DDD1000B3F496 /* SDLWeatherServiceDataSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLWeatherServiceDataSpec.m; sourceTree = ""; };
880D267B220DE5DF00B3F496 /* SDLWeatherServiceManifest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLWeatherServiceManifest.h; sourceTree = ""; };
880D267C220DE5DF00B3F496 /* SDLWeatherServiceManifest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLWeatherServiceManifest.m; sourceTree = ""; };
@@ -2858,9 +2903,12 @@
880E35B22088F75A00181259 /* SDLSystemCapabilityManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSystemCapabilityManager.m; sourceTree = ""; };
880E35B32088F75A00181259 /* SDLSystemCapabilityManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSystemCapabilityManager.h; sourceTree = ""; };
880E35B72088F78E00181259 /* SDLSystemCapabilityManagerSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSystemCapabilityManagerSpec.m; sourceTree = ""; };
+ 880FE6252267AE5300723732 /* SDLIAPConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLIAPConstants.h; sourceTree = ""; };
+ 880FE6262267AE5300723732 /* SDLIAPConstants.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLIAPConstants.m; sourceTree = ""; };
8816772822208B82001FACFF /* SDLNavigationInstructionSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLNavigationInstructionSpec.m; sourceTree = ""; };
8816772A222097C3001FACFF /* SDLNavigationServiceData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLNavigationServiceData.h; sourceTree = ""; };
8816772B222097C3001FACFF /* SDLNavigationServiceData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLNavigationServiceData.m; sourceTree = ""; };
+ 8817C27F2289F41D00DB2DEC /* SDLIAPDataSessionDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLIAPDataSessionDelegate.h; sourceTree = ""; };
8818ADD62100FC18007D6F19 /* SDLTurnSignal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLTurnSignal.h; sourceTree = ""; };
8818ADD72100FC18007D6F19 /* SDLTurnSignal.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLTurnSignal.m; sourceTree = ""; };
8818ADDC2100FE0C007D6F19 /* SDLTurnSignalSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLTurnSignalSpec.m; sourceTree = ""; };
@@ -2976,6 +3024,9 @@
88B848C21F45E1A600DED768 /* TestResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestResponse.m; sourceTree = ""; };
88B848C71F462E3600DED768 /* TestFileProgressResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestFileProgressResponse.h; sourceTree = ""; };
88B848C81F462E3600DED768 /* TestFileProgressResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestFileProgressResponse.m; sourceTree = ""; };
+ 88BCEA902266250B00BB7E70 /* SDLIAPControlSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLIAPControlSession.h; sourceTree = ""; };
+ 88BCEA912266250B00BB7E70 /* SDLIAPControlSession.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLIAPControlSession.m; sourceTree = ""; };
+ 88BCEA942266592D00BB7E70 /* SDLIAPControlSessionSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLIAPControlSessionSpec.m; sourceTree = ""; };
88C23E8522297BD500EA171F /* SDLRPCRequestNotificationSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRPCRequestNotificationSpec.m; sourceTree = ""; };
88C23E8722297C6000EA171F /* SDLRPCResponseNotificationSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLRPCResponseNotificationSpec.m; sourceTree = ""; };
88C23E8922297DE400EA171F /* SDLRPCNotificationNotificationSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLRPCNotificationNotificationSpec.m; sourceTree = ""; };
@@ -2983,10 +3034,14 @@
88C37F612204EBF000901DC6 /* SDLAppServiceData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLAppServiceData.h; sourceTree = ""; };
88C37F622204EBF000901DC6 /* SDLAppServiceData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLAppServiceData.m; sourceTree = ""; };
88D2AAE31F682BB20078D5B2 /* SDLLogConstantsSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLLogConstantsSpec.m; sourceTree = ""; };
+ 88D3EBC72267949D00493C38 /* SDLIAPDataSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLIAPDataSession.h; sourceTree = ""; };
+ 88D3EBC82267949D00493C38 /* SDLIAPDataSession.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLIAPDataSession.m; sourceTree = ""; };
88D5EB35220CD95000EC3782 /* SDLWeatherServiceData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLWeatherServiceData.h; sourceTree = ""; };
88D5EB36220CD95000EC3782 /* SDLWeatherServiceData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLWeatherServiceData.m; sourceTree = ""; };
88D6F17D22319FE000D4BFB3 /* SDLRPCRequestNotification.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLRPCRequestNotification.m; sourceTree = ""; };
88D6F17E22319FE000D4BFB3 /* SDLRPCRequestNotification.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLRPCRequestNotification.h; sourceTree = ""; };
+ 88D99DB42289BFBE0039E047 /* SDLIAPControlSessionDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLIAPControlSessionDelegate.h; sourceTree = ""; };
+ 88DDD0F8229ECA57002F9623 /* SDLIAPConstantsSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLIAPConstantsSpec.m; sourceTree = ""; };
88DF998C22035CC600477AC1 /* EAAccessory+OCMock.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "EAAccessory+OCMock.m"; sourceTree = ""; };
88DF998E22035D1700477AC1 /* SDLIAPSessionSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLIAPSessionSpec.m; sourceTree = ""; };
88DF999022035D5A00477AC1 /* SDLIAPTransportSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLIAPTransportSpec.m; sourceTree = ""; };
@@ -3005,6 +3060,7 @@
88EED83A1F33BECB00E6C42E /* SDLHapticRectSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLHapticRectSpec.m; sourceTree = ""; };
88EED83C1F33C5A400E6C42E /* SDLSendHapticData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSendHapticData.h; sourceTree = ""; };
88EED83D1F33C5A400E6C42E /* SDLSendHapticData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSendHapticData.m; sourceTree = ""; };
+ 88F37A4C226F84BE00DF119B /* SDLIAPDataSessionSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLIAPDataSessionSpec.m; sourceTree = ""; };
88F50D5E220B720E00F34648 /* SDLPerformAppServiceInteractionSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLPerformAppServiceInteractionSpec.m; sourceTree = ""; };
88F65132220C6DC300CAF321 /* SDLWeatherAlertSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLWeatherAlertSpec.m; sourceTree = ""; };
88F65134220C74FD00CAF321 /* SDLWeatherData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLWeatherData.h; sourceTree = ""; };
@@ -3104,9 +3160,6 @@
E4139D1C1F6017770005B6EA /* SDLLifecycleConfigurationUpdate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLLifecycleConfigurationUpdate.m; sourceTree = ""; };
E9C32B891AB20BA200F283AF /* SDLIAPSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLIAPSession.h; sourceTree = ""; };
E9C32B8A1AB20BA200F283AF /* SDLIAPSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLIAPSession.m; sourceTree = ""; };
- E9C32B8B1AB20BA200F283AF /* SDLIAPSessionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLIAPSessionDelegate.h; sourceTree = ""; };
- E9C32B8C1AB20BA200F283AF /* SDLStreamDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLStreamDelegate.h; sourceTree = ""; };
- E9C32B8D1AB20BA200F283AF /* SDLStreamDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLStreamDelegate.m; sourceTree = ""; };
E9C32B8E1AB20BA200F283AF /* SDLTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTimer.h; sourceTree = ""; };
E9C32B8F1AB20BA200F283AF /* SDLTimer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTimer.m; sourceTree = ""; };
E9C32B981AB20C5900F283AF /* EAAccessory+SDLProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "EAAccessory+SDLProtocols.h"; sourceTree = ""; };
@@ -3726,10 +3779,8 @@
children = (
5D0A7380203F23F30001595D /* SDLSoftButtonManager.h */,
5D0A7381203F23F30001595D /* SDLSoftButtonManager.m */,
- 5D0A7384203F24060001595D /* SDLSoftButtonState.h */,
- 5D0A7385203F24060001595D /* SDLSoftButtonState.m */,
- 5D0A7388203F24320001595D /* SDLSoftButtonObject.h */,
- 5D0A7389203F24320001595D /* SDLSoftButtonObject.m */,
+ 5DA150CA2271FE030032928D /* Buttons */,
+ 5DA150C92271FDF90032928D /* Operations */,
);
name = "Soft Button";
sourceTree = "";
@@ -3791,6 +3842,7 @@
5D339CE5207C0651000CC364 /* Menu */ = {
isa = PBXGroup;
children = (
+ 755F175E229F14F70041B9CB /* Dynamic Menu Update Utilities */,
5D339CEC207C08AB000CC364 /* Cells */,
5D339CF1207C0ACE000CC364 /* SDLMenuManager.h */,
5D339CF2207C0ACE000CC364 /* SDLMenuManager.m */,
@@ -4743,6 +4795,8 @@
5D5934F61A85189500687FB9 /* Utilities */ = {
isa = PBXGroup;
children = (
+ 8803DCED22C2B84B00FBB7CE /* SDLBackgroundTaskManager.h */,
+ 8803DCEE22C2B84B00FBB7CE /* SDLBackgroundTaskManager.m */,
97E26DEA1E807AD70074A3C7 /* SDLMutableDataQueue.h */,
97E26DEB1E807AD70074A3C7 /* SDLMutableDataQueue.m */,
E9C32B831AB20B2900F283AF /* @categories */,
@@ -5050,6 +5104,24 @@
name = "Lock Screen UI";
sourceTree = "";
};
+ 5D75960A22972F620013207C /* Utilities */ = {
+ isa = PBXGroup;
+ children = (
+ 5D75960B22972F830013207C /* TestSystemCapabilityObserver.h */,
+ 5D75960C22972F830013207C /* TestSystemCapabilityObserver.m */,
+ );
+ name = Utilities;
+ sourceTree = "";
+ };
+ 5D75960E22972FB90013207C /* Utilities */ = {
+ isa = PBXGroup;
+ children = (
+ 5D75960F22972FCA0013207C /* SDLSystemCapabilityObserver.h */,
+ 5D75961022972FCA0013207C /* SDLSystemCapabilityObserver.m */,
+ );
+ name = Utilities;
+ sourceTree = "";
+ };
5D76E31A1D3805E600647CFA /* LockScreen */ = {
isa = PBXGroup;
children = (
@@ -5214,6 +5286,37 @@
name = Permissions;
sourceTree = "";
};
+ 5DA150C92271FDF90032928D /* Operations */ = {
+ isa = PBXGroup;
+ children = (
+ 5DA150C52271FDC20032928D /* SDLSoftButtonTransitionOperation.h */,
+ 5DA150C62271FDC20032928D /* SDLSoftButtonTransitionOperation.m */,
+ 5DA150CB2271FE180032928D /* SDLSoftButtonReplaceOperation.h */,
+ 5DA150CC2271FE180032928D /* SDLSoftButtonReplaceOperation.m */,
+ );
+ name = Operations;
+ sourceTree = "";
+ };
+ 5DA150CA2271FE030032928D /* Buttons */ = {
+ isa = PBXGroup;
+ children = (
+ 5D0A7384203F24060001595D /* SDLSoftButtonState.h */,
+ 5D0A7385203F24060001595D /* SDLSoftButtonState.m */,
+ 5D0A7388203F24320001595D /* SDLSoftButtonObject.h */,
+ 5D0A7389203F24320001595D /* SDLSoftButtonObject.m */,
+ );
+ name = Buttons;
+ sourceTree = "";
+ };
+ 5DA150CF227366900032928D /* Operations */ = {
+ isa = PBXGroup;
+ children = (
+ 5DA150D0227367580032928D /* SDLSoftButtonTransitionOperationSpec.m */,
+ 5DA150D22273676A0032928D /* SDLSoftButtonReplaceOperationSpec.m */,
+ );
+ name = Operations;
+ sourceTree = "";
+ };
5DA23FF11F2FA32A009C0313 /* Audio Service */ = {
isa = PBXGroup;
children = (
@@ -5342,13 +5445,14 @@
5DAB5F582098E8BC00A020C8 /* IAP */ = {
isa = PBXGroup;
children = (
+ 884DFBCB2289F6FF00EA8846 /* Data Session */,
+ 884DFBCA2289F6EA00EA8846 /* Control Session */,
E9C32B891AB20BA200F283AF /* SDLIAPSession.h */,
E9C32B8A1AB20BA200F283AF /* SDLIAPSession.m */,
- E9C32B8B1AB20BA200F283AF /* SDLIAPSessionDelegate.h */,
5D61FADA1A84238A00846EE7 /* SDLIAPTransport.h */,
5D61FADB1A84238A00846EE7 /* SDLIAPTransport.m */,
- E9C32B8C1AB20BA200F283AF /* SDLStreamDelegate.h */,
- E9C32B8D1AB20BA200F283AF /* SDLStreamDelegate.m */,
+ 880FE6252267AE5300723732 /* SDLIAPConstants.h */,
+ 880FE6262267AE5300723732 /* SDLIAPConstants.m */,
);
name = IAP;
sourceTree = "";
@@ -5377,6 +5481,7 @@
5DAD5F8220507DED0025624C /* Soft Button */ = {
isa = PBXGroup;
children = (
+ 5DA150CF227366900032928D /* Operations */,
5DAD5F8820508F090025624C /* SDLSoftButtonStateSpec.m */,
5DAD5F8A20508F140025624C /* SDLSoftButtonObjectSpec.m */,
5DAD5F8C20508F220025624C /* SDLSoftButtonManagerSpec.m */,
@@ -5724,10 +5829,24 @@
5DF40B27208FDA9700DD6FDA /* SDLVoiceCommandManagerSpec.m */,
5DAB5F502098994C00A020C8 /* SDLMenuCellSpec.m */,
5DAB5F5220989A8300A020C8 /* SDLVoiceCommandSpec.m */,
+ 752ECDB8228C42E100D945F4 /* SDLMenuRunScoreSpec.m */,
+ 752ECDBA228C532600D945F4 /* SDLMenuUpdateAlgorithmSpec.m */,
);
name = Menu;
sourceTree = "";
};
+ 755F175E229F14F70041B9CB /* Dynamic Menu Update Utilities */ = {
+ isa = PBXGroup;
+ children = (
+ 756C62742289F11F008B57A2 /* SDLDynamicMenuUpdateRunScore.h */,
+ 756C62752289F11F008B57A2 /* SDLDynamicMenuUpdateRunScore.m */,
+ 752ECDB4228B4D6B00D945F4 /* SDLDynamicMenuUpdateAlgorithm.h */,
+ 752ECDB5228B4D6B00D945F4 /* SDLDynamicMenuUpdateAlgorithm.m */,
+ 755F176122A00B7C0041B9CB /* SDLMenuManagerConstants.h */,
+ );
+ name = "Dynamic Menu Update Utilities";
+ sourceTree = "";
+ };
880245A120F79BDA00ED195B /* Configuration */ = {
isa = PBXGroup;
children = (
@@ -5740,6 +5859,7 @@
880E35B12088F73400181259 /* System Capabilities */ = {
isa = PBXGroup;
children = (
+ 5D75960E22972FB90013207C /* Utilities */,
880E35B32088F75A00181259 /* SDLSystemCapabilityManager.h */,
880E35B22088F75A00181259 /* SDLSystemCapabilityManager.m */,
);
@@ -5749,6 +5869,7 @@
880E35B62088F77C00181259 /* System Capabilities */ = {
isa = PBXGroup;
children = (
+ 5D75960A22972F620013207C /* Utilities */,
880E35B72088F78E00181259 /* SDLSystemCapabilityManagerSpec.m */,
);
name = "System Capabilities";
@@ -5833,6 +5954,26 @@
name = "Shared Assets";
sourceTree = "";
};
+ 884DFBCA2289F6EA00EA8846 /* Control Session */ = {
+ isa = PBXGroup;
+ children = (
+ 88D99DB42289BFBE0039E047 /* SDLIAPControlSessionDelegate.h */,
+ 88BCEA902266250B00BB7E70 /* SDLIAPControlSession.h */,
+ 88BCEA912266250B00BB7E70 /* SDLIAPControlSession.m */,
+ );
+ name = "Control Session";
+ sourceTree = "";
+ };
+ 884DFBCB2289F6FF00EA8846 /* Data Session */ = {
+ isa = PBXGroup;
+ children = (
+ 88D3EBC72267949D00493C38 /* SDLIAPDataSession.h */,
+ 88D3EBC82267949D00493C38 /* SDLIAPDataSession.m */,
+ 8817C27F2289F41D00DB2DEC /* SDLIAPDataSessionDelegate.h */,
+ );
+ name = "Data Session";
+ sourceTree = "";
+ };
88A0AA5F207CFEA60075132C /* Connection */ = {
isa = PBXGroup;
children = (
@@ -5898,6 +6039,9 @@
88DF998C22035CC600477AC1 /* EAAccessory+OCMock.m */,
88DF998E22035D1700477AC1 /* SDLIAPSessionSpec.m */,
88DF999022035D5A00477AC1 /* SDLIAPTransportSpec.m */,
+ 88BCEA942266592D00BB7E70 /* SDLIAPControlSessionSpec.m */,
+ 88F37A4C226F84BE00DF119B /* SDLIAPDataSessionSpec.m */,
+ 88DDD0F8229ECA57002F9623 /* SDLIAPConstantsSpec.m */,
);
path = iAP;
sourceTree = "";
@@ -6084,7 +6228,6 @@
5DA3F35F1BC448590026F2D0 /* SDLNotificationConstants.h in Headers */,
5DE5ABB71B0E38C90067BB02 /* SDLSystemRequest.h in Headers */,
5DA3F3701BC4489A0026F2D0 /* SDLManager.h in Headers */,
- E9C32B931AB20BA200F283AF /* SDLIAPSessionDelegate.h in Headers */,
5DE5ABB81B0E38C90067BB02 /* SDLSystemRequestResponse.h in Headers */,
5D61FCA51A84238C00846EE7 /* SDLEndAudioPassThruResponse.h in Headers */,
5D3E48CB1D7722FE0000BFEF /* NSBundle+SDLBundle.h in Headers */,
@@ -6094,6 +6237,7 @@
5D61FC901A84238C00846EE7 /* SDLDisplayCapabilities.h in Headers */,
5D3E420A20EAAD6500D8C622 /* SDLTPMS.h in Headers */,
5D61FCE81A84238C00846EE7 /* SDLLanguage.h in Headers */,
+ 8817C2802289F4B900DB2DEC /* SDLIAPDataSessionDelegate.h in Headers */,
5D61FC841A84238C00846EE7 /* SDLDeviceLevelStatus.h in Headers */,
5DB92D321AC9C8BA00C15BB0 /* SDLRPCStruct.h in Headers */,
5D61FD151A84238C00846EE7 /* SDLOnLockScreenStatus.h in Headers */,
@@ -6121,8 +6265,8 @@
5D61FCC91A84238C00846EE7 /* SDLIgnitionStableStatus.h in Headers */,
884E701F21FB983F008D53BA /* SDLAppServiceManifest.h in Headers */,
DA9F7E6B1DCBFB0700ACAE48 /* SDLDeliveryMode.h in Headers */,
- E9C32B941AB20BA200F283AF /* SDLStreamDelegate.h in Headers */,
DA9F7E871DCC049900ACAE48 /* SDLSubscribeWayPoints.h in Headers */,
+ 88D99DB52289C82F0039E047 /* SDLIAPControlSessionDelegate.h in Headers */,
5D61FDBB1A84238C00846EE7 /* SDLSystemAction.h in Headers */,
5D8A09811F54B4E5002502A2 /* SDLStreamingMediaManagerDataSource.h in Headers */,
5D61FC9C1A84238C00846EE7 /* SDLEmergencyEventType.h in Headers */,
@@ -6136,6 +6280,7 @@
E9C32B911AB20BA200F283AF /* SDLIAPSession.h in Headers */,
5D61FCD71A84238C00846EE7 /* SDLInteractionMode.h in Headers */,
8881AFBE2225E9BB00EA870B /* SDLGetCloudAppPropertiesResponse.h in Headers */,
+ 880FE6272267AE5300723732 /* SDLIAPConstants.h in Headers */,
5D61FC391A84238C00846EE7 /* SDLAlertManeuver.h in Headers */,
5D61FC861A84238C00846EE7 /* SDLDeviceStatus.h in Headers */,
DA0C46AF1DCD41E30001F2A8 /* SDLMacros.h in Headers */,
@@ -6212,6 +6357,7 @@
5D61FC451A84238C00846EE7 /* SDLAudioPassThruCapabilities.h in Headers */,
5D61FDC71A84238C00846EE7 /* SDLTextAlignment.h in Headers */,
5D61FD051A84238C00846EE7 /* SDLOnButtonPress.h in Headers */,
+ 5DA150C72271FDC20032928D /* SDLSoftButtonTransitionOperation.h in Headers */,
5D61FCC51A84238C00846EE7 /* SDLHMIZoneCapabilities.h in Headers */,
884AF94F220B488900E22928 /* SDLOnSystemCapabilityUpdated.h in Headers */,
880D267D220DE5DF00B3F496 /* SDLWeatherServiceManifest.h in Headers */,
@@ -6222,6 +6368,7 @@
5D61FC4F1A84238C00846EE7 /* SDLBodyInformation.h in Headers */,
5D61FDAB1A84238C00846EE7 /* SDLStartTime.h in Headers */,
5D61FD071A84238C00846EE7 /* SDLOnCommand.h in Headers */,
+ 88D3EBC92267949D00493C38 /* SDLIAPDataSession.h in Headers */,
5D00AC671F140F0A004000D9 /* SDLSystemCapabilityType.h in Headers */,
DA9F7E9B1DCC052C00ACAE48 /* SDLLocationDetails.h in Headers */,
5D61FD1D1A84238C00846EE7 /* SDLOnTBTClientState.h in Headers */,
@@ -6255,6 +6402,7 @@
5D61FDF11A84238C00846EE7 /* SDLUpdateTurnList.h in Headers */,
5DB996571F268ECB002D8795 /* SDLControlFramePayloadAudioStartServiceAck.h in Headers */,
5D61FD671A84238C00846EE7 /* SDLResult.h in Headers */,
+ 755F176222A00B7C0041B9CB /* SDLMenuManagerConstants.h in Headers */,
5D61FD351A84238C00846EE7 /* SDLPowerModeStatus.h in Headers */,
5D61FD971A84238C00846EE7 /* SDLSingleTireStatus.h in Headers */,
5D61FCE21A84238C00846EE7 /* SDLKeyboardLayout.h in Headers */,
@@ -6272,6 +6420,7 @@
5D61FDB11A84238C00846EE7 /* SDLSubscribeVehicleData.h in Headers */,
5DB996601F28C6ED002D8795 /* SDLControlFramePayloadVideoStartServiceAck.h in Headers */,
5DCF76F51ACDBAD300BB647B /* SDLSendLocation.h in Headers */,
+ 5D75961122972FCA0013207C /* SDLSystemCapabilityObserver.h in Headers */,
5D61FC9E1A84238C00846EE7 /* SDLEncodedSyncPData.h in Headers */,
1FF7DABA1F75B2A800B46C30 /* SDLFocusableItemLocator.h in Headers */,
5D019276214994AC003500F6 /* NSMutableArray+Safe.h in Headers */,
@@ -6283,6 +6432,7 @@
5D61FC511A84238C00846EE7 /* SDLButtonCapabilities.h in Headers */,
5D61FDE91A84238C00846EE7 /* SDLUnsubscribeButtonResponse.h in Headers */,
5D61FCD51A84238C00846EE7 /* SDLImageType.h in Headers */,
+ 8803DCEF22C2B84B00FBB7CE /* SDLBackgroundTaskManager.h in Headers */,
5D61FC2F1A84238C00846EE7 /* SDLAddCommandResponse.h in Headers */,
5D0C2A0020D9479B008B56CD /* SDLStreamingVideoLifecycleManager.h in Headers */,
5D61FD631A84238C00846EE7 /* SDLResetGlobalProperties.h in Headers */,
@@ -6375,6 +6525,7 @@
5D61FC821A84238C00846EE7 /* SDLDeviceInfo.h in Headers */,
5DD60D98221C5D7D00A82A4F /* SDLVersion.h in Headers */,
5D61FCA91A84238C00846EE7 /* SDLFileType.h in Headers */,
+ 756C62762289F11F008B57A2 /* SDLDynamicMenuUpdateRunScore.h in Headers */,
8877F5EE1F34A72200DC128A /* SDLSendHapticDataResponse.h in Headers */,
DA8966F21E56973700413EAB /* SDLStreamingMediaManagerConstants.h in Headers */,
883C22C8222ED84D00939C4C /* SDLRPCFunctionNames.h in Headers */,
@@ -6400,6 +6551,7 @@
5D61FDE31A84238C00846EE7 /* SDLUnregisterAppInterface.h in Headers */,
5D61FD331A84238C00846EE7 /* SDLPowerModeQualificationStatus.h in Headers */,
5D92937020B5E0E500FCC775 /* SDLDeleteChoicesOperation.h in Headers */,
+ 5DA150CD2271FE180032928D /* SDLSoftButtonReplaceOperation.h in Headers */,
5D61FE011A84238C00846EE7 /* SDLVehicleDataNotificationStatus.h in Headers */,
5D61FDC91A84238C00846EE7 /* SDLTextField.h in Headers */,
5D6F7A351BC5B9B60070BF37 /* SDLLockScreenViewController.h in Headers */,
@@ -6491,6 +6643,7 @@
8B9376D71F3349FC009605C4 /* SDLMetadataTags.h in Headers */,
5D61FD471A84238C00846EE7 /* SDLProtocolListener.h in Headers */,
EE28F9E3209802A500B1B61D /* SDLStreamingProtocolDelegate.h in Headers */,
+ 88BCEA922266250B00BB7E70 /* SDLIAPControlSession.h in Headers */,
5D61FCA01A84238C00846EE7 /* SDLEncodedSyncPDataResponse.h in Headers */,
5D61FD271A84238C00846EE7 /* SDLPerformAudioPassThruResponse.h in Headers */,
5D61FD251A84238C00846EE7 /* SDLPerformAudioPassThru.h in Headers */,
@@ -6515,6 +6668,7 @@
5D61FCAD1A84238C00846EE7 /* SDLFunctionID.h in Headers */,
DA9F7E831DCC047200ACAE48 /* SDLWayPointType.h in Headers */,
5D61FDF51A84238C00846EE7 /* SDLV1ProtocolHeader.h in Headers */,
+ 752ECDB6228B4D6B00D945F4 /* SDLDynamicMenuUpdateAlgorithm.h in Headers */,
5D92936320B3551600FCC775 /* SDLKeyboardDelegate.h in Headers */,
5D92936820B3601700FCC775 /* SDLChoiceSetManager.h in Headers */,
5DBF06351E64A9FE00A5CF03 /* SDLLogConstants.h in Headers */,
@@ -6683,7 +6837,7 @@
};
5D61FA1B1A84237100846EE7 = {
CreatedOnToolsVersion = 6.1.1;
- LastSwiftMigration = 0940;
+ LastSwiftMigration = 1020;
};
5D61FA251A84237100846EE7 = {
CreatedOnToolsVersion = 6.1.1;
@@ -6890,6 +7044,7 @@
1EB59CC4202DB40400343A61 /* SDLSeatControlCapabilities.m in Sources */,
5D61FD261A84238C00846EE7 /* SDLPerformAudioPassThru.m in Sources */,
1EAA471E203410BB000FE74B /* SDLAudioControlCapabilities.m in Sources */,
+ 88BCEA932266250B00BB7E70 /* SDLIAPControlSession.m in Sources */,
5D61FC971A84238C00846EE7 /* SDLECallConfirmationStatus.m in Sources */,
8816772D222097C3001FACFF /* SDLNavigationServiceData.m in Sources */,
1E5AD04D1F1F79640029B8AF /* SDLDefrostZone.m in Sources */,
@@ -6990,6 +7145,7 @@
5D61FD3C1A84238C00846EE7 /* SDLPresetBankCapabilities.m in Sources */,
5D4631151F2136B60092EFDC /* SDLControlFramePayloadNak.m in Sources */,
5D61FDB81A84238C00846EE7 /* SDLSyncPData.m in Sources */,
+ 880FE6282267AE5300723732 /* SDLIAPConstants.m in Sources */,
5D61FD221A84238C00846EE7 /* SDLOnVehicleData.m in Sources */,
5D61FCD41A84238C00846EE7 /* SDLImageResolution.m in Sources */,
5D61FDF41A84238C00846EE7 /* SDLUpdateTurnListResponse.m in Sources */,
@@ -7025,6 +7181,7 @@
88EEC5BC220A327B005AA2F9 /* SDLPublishAppServiceResponse.m in Sources */,
5D61FC951A84238C00846EE7 /* SDLDriverDistractionState.m in Sources */,
5DB996611F28C6ED002D8795 /* SDLControlFramePayloadVideoStartServiceAck.m in Sources */,
+ 5D75961222972FCA0013207C /* SDLSystemCapabilityObserver.m in Sources */,
884E702021FB983F008D53BA /* SDLAppServiceManifest.m in Sources */,
5D61FD961A84238C00846EE7 /* SDLShowResponse.m in Sources */,
5D61FD981A84238C00846EE7 /* SDLSingleTireStatus.m in Sources */,
@@ -7035,12 +7192,14 @@
5D61FD461A84238C00846EE7 /* SDLProtocolHeader.m in Sources */,
5DD8406320FCD6C10082CE04 /* SDLElectronicParkBrakeStatus.m in Sources */,
8BBEA6071F324165003EEA26 /* SDLMetadataType.m in Sources */,
+ 5DA150C82271FDC20032928D /* SDLSoftButtonTransitionOperation.m in Sources */,
5D61FDBC1A84238C00846EE7 /* SDLSystemAction.m in Sources */,
5D61FC381A84238C00846EE7 /* SDLAlert.m in Sources */,
88AAD4BD2211B76800F1E6D7 /* SDLMediaServiceManifest.m in Sources */,
884E701C21FB8D0F008D53BA /* SDLPublishAppService.m in Sources */,
8831FA49220235B000B8FFB7 /* SDLAppServicesCapabilities.m in Sources */,
884E702421FBA952008D53BA /* SDLAppServiceType.m in Sources */,
+ 88D3EBCA2267949D00493C38 /* SDLIAPDataSession.m in Sources */,
5D61FD2C1A84238C00846EE7 /* SDLPerformInteractionResponse.m in Sources */,
5D00AC7C1F15287E004000D9 /* SDLPhoneCapability.m in Sources */,
5D61FDF21A84238C00846EE7 /* SDLUpdateTurnList.m in Sources */,
@@ -7052,6 +7211,7 @@
5D61FC5E1A84238C00846EE7 /* SDLChangeRegistrationResponse.m in Sources */,
5D8204231BCEA89A00D0A41B /* SDLFileManager.m in Sources */,
1EB59CC0202DA26000343A61 /* SDLSeatControlData.m in Sources */,
+ 8803DCF022C2B84B00FBB7CE /* SDLBackgroundTaskManager.m in Sources */,
5D61FC7D1A84238C00846EE7 /* SDLDeleteInteractionChoiceSetResponse.m in Sources */,
DAC572661D10C5640004288B /* CGPoint_Util.m in Sources */,
5D00AC681F140F0A004000D9 /* SDLSystemCapabilityType.m in Sources */,
@@ -7097,6 +7257,7 @@
1E5AD0651F207DD50029B8AF /* SDLTemperature.m in Sources */,
DA9F7E901DCC04C000ACAE48 /* SDLUnsubscribeWayPointsResponse.m in Sources */,
88F65137220C74FD00CAF321 /* SDLWeatherData.m in Sources */,
+ 5DA150CE2271FE180032928D /* SDLSoftButtonReplaceOperation.m in Sources */,
5DE372A21ACB2ED300849FAA /* SDLHMICapabilities.m in Sources */,
5D61FDD41A84238C00846EE7 /* SDLTouchEvent.m in Sources */,
5D61FD881A84238C00846EE7 /* SDLSetGlobalProperties.m in Sources */,
@@ -7142,6 +7303,7 @@
8818ADD92100FC18007D6F19 /* SDLTurnSignal.m in Sources */,
5D8B17541AC9E11B006A6E1C /* SDLDialNumberResponse.m in Sources */,
DA6223BE1E7B088200878689 /* CVPixelBufferRef+SDLUtil.m in Sources */,
+ 752ECDB7228B4D6B00D945F4 /* SDLDynamicMenuUpdateAlgorithm.m in Sources */,
1FF7DABC1F75B2BF00B46C30 /* SDLFocusableItemLocator.m in Sources */,
EED5CA021F4D18EC00F04000 /* SDLRAWH264Packetizer.m in Sources */,
5D61FC851A84238C00846EE7 /* SDLDeviceLevelStatus.m in Sources */,
@@ -7186,7 +7348,6 @@
5D61FCF11A84238C00846EE7 /* SDLLockScreenStatusManager.m in Sources */,
5D61FDAC1A84238C00846EE7 /* SDLStartTime.m in Sources */,
5D61FDA01A84238C00846EE7 /* SDLSoftButton.m in Sources */,
- E9C32B951AB20BA200F283AF /* SDLStreamDelegate.m in Sources */,
5D61FCD21A84238C00846EE7 /* SDLImageFieldName.m in Sources */,
5D61FD761A84238C00846EE7 /* SDLRPCResponse.m in Sources */,
5D3E48761D6F3B330000BFEF /* SDLAsynchronousOperation.m in Sources */,
@@ -7196,6 +7357,7 @@
880D267E220DE5DF00B3F496 /* SDLWeatherServiceManifest.m in Sources */,
5D9FC2A21FD8814A00ACA5C2 /* SDLAudioFile.m in Sources */,
E9C32B9F1AB20C5900F283AF /* EAAccessoryManager+SDLProtocols.m in Sources */,
+ 756C62772289F11F008B57A2 /* SDLDynamicMenuUpdateRunScore.m in Sources */,
5D61FDA81A84238C00846EE7 /* SDLSpeakResponse.m in Sources */,
5DB92D331AC9C8BA00C15BB0 /* SDLRPCStruct.m in Sources */,
1EAA474220355FF3000FE74B /* SDLLightControlCapabilities.m in Sources */,
@@ -7312,6 +7474,7 @@
162E83801A9BDE8B00906325 /* SDLHMIPermissionsSpec.m in Sources */,
1EAA476C2036A52F000FE74B /* SDLLightCapabilitiesSpec.m in Sources */,
5D1654561D3E754F00554D93 /* SDLLifecycleManagerSpec.m in Sources */,
+ 752ECDBB228C532600D945F4 /* SDLMenuUpdateAlgorithmSpec.m in Sources */,
1EE8C43A1F347D4D00FDC2CF /* SDLRadioStateSpec.m in Sources */,
162E83021A9BDE8B00906325 /* SDLTouchTypeSpec.m in Sources */,
1EAA47722036AEF5000FE74B /* SDLLightNameSpec.m in Sources */,
@@ -7319,6 +7482,7 @@
88DF999122035D5A00477AC1 /* SDLIAPTransportSpec.m in Sources */,
162E838A1A9BDE8B00906325 /* SDLSingleTireStatusSpec.m in Sources */,
5D6EB4CC1BF28DC600693731 /* NSMapTable+SubscriptingSpec.m in Sources */,
+ 88F37A4D226F84BE00DF119B /* SDLIAPDataSessionSpec.m in Sources */,
162E83051A9BDE8B00906325 /* SDLVehicleDataActiveStatusSpec.m in Sources */,
162E82E61A9BDE8B00906325 /* SDLInteractionModeSpec.m in Sources */,
888F8700221DF4880052FE4C /* SDLAsynchronousRPCOperationSpec.m in Sources */,
@@ -7369,12 +7533,14 @@
162E837E1A9BDE8B00906325 /* SDLGPSDataSpec.m in Sources */,
5DAE06731BDEC6C000F9B498 /* SDLFileSpec.m in Sources */,
162E82E11A9BDE8B00906325 /* SDLHMIZoneCapabilitiesSpec.m in Sources */,
+ 5D75960D22972F830013207C /* TestSystemCapabilityObserver.m in Sources */,
88B58DBD222042500011B063 /* SDLDirectionSpec.m in Sources */,
162E83721A9BDE8B00906325 /* SDLAudioPassThruCapabilitiesSpec.m in Sources */,
162E83681A9BDE8B00906325 /* SDLSpeakResponseSpec.m in Sources */,
1EB59CD8202DCCD500343A61 /* SDLMassageCushionFirmnessSpec.m in Sources */,
162E83661A9BDE8B00906325 /* SDLShowResponseSpec.m in Sources */,
5D9F50831BEA5C6100FEF399 /* SDLFileManagerSpec.m in Sources */,
+ 88BCEA952266592D00BB7E70 /* SDLIAPControlSessionSpec.m in Sources */,
88AAD4C02211B7E200F1E6D7 /* SDLMediaServiceManifestSpec.m in Sources */,
5DAB5F512098994C00A020C8 /* SDLMenuCellSpec.m in Sources */,
1EE8C4481F38430900FDC2CF /* SDLRadioControlCapabilitiesSpec.m in Sources */,
@@ -7456,7 +7622,9 @@
162E83171A9BDE8B00906325 /* SDLOnHMIStatusSpec.m in Sources */,
8831FA392201E3D100B8FFB7 /* SDLAppServiceManifestSpec.m in Sources */,
5DE372A41ACB336600849FAA /* SDLHMICapabilitiesSpec.m in Sources */,
+ 5DA150D32273676A0032928D /* SDLSoftButtonReplaceOperationSpec.m in Sources */,
162E82F71A9BDE8B00906325 /* SDLResultSpec.m in Sources */,
+ 88DDD0F9229ECA57002F9623 /* SDLIAPConstantsSpec.m in Sources */,
1680B1141A9CD7AD00DBD79E /* SDLV1ProtocolHeaderSpec.m in Sources */,
880D2680220E038800B3F496 /* SDLWeatherServiceManifestSpec.m in Sources */,
88EEC5BE220A3B8B005AA2F9 /* SDLPublishAppServiceResponseSpec.m in Sources */,
@@ -7517,6 +7685,7 @@
5DA23FF61F2FAA31009C0313 /* SDLControlFramePayloadRPCStartServiceSpec.m in Sources */,
162E83201A9BDE8B00906325 /* SDLOnVehicleDataSpec.m in Sources */,
1EAA47762036B847000FE74B /* SDLEqualizerSettingsSpec.m in Sources */,
+ 752ECDB9228C42E100D945F4 /* SDLMenuRunScoreSpec.m in Sources */,
162E83141A9BDE8B00906325 /* SDLOnDriverDistractionSpec.m in Sources */,
162E83371A9BDE8B00906325 /* SDLResetGlobalPropertiesSpec.m in Sources */,
162E82DF1A9BDE8B00906325 /* SDLGlobalProperySpec.m in Sources */,
@@ -7676,6 +7845,7 @@
5D0A9F931F15560B00CC80DD /* SDLNavigationCapabilitySpec.m in Sources */,
5D64FE7120DA9E6700792F9F /* SDLStreamingAudioLifecycleManagerSpec.m in Sources */,
162E83891A9BDE8B00906325 /* SDLScreenParamsSpec.m in Sources */,
+ 5DA150D1227367580032928D /* SDLSoftButtonTransitionOperationSpec.m in Sources */,
162E83441A9BDE8B00906325 /* SDLSystemRequestSpec.m in Sources */,
162E83001A9BDE8B00906325 /* SDLTextFieldNameSpec.m in Sources */,
DA4353EA1D2721680099B8C4 /* SDLTouchManagerSpec.m in Sources */,
@@ -7913,7 +8083,7 @@
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
- SWIFT_VERSION = 4.2;
+ SWIFT_VERSION = 5.0;
};
name = Debug;
};
@@ -7961,7 +8131,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
- SWIFT_VERSION = 4.2;
+ SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
diff --git a/SmartDeviceLink.podspec b/SmartDeviceLink.podspec
index ec64518c4..17fa2cfc8 100644
--- a/SmartDeviceLink.podspec
+++ b/SmartDeviceLink.podspec
@@ -1,13 +1,13 @@
Pod::Spec.new do |s|
s.name = "SmartDeviceLink"
-s.version = "6.2.3"
+s.version = "6.3.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" => "developer@smartdevicelink.com" }
s.platform = :ios, "8.0"
-s.dependency 'BiSON', '~> 1.1.1'
+s.dependency 'BiSON', '~> 1.2.0'
s.source = { :git => "https://github.com/smartdevicelink/sdl_ios.git", :tag => s.version.to_s }
s.requires_arc = true
s.swift_version = '4.2'
@@ -44,6 +44,7 @@ sdefault.public_header_files = [
'SmartDeviceLink/SDLAudioControlData.h',
'SmartDeviceLink/SDLAudioControlCapabilities.h',
'SmartDeviceLink/SDLAudioPassThruCapabilities.h',
+'SmartDeviceLink/SDLAudioFile.h',
'SmartDeviceLink/SDLAudioStreamingState.h',
'SmartDeviceLink/SDLAudioStreamingIndicator.h',
'SmartDeviceLink/SDLAudioStreamManager.h',
@@ -205,6 +206,7 @@ sdefault.public_header_files = [
'SmartDeviceLink/SDLMediaServiceManifest.h',
'SmartDeviceLink/SDLMediaType.h',
'SmartDeviceLink/SDLMenuCell.h',
+'SmartDeviceLink/SDLMenuManagerConstants.h',
'SmartDeviceLink/SDLMenuParams.h',
'SmartDeviceLink/SDLMetadataTags.h',
'SmartDeviceLink/SDLMetadataType.h',
diff --git a/SmartDeviceLink/Info.plist b/SmartDeviceLink/Info.plist
index a140cf4b0..8761e930d 100644
--- a/SmartDeviceLink/Info.plist
+++ b/SmartDeviceLink/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 6.2.3
+ 6.3.0
CFBundleSignature
????
CFBundleVersion
diff --git a/SmartDeviceLink/SDLAddCommand.m b/SmartDeviceLink/SDLAddCommand.m
index 074db8846..0613f3193 100644
--- a/SmartDeviceLink/SDLAddCommand.m
+++ b/SmartDeviceLink/SDLAddCommand.m
@@ -14,11 +14,14 @@
@implementation SDLAddCommand
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameAddCommand]) {
}
return self;
}
+#pragma clang diagnostic pop
- (instancetype)initWithHandler:(nullable SDLRPCCommandNotificationHandler)handler {
self = [self init];
@@ -103,36 +106,36 @@ - (instancetype)initWithId:(UInt32)commandId vrCommands:(nullable NSArray *)cmdID {
- [parameters sdl_setObject:cmdID forName:SDLRPCParameterNameCommandId];
+ [self.parameters sdl_setObject:cmdID forName:SDLRPCParameterNameCommandId];
}
- (NSNumber *)cmdID {
NSError *error = nil;
- return [parameters sdl_objectForName:SDLRPCParameterNameCommandId ofClass:NSNumber.class error:&error];
+ return [self.parameters sdl_objectForName:SDLRPCParameterNameCommandId ofClass:NSNumber.class error:&error];
}
- (void)setMenuParams:(nullable SDLMenuParams *)menuParams {
- [parameters sdl_setObject:menuParams forName:SDLRPCParameterNameMenuParams];
+ [self.parameters sdl_setObject:menuParams forName:SDLRPCParameterNameMenuParams];
}
- (nullable SDLMenuParams *)menuParams {
- return [parameters sdl_objectForName:SDLRPCParameterNameMenuParams ofClass:SDLMenuParams.class error:nil];
+ return [self.parameters sdl_objectForName:SDLRPCParameterNameMenuParams ofClass:SDLMenuParams.class error:nil];
}
- (void)setVrCommands:(nullable NSArray *)vrCommands {
- [parameters sdl_setObject:vrCommands forName:SDLRPCParameterNameVRCommands];
+ [self.parameters sdl_setObject:vrCommands forName:SDLRPCParameterNameVRCommands];
}
- (nullable NSArray *)vrCommands {
- return [parameters sdl_objectsForName:SDLRPCParameterNameVRCommands ofClass:NSString.class error:nil];
+ return [self.parameters sdl_objectsForName:SDLRPCParameterNameVRCommands ofClass:NSString.class error:nil];
}
- (void)setCmdIcon:(nullable SDLImage *)cmdIcon {
- [parameters sdl_setObject:cmdIcon forName:SDLRPCParameterNameCommandIcon];
+ [self.parameters sdl_setObject:cmdIcon forName:SDLRPCParameterNameCommandIcon];
}
- (nullable SDLImage *)cmdIcon {
- return [parameters sdl_objectForName:SDLRPCParameterNameCommandIcon ofClass:SDLImage.class error:nil];
+ return [self.parameters sdl_objectForName:SDLRPCParameterNameCommandIcon ofClass:SDLImage.class error:nil];
}
-(id)copyWithZone:(nullable NSZone *)zone {
diff --git a/SmartDeviceLink/SDLAddCommandResponse.m b/SmartDeviceLink/SDLAddCommandResponse.m
index 2caf3c6e7..1906f7f64 100644
--- a/SmartDeviceLink/SDLAddCommandResponse.m
+++ b/SmartDeviceLink/SDLAddCommandResponse.m
@@ -10,11 +10,14 @@
@implementation SDLAddCommandResponse
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameAddCommand]) {
}
return self;
}
+#pragma clang diagnostic pop
@end
diff --git a/SmartDeviceLink/SDLAddSubMenu.m b/SmartDeviceLink/SDLAddSubMenu.m
index 3a79563a4..48ea43c8a 100644
--- a/SmartDeviceLink/SDLAddSubMenu.m
+++ b/SmartDeviceLink/SDLAddSubMenu.m
@@ -11,11 +11,14 @@
@implementation SDLAddSubMenu
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameAddSubMenu]) {
}
return self;
}
+#pragma clang diagnostic pop
- (instancetype)initWithId:(UInt32)menuId menuName:(NSString *)menuName menuIcon:(nullable SDLImage *)icon position:(UInt8)position {
self = [self initWithId:menuId menuName:menuName];
@@ -44,37 +47,37 @@ - (instancetype)initWithId:(UInt32)menuId menuName:(NSString *)menuName {
}
- (void)setMenuID:(NSNumber *)menuID {
- [parameters sdl_setObject:menuID forName:SDLRPCParameterNameMenuId];
+ [self.parameters sdl_setObject:menuID forName:SDLRPCParameterNameMenuId];
}
- (NSNumber *)menuID {
NSError *error = nil;
- return [parameters sdl_objectForName:SDLRPCParameterNameMenuId ofClass:NSNumber.class error:&error];
+ return [self.parameters sdl_objectForName:SDLRPCParameterNameMenuId ofClass:NSNumber.class error:&error];
}
- (void)setPosition:(nullable NSNumber *)position {
- [parameters sdl_setObject:position forName:SDLRPCParameterNamePosition];
+ [self.parameters sdl_setObject:position forName:SDLRPCParameterNamePosition];
}
- (nullable NSNumber *)position {
- return [parameters sdl_objectForName:SDLRPCParameterNamePosition ofClass:NSNumber.class error:nil];
+ return [self.parameters sdl_objectForName:SDLRPCParameterNamePosition ofClass:NSNumber.class error:nil];
}
- (void)setMenuName:(NSString *)menuName {
- [parameters sdl_setObject:menuName forName:SDLRPCParameterNameMenuName];
+ [self.parameters sdl_setObject:menuName forName:SDLRPCParameterNameMenuName];
}
- (NSString *)menuName {
NSError *error = nil;
- return [parameters sdl_objectForName:SDLRPCParameterNameMenuName ofClass:NSString.class error:&error];
+ return [self.parameters sdl_objectForName:SDLRPCParameterNameMenuName ofClass:NSString.class error:&error];
}
- (void)setMenuIcon:(nullable SDLImage *)menuIcon {
- [parameters sdl_setObject:menuIcon forName:SDLRPCParameterNameMenuIcon];
+ [self.parameters sdl_setObject:menuIcon forName:SDLRPCParameterNameMenuIcon];
}
- (nullable SDLImage *)menuIcon {
- return [parameters sdl_objectForName:SDLRPCParameterNameMenuIcon ofClass:[SDLImage class] error:nil];
+ return [self.parameters sdl_objectForName:SDLRPCParameterNameMenuIcon ofClass:[SDLImage class] error:nil];
}
@end
diff --git a/SmartDeviceLink/SDLAddSubMenuResponse.m b/SmartDeviceLink/SDLAddSubMenuResponse.m
index 78376e491..e47fe724b 100644
--- a/SmartDeviceLink/SDLAddSubMenuResponse.m
+++ b/SmartDeviceLink/SDLAddSubMenuResponse.m
@@ -10,11 +10,14 @@
@implementation SDLAddSubMenuResponse
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameAddSubMenu]) {
}
return self;
}
+#pragma clang diagnostic pop
@end
diff --git a/SmartDeviceLink/SDLAirbagStatus.m b/SmartDeviceLink/SDLAirbagStatus.m
index a13f525f8..650a2c5ba 100644
--- a/SmartDeviceLink/SDLAirbagStatus.m
+++ b/SmartDeviceLink/SDLAirbagStatus.m
@@ -10,74 +10,74 @@
@implementation SDLAirbagStatus
- (void)setDriverAirbagDeployed:(SDLVehicleDataEventStatus)driverAirbagDeployed {
- [store sdl_setObject:driverAirbagDeployed forName:SDLRPCParameterNameDriverAirbagDeployed];
+ [self.store sdl_setObject:driverAirbagDeployed forName:SDLRPCParameterNameDriverAirbagDeployed];
}
- (SDLVehicleDataEventStatus)driverAirbagDeployed {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameDriverAirbagDeployed error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameDriverAirbagDeployed error:&error];
}
- (void)setDriverSideAirbagDeployed:(SDLVehicleDataEventStatus)driverSideAirbagDeployed {
- [store sdl_setObject:driverSideAirbagDeployed forName:SDLRPCParameterNameDriverSideAirbagDeployed];
+ [self.store sdl_setObject:driverSideAirbagDeployed forName:SDLRPCParameterNameDriverSideAirbagDeployed];
}
- (SDLVehicleDataEventStatus)driverSideAirbagDeployed {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameDriverSideAirbagDeployed error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameDriverSideAirbagDeployed error:&error];
}
- (void)setDriverCurtainAirbagDeployed:(SDLVehicleDataEventStatus)driverCurtainAirbagDeployed {
- [store sdl_setObject:driverCurtainAirbagDeployed forName:SDLRPCParameterNameDriverCurtainAirbagDeployed];
+ [self.store sdl_setObject:driverCurtainAirbagDeployed forName:SDLRPCParameterNameDriverCurtainAirbagDeployed];
}
- (SDLVehicleDataEventStatus)driverCurtainAirbagDeployed {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameDriverCurtainAirbagDeployed error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameDriverCurtainAirbagDeployed error:&error];
}
- (void)setPassengerAirbagDeployed:(SDLVehicleDataEventStatus)passengerAirbagDeployed {
- [store sdl_setObject:passengerAirbagDeployed forName:SDLRPCParameterNamePassengerAirbagDeployed];}
+ [self.store sdl_setObject:passengerAirbagDeployed forName:SDLRPCParameterNamePassengerAirbagDeployed];}
- (SDLVehicleDataEventStatus)passengerAirbagDeployed {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNamePassengerAirbagDeployed error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNamePassengerAirbagDeployed error:&error];
}
- (void)setPassengerCurtainAirbagDeployed:(SDLVehicleDataEventStatus)passengerCurtainAirbagDeployed {
- [store sdl_setObject:passengerCurtainAirbagDeployed forName:SDLRPCParameterNamePassengerCurtainAirbagDeployed];
+ [self.store sdl_setObject:passengerCurtainAirbagDeployed forName:SDLRPCParameterNamePassengerCurtainAirbagDeployed];
}
- (SDLVehicleDataEventStatus)passengerCurtainAirbagDeployed {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNamePassengerCurtainAirbagDeployed error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNamePassengerCurtainAirbagDeployed error:&error];
}
- (void)setDriverKneeAirbagDeployed:(SDLVehicleDataEventStatus)driverKneeAirbagDeployed {
- [store sdl_setObject:driverKneeAirbagDeployed forName:SDLRPCParameterNameDriverKneeAirbagDeployed];
+ [self.store sdl_setObject:driverKneeAirbagDeployed forName:SDLRPCParameterNameDriverKneeAirbagDeployed];
}
- (SDLVehicleDataEventStatus)driverKneeAirbagDeployed {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameDriverKneeAirbagDeployed error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameDriverKneeAirbagDeployed error:&error];
}
- (void)setPassengerSideAirbagDeployed:(SDLVehicleDataEventStatus)passengerSideAirbagDeployed {
- [store sdl_setObject:passengerSideAirbagDeployed forName:SDLRPCParameterNamePassengerSideAirbagDeployed];
+ [self.store sdl_setObject:passengerSideAirbagDeployed forName:SDLRPCParameterNamePassengerSideAirbagDeployed];
}
- (SDLVehicleDataEventStatus)passengerSideAirbagDeployed {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNamePassengerSideAirbagDeployed error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNamePassengerSideAirbagDeployed error:&error];
}
- (void)setPassengerKneeAirbagDeployed:(SDLVehicleDataEventStatus)passengerKneeAirbagDeployed {
- [store sdl_setObject:passengerKneeAirbagDeployed forName:SDLRPCParameterNamePassengerKneeAirbagDeployed];
+ [self.store sdl_setObject:passengerKneeAirbagDeployed forName:SDLRPCParameterNamePassengerKneeAirbagDeployed];
}
- (SDLVehicleDataEventStatus)passengerKneeAirbagDeployed {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNamePassengerKneeAirbagDeployed error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNamePassengerKneeAirbagDeployed error:&error];
}
@end
diff --git a/SmartDeviceLink/SDLAlert.m b/SmartDeviceLink/SDLAlert.m
index 7c9fa67f5..120ed6fe7 100644
--- a/SmartDeviceLink/SDLAlert.m
+++ b/SmartDeviceLink/SDLAlert.m
@@ -14,11 +14,14 @@
@implementation SDLAlert
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameAlert]) {
}
return self;
}
+#pragma clang diagnostic pop
- (instancetype)initWithAlertText1:(nullable NSString *)alertText1 alertText2:(nullable NSString *)alertText2 alertText3:(nullable NSString *)alertText3 {
return [self initWithAlertText1:alertText1 alertText2:alertText2 alertText3:alertText3 duration:SDLDefaultDuration];
@@ -75,67 +78,67 @@ - (instancetype)initWithTTSChunks:(nullable NSArray *)ttsChunks a
}
- (void)setAlertText1:(nullable NSString *)alertText1 {
- [parameters sdl_setObject:alertText1 forName:SDLRPCParameterNameAlertText1];
+ [self.parameters sdl_setObject:alertText1 forName:SDLRPCParameterNameAlertText1];
}
- (nullable NSString *)alertText1 {
- return [parameters sdl_objectForName:SDLRPCParameterNameAlertText1 ofClass:NSString.class error:nil];
+ return [self.parameters sdl_objectForName:SDLRPCParameterNameAlertText1 ofClass:NSString.class error:nil];
}
- (void)setAlertText2:(nullable NSString *)alertText2 {
- [parameters sdl_setObject:alertText2 forName:SDLRPCParameterNameAlertText2];
+ [self.parameters sdl_setObject:alertText2 forName:SDLRPCParameterNameAlertText2];
}
- (nullable NSString *)alertText2 {
- return [parameters sdl_objectForName:SDLRPCParameterNameAlertText2 ofClass:NSString.class error:nil];
+ return [self.parameters sdl_objectForName:SDLRPCParameterNameAlertText2 ofClass:NSString.class error:nil];
}
- (void)setAlertText3:(nullable NSString *)alertText3 {
- [parameters sdl_setObject:alertText3 forName:SDLRPCParameterNameAlertText3];
+ [self.parameters sdl_setObject:alertText3 forName:SDLRPCParameterNameAlertText3];
}
- (nullable NSString *)alertText3 {
- return [parameters sdl_objectForName:SDLRPCParameterNameAlertText3 ofClass:NSString.class error:nil];
+ return [self.parameters sdl_objectForName:SDLRPCParameterNameAlertText3 ofClass:NSString.class error:nil];
}
- (void)setTtsChunks:(nullable NSArray *)ttsChunks {
- [parameters sdl_setObject:ttsChunks forName:SDLRPCParameterNameTTSChunks];
+ [self.parameters sdl_setObject:ttsChunks forName:SDLRPCParameterNameTTSChunks];
}
- (nullable NSArray *)ttsChunks {
- return [parameters sdl_objectsForName:SDLRPCParameterNameTTSChunks ofClass:SDLTTSChunk.class error:nil];
+ return [self.parameters sdl_objectsForName:SDLRPCParameterNameTTSChunks ofClass:SDLTTSChunk.class error:nil];
}
- (void)setDuration:(nullable NSNumber *)duration {
- [parameters sdl_setObject:duration forName:SDLRPCParameterNameDuration];
+ [self.parameters sdl_setObject:duration forName:SDLRPCParameterNameDuration];
}
- (nullable NSNumber *)duration {
- return [parameters sdl_objectForName:SDLRPCParameterNameDuration ofClass:NSNumber.class error:nil];
+ return [self.parameters sdl_objectForName:SDLRPCParameterNameDuration ofClass:NSNumber.class error:nil];
}
- (void)setPlayTone:(nullable NSNumber *)playTone {
- [parameters sdl_setObject:playTone forName:SDLRPCParameterNamePlayTone];
+ [self.parameters sdl_setObject:playTone forName:SDLRPCParameterNamePlayTone];
}
- (nullable NSNumber *)playTone {
- return [parameters sdl_objectForName:SDLRPCParameterNamePlayTone ofClass:NSNumber.class error:nil];
+ return [self.parameters sdl_objectForName:SDLRPCParameterNamePlayTone ofClass:NSNumber.class error:nil];
}
- (void)setProgressIndicator:(nullable NSNumber *)progressIndicator {
- [parameters sdl_setObject:progressIndicator forName:SDLRPCParameterNameProgressIndicator];
+ [self.parameters sdl_setObject:progressIndicator forName:SDLRPCParameterNameProgressIndicator];
}
- (nullable NSNumber *)progressIndicator {
- return [parameters sdl_objectForName:SDLRPCParameterNameProgressIndicator ofClass:NSNumber.class error:nil];
+ return [self.parameters sdl_objectForName:SDLRPCParameterNameProgressIndicator ofClass:NSNumber.class error:nil];
}
- (void)setSoftButtons:(nullable NSArray *)softButtons {
- [parameters sdl_setObject:softButtons forName:SDLRPCParameterNameSoftButtons];
+ [self.parameters sdl_setObject:softButtons forName:SDLRPCParameterNameSoftButtons];
}
- (nullable NSArray *)softButtons {
- return [parameters sdl_objectsForName:SDLRPCParameterNameSoftButtons ofClass:SDLSoftButton.class error:nil];
+ return [self.parameters sdl_objectsForName:SDLRPCParameterNameSoftButtons ofClass:SDLSoftButton.class error:nil];
}
@end
diff --git a/SmartDeviceLink/SDLAlertManeuver.m b/SmartDeviceLink/SDLAlertManeuver.m
index 7eb01682a..c92ee6bd6 100644
--- a/SmartDeviceLink/SDLAlertManeuver.m
+++ b/SmartDeviceLink/SDLAlertManeuver.m
@@ -14,11 +14,14 @@
@implementation SDLAlertManeuver
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameAlertManeuver]) {
}
return self;
}
+#pragma clang diagnostic pop
- (instancetype)initWithTTS:(nullable NSString *)ttsText softButtons:(nullable NSArray *)softButtons {
@@ -39,19 +42,19 @@ - (instancetype)initWithTTSChunks:(nullable NSArray *)ttsChunks s
}
- (void)setTtsChunks:(nullable NSArray *)ttsChunks {
- [parameters sdl_setObject:ttsChunks forName:SDLRPCParameterNameTTSChunks];
+ [self.parameters sdl_setObject:ttsChunks forName:SDLRPCParameterNameTTSChunks];
}
- (nullable NSArray *)ttsChunks {
- return [parameters sdl_objectsForName:SDLRPCParameterNameTTSChunks ofClass:SDLTTSChunk.class error:nil];
+ return [self.parameters sdl_objectsForName:SDLRPCParameterNameTTSChunks ofClass:SDLTTSChunk.class error:nil];
}
- (void)setSoftButtons:(nullable NSArray *)softButtons {
- [parameters sdl_setObject:softButtons forName:SDLRPCParameterNameSoftButtons];
+ [self.parameters sdl_setObject:softButtons forName:SDLRPCParameterNameSoftButtons];
}
- (nullable NSArray *)softButtons {
- return [parameters sdl_objectsForName:SDLRPCParameterNameSoftButtons ofClass:SDLSoftButton.class error:nil];
+ return [self.parameters sdl_objectsForName:SDLRPCParameterNameSoftButtons ofClass:SDLSoftButton.class error:nil];
}
@end
diff --git a/SmartDeviceLink/SDLAlertManeuverResponse.m b/SmartDeviceLink/SDLAlertManeuverResponse.m
index 150678cba..89c0f3331 100644
--- a/SmartDeviceLink/SDLAlertManeuverResponse.m
+++ b/SmartDeviceLink/SDLAlertManeuverResponse.m
@@ -11,11 +11,14 @@
@implementation SDLAlertManeuverResponse
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameAlertManeuver]) {
}
return self;
}
+#pragma clang diagnostic pop
@end
diff --git a/SmartDeviceLink/SDLAlertResponse.m b/SmartDeviceLink/SDLAlertResponse.m
index a35890723..401b29e76 100644
--- a/SmartDeviceLink/SDLAlertResponse.m
+++ b/SmartDeviceLink/SDLAlertResponse.m
@@ -11,17 +11,20 @@
@implementation SDLAlertResponse
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameAlert]) {
}
return self;
}
+#pragma clang diagnostic pop
- (void)setTryAgainTime:(nullable NSNumber *)tryAgainTime {
- [parameters sdl_setObject:tryAgainTime forName:SDLRPCParameterNameTryAgainTime];}
+ [self.parameters sdl_setObject:tryAgainTime forName:SDLRPCParameterNameTryAgainTime];}
- (nullable NSNumber *)tryAgainTime {
- return [parameters sdl_objectForName:SDLRPCParameterNameTryAgainTime ofClass:NSNumber.class error:nil];
+ return [self.parameters sdl_objectForName:SDLRPCParameterNameTryAgainTime ofClass:NSNumber.class error:nil];
}
@end
diff --git a/SmartDeviceLink/SDLAppInfo.m b/SmartDeviceLink/SDLAppInfo.m
index 431382f91..1b7ec0150 100644
--- a/SmartDeviceLink/SDLAppInfo.m
+++ b/SmartDeviceLink/SDLAppInfo.m
@@ -27,30 +27,30 @@ + (instancetype)currentAppInfo {
}
- (void)setAppDisplayName:(NSString *)appDisplayName {
- [store sdl_setObject:appDisplayName forName:SDLRPCParameterNameAppDisplayName];
+ [self.store sdl_setObject:appDisplayName forName:SDLRPCParameterNameAppDisplayName];
}
- (NSString *)appDisplayName {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameAppDisplayName ofClass:NSString.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameAppDisplayName ofClass:NSString.class error:&error];
}
- (void)setAppBundleID:(NSString *)appBundleID {
- [store sdl_setObject:appBundleID forName:SDLRPCParameterNameAppBundleId];
+ [self.store sdl_setObject:appBundleID forName:SDLRPCParameterNameAppBundleId];
}
- (NSString *)appBundleID {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameAppBundleId ofClass:NSString.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameAppBundleId ofClass:NSString.class error:&error];
}
- (void)setAppVersion:(NSString *)appVersion {
- [store sdl_setObject:appVersion forName:SDLRPCParameterNameAppVersion];
+ [self.store sdl_setObject:appVersion forName:SDLRPCParameterNameAppVersion];
}
- (NSString *)appVersion {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameAppVersion ofClass:NSString.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameAppVersion ofClass:NSString.class error:&error];
}
@end
diff --git a/SmartDeviceLink/SDLAppServiceCapability.m b/SmartDeviceLink/SDLAppServiceCapability.m
index 19e30d607..595540cf4 100644
--- a/SmartDeviceLink/SDLAppServiceCapability.m
+++ b/SmartDeviceLink/SDLAppServiceCapability.m
@@ -40,20 +40,20 @@ - (instancetype)initWithUpdateReason:(nullable SDLServiceUpdateReason)updateReas
}
- (void)setUpdateReason:(nullable SDLServiceUpdateReason)updateReason {
- [store sdl_setObject:updateReason forName:SDLRPCParameterNameUpdateReason];
+ [self.store sdl_setObject:updateReason forName:SDLRPCParameterNameUpdateReason];
}
- (nullable SDLServiceUpdateReason)updateReason {
- return [store sdl_enumForName:SDLRPCParameterNameUpdateReason error:nil];
+ return [self.store sdl_enumForName:SDLRPCParameterNameUpdateReason error:nil];
}
- (void)setUpdatedAppServiceRecord:(SDLAppServiceRecord *)updatedAppServiceRecord {
- [store sdl_setObject:updatedAppServiceRecord forName:SDLRPCParameterNameUpdatedAppServiceRecord];
+ [self.store sdl_setObject:updatedAppServiceRecord forName:SDLRPCParameterNameUpdatedAppServiceRecord];
}
- (SDLAppServiceRecord *)updatedAppServiceRecord {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameUpdatedAppServiceRecord ofClass:SDLAppServiceRecord.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameUpdatedAppServiceRecord ofClass:SDLAppServiceRecord.class error:&error];
}
@end
diff --git a/SmartDeviceLink/SDLAppServiceData.m b/SmartDeviceLink/SDLAppServiceData.m
index 5381211c5..13565a7af 100644
--- a/SmartDeviceLink/SDLAppServiceData.m
+++ b/SmartDeviceLink/SDLAppServiceData.m
@@ -78,45 +78,45 @@ - (instancetype)initWithAppServiceType:(SDLAppServiceType)serviceType serviceId:
}
- (void)setServiceType:(NSString *)serviceType {
- [store sdl_setObject:serviceType forName:SDLRPCParameterNameServiceType];
+ [self.store sdl_setObject:serviceType forName:SDLRPCParameterNameServiceType];
}
- (NSString *)serviceType {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameServiceType ofClass:NSString.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameServiceType ofClass:NSString.class error:&error];
}
- (void)setServiceId:(NSString *)serviceId {
- [store sdl_setObject:serviceId forName:SDLRPCParameterNameServiceID];
+ [self.store sdl_setObject:serviceId forName:SDLRPCParameterNameServiceID];
}
- (NSString *)serviceId {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameServiceID ofClass:NSString.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameServiceID ofClass:NSString.class error:&error];
}
- (void)setWeatherServiceData:(nullable SDLWeatherServiceData *)weatherServiceData {
- [store sdl_setObject:weatherServiceData forName:SDLRPCParameterNameWeatherServiceData];
+ [self.store sdl_setObject:weatherServiceData forName:SDLRPCParameterNameWeatherServiceData];
}
- (nullable SDLWeatherServiceData *)weatherServiceData {
- return [store sdl_objectForName:SDLRPCParameterNameWeatherServiceData ofClass:SDLWeatherServiceData.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameWeatherServiceData ofClass:SDLWeatherServiceData.class error:nil];
}
- (void)setMediaServiceData:(nullable SDLMediaServiceData *)mediaServiceData {
- [store sdl_setObject:mediaServiceData forName:SDLRPCParameterNameMediaServiceData];
+ [self.store sdl_setObject:mediaServiceData forName:SDLRPCParameterNameMediaServiceData];
}
- (nullable SDLMediaServiceData *)mediaServiceData {
- return [store sdl_objectForName:SDLRPCParameterNameMediaServiceData ofClass:SDLMediaServiceData.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameMediaServiceData ofClass:SDLMediaServiceData.class error:nil];
}
- (void)setNavigationServiceData:(nullable SDLNavigationServiceData *)navigationServiceData {
- [store sdl_setObject:navigationServiceData forName:SDLRPCParameterNameNavigationServiceData];
+ [self.store sdl_setObject:navigationServiceData forName:SDLRPCParameterNameNavigationServiceData];
}
- (nullable SDLNavigationServiceData *)navigationServiceData {
- return [store sdl_objectForName:SDLRPCParameterNameNavigationServiceData ofClass:SDLNavigationServiceData.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameNavigationServiceData ofClass:SDLNavigationServiceData.class error:nil];
}
@end
diff --git a/SmartDeviceLink/SDLAppServiceManifest.m b/SmartDeviceLink/SDLAppServiceManifest.m
index ce6c827a7..97afc2e77 100644
--- a/SmartDeviceLink/SDLAppServiceManifest.m
+++ b/SmartDeviceLink/SDLAppServiceManifest.m
@@ -63,76 +63,76 @@ - (instancetype)initWithServiceName:(nullable NSString *)serviceName serviceType
}
- (void)setServiceName:(nullable NSString *)serviceName {
- [store sdl_setObject:serviceName forName:SDLRPCParameterNameServiceName];
+ [self.store sdl_setObject:serviceName forName:SDLRPCParameterNameServiceName];
}
- (nullable NSString *)serviceName {
- return [store sdl_objectForName:SDLRPCParameterNameServiceName ofClass:NSString.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameServiceName ofClass:NSString.class error:nil];
}
- (void)setServiceType:(NSString *)serviceType {
- [store sdl_setObject:serviceType forName:SDLRPCParameterNameServiceType];
+ [self.store sdl_setObject:serviceType forName:SDLRPCParameterNameServiceType];
}
- (NSString *)serviceType {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameServiceType ofClass:NSString.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameServiceType ofClass:NSString.class error:&error];
}
- (void)setServiceIcon:(nullable SDLImage *)serviceIcon {
- [store sdl_setObject:serviceIcon forName:SDLRPCParameterNameServiceIcon];
+ [self.store sdl_setObject:serviceIcon forName:SDLRPCParameterNameServiceIcon];
}
- (nullable SDLImage *)serviceIcon {
- return [store sdl_objectForName:SDLRPCParameterNameServiceIcon ofClass:SDLImage.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameServiceIcon ofClass:SDLImage.class error:nil];
}
- (void)setAllowAppConsumers:(nullable NSNumber *)allowAppConsumers {
- [store sdl_setObject:allowAppConsumers forName:SDLRPCParameterNameAllowAppConsumers];
+ [self.store sdl_setObject:allowAppConsumers forName:SDLRPCParameterNameAllowAppConsumers];
}
- (nullable NSNumber *)allowAppConsumers {
- return [store sdl_objectForName:SDLRPCParameterNameAllowAppConsumers ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameAllowAppConsumers ofClass:NSNumber.class error:nil];
}
- (void)setRpcSpecVersion:(nullable SDLSyncMsgVersion *)rpcSpecVersion {
- [store sdl_setObject:rpcSpecVersion forName:SDLRPCParameterNameRPCSpecVersion];
+ [self.store sdl_setObject:rpcSpecVersion forName:SDLRPCParameterNameRPCSpecVersion];
}
- (nullable SDLSyncMsgVersion *)rpcSpecVersion {
- return [store sdl_objectForName:SDLRPCParameterNameRPCSpecVersion ofClass:SDLSyncMsgVersion.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameRPCSpecVersion ofClass:SDLSyncMsgVersion.class error:nil];
}
- (void)setHandledRPCs:(nullable NSArray *> *)handledRPCs {
- [store sdl_setObject:handledRPCs forName:SDLRPCParameterNameHandledRPCs];
+ [self.store sdl_setObject:handledRPCs forName:SDLRPCParameterNameHandledRPCs];
}
- (nullable NSArray *> *)handledRPCs {
- return [store sdl_objectsForName:SDLRPCParameterNameHandledRPCs ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectsForName:SDLRPCParameterNameHandledRPCs ofClass:NSNumber.class error:nil];
}
- (void)setWeatherServiceManifest:(nullable SDLWeatherServiceManifest *)weatherServiceManifest {
- [store sdl_setObject:weatherServiceManifest forName:SDLRPCParameterNameWeatherServiceManifest];
+ [self.store sdl_setObject:weatherServiceManifest forName:SDLRPCParameterNameWeatherServiceManifest];
}
- (nullable SDLWeatherServiceManifest *)weatherServiceManifest {
- return [store sdl_objectForName:SDLRPCParameterNameWeatherServiceManifest ofClass:SDLWeatherServiceManifest.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameWeatherServiceManifest ofClass:SDLWeatherServiceManifest.class error:nil];
}
- (void)setMediaServiceManifest:(nullable SDLMediaServiceManifest *)mediaServiceManifest {
- [store sdl_setObject:mediaServiceManifest forName:SDLRPCParameterNameMediaServiceManifest];
+ [self.store sdl_setObject:mediaServiceManifest forName:SDLRPCParameterNameMediaServiceManifest];
}
- (nullable SDLMediaServiceManifest *)mediaServiceManifest {
- return [store sdl_objectForName:SDLRPCParameterNameMediaServiceManifest ofClass:SDLMediaServiceManifest.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameMediaServiceManifest ofClass:SDLMediaServiceManifest.class error:nil];
}
- (void)setNavigationServiceManifest:(nullable SDLNavigationServiceManifest *)navigationServiceManifest {
- [store sdl_setObject:navigationServiceManifest forName:SDLRPCParameterNameNavigationServiceManifest];
+ [self.store sdl_setObject:navigationServiceManifest forName:SDLRPCParameterNameNavigationServiceManifest];
}
- (nullable SDLNavigationServiceManifest *)navigationServiceManifest {
- return [store sdl_objectForName:SDLRPCParameterNameNavigationServiceManifest ofClass:SDLNavigationServiceManifest.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameNavigationServiceManifest ofClass:SDLNavigationServiceManifest.class error:nil];
}
@end
diff --git a/SmartDeviceLink/SDLAppServiceRecord.m b/SmartDeviceLink/SDLAppServiceRecord.m
index 5677d6776..72711d0a8 100644
--- a/SmartDeviceLink/SDLAppServiceRecord.m
+++ b/SmartDeviceLink/SDLAppServiceRecord.m
@@ -31,39 +31,39 @@ - (instancetype)initWithServiceID:(NSString *)serviceID serviceManifest:(SDLAppS
}
- (void)setServiceID:(NSString *)serviceID {
- [store sdl_setObject:serviceID forName:SDLRPCParameterNameServiceID];
+ [self.store sdl_setObject:serviceID forName:SDLRPCParameterNameServiceID];
}
- (NSString *)serviceID {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameServiceID ofClass:NSString.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameServiceID ofClass:NSString.class error:&error];
}
- (void)setServiceManifest:(SDLAppServiceManifest *)serviceManifest {
- [store sdl_setObject:serviceManifest forName:SDLRPCParameterNameServiceManifest];
+ [self.store sdl_setObject:serviceManifest forName:SDLRPCParameterNameServiceManifest];
}
- (SDLAppServiceManifest *)serviceManifest {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameServiceManifest ofClass:SDLAppServiceManifest.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameServiceManifest ofClass:SDLAppServiceManifest.class error:&error];
}
- (void)setServicePublished:(NSNumber *)servicePublished {
- [store sdl_setObject:servicePublished forName:SDLRPCParameterNameServicePublished];
+ [self.store sdl_setObject:servicePublished forName:SDLRPCParameterNameServicePublished];
}
- (NSNumber *)servicePublished {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameServicePublished ofClass:NSNumber.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameServicePublished ofClass:NSNumber.class error:&error];
}
- (void)setServiceActive:(NSNumber *)serviceActive {
- [store sdl_setObject:serviceActive forName:SDLRPCParameterNameServiceActive];
+ [self.store sdl_setObject:serviceActive forName:SDLRPCParameterNameServiceActive];
}
- (NSNumber *)serviceActive {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameServiceActive ofClass:NSNumber.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameServiceActive ofClass:NSNumber.class error:&error];
}
@end
diff --git a/SmartDeviceLink/SDLAppServicesCapabilities.m b/SmartDeviceLink/SDLAppServicesCapabilities.m
index f0d032c54..a31b5d400 100644
--- a/SmartDeviceLink/SDLAppServicesCapabilities.m
+++ b/SmartDeviceLink/SDLAppServicesCapabilities.m
@@ -28,11 +28,11 @@ - (instancetype)initWithAppServices:(nullable NSArray
}
- (void)setAppServices:(nullable NSArray *)appServices {
- [store sdl_setObject:appServices forName:SDLRPCParameterNameAppServices];
+ [self.store sdl_setObject:appServices forName:SDLRPCParameterNameAppServices];
}
- (nullable NSArray *)appServices {
- return [store sdl_objectsForName:SDLRPCParameterNameAppServices ofClass:SDLAppServiceCapability.class error:nil];
+ return [self.store sdl_objectsForName:SDLRPCParameterNameAppServices ofClass:SDLAppServiceCapability.class error:nil];
}
@end
diff --git a/SmartDeviceLink/SDLAsynchronousOperation.h b/SmartDeviceLink/SDLAsynchronousOperation.h
index ad0697b2a..b7e0e0614 100644
--- a/SmartDeviceLink/SDLAsynchronousOperation.h
+++ b/SmartDeviceLink/SDLAsynchronousOperation.h
@@ -12,6 +12,7 @@
@property (copy, nonatomic, readonly, nullable) NSError *error;
+- (void)start;
- (void)finishOperation;
@end
diff --git a/SmartDeviceLink/SDLAudioControlCapabilities.m b/SmartDeviceLink/SDLAudioControlCapabilities.m
index 9d22c4d94..ad204cc62 100644
--- a/SmartDeviceLink/SDLAudioControlCapabilities.m
+++ b/SmartDeviceLink/SDLAudioControlCapabilities.m
@@ -35,52 +35,52 @@ - (instancetype)initWithModuleName:(NSString *)name sourceAvailable:(nullable NS
}
- (void)setModuleName:(NSString *)moduleName {
- [store sdl_setObject:moduleName forName:SDLRPCParameterNameModuleName];
+ [self.store sdl_setObject:moduleName forName:SDLRPCParameterNameModuleName];
}
- (NSString *)moduleName {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameModuleName ofClass:NSString.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameModuleName ofClass:NSString.class error:&error];
}
- (void)setSourceAvailable:(nullable NSNumber *)sourceAvailable {
- [store sdl_setObject:sourceAvailable forName:SDLRPCParameterNameSourceAvailable];
+ [self.store sdl_setObject:sourceAvailable forName:SDLRPCParameterNameSourceAvailable];
}
- (nullable NSNumber *)sourceAvailable {
- return [store sdl_objectForName:SDLRPCParameterNameSourceAvailable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameSourceAvailable ofClass:NSNumber.class error:nil];
}
- (void)setKeepContextAvailable:(nullable NSNumber *)keepContextAvailable {
- [store sdl_setObject:keepContextAvailable forName:SDLRPCParameterNameKeepContextAvailable];
+ [self.store sdl_setObject:keepContextAvailable forName:SDLRPCParameterNameKeepContextAvailable];
}
- (nullable NSNumber *)keepContextAvailable {
- return [store sdl_objectForName:SDLRPCParameterNameKeepContextAvailable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameKeepContextAvailable ofClass:NSNumber.class error:nil];
}
- (void)setVolumeAvailable:(nullable NSNumber *)volumeAvailable {
- [store sdl_setObject:volumeAvailable forName:SDLRPCParameterNameVolumeAvailable];
+ [self.store sdl_setObject:volumeAvailable forName:SDLRPCParameterNameVolumeAvailable];
}
- (nullable NSNumber *)volumeAvailable {
- return [store sdl_objectForName:SDLRPCParameterNameVolumeAvailable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameVolumeAvailable ofClass:NSNumber.class error:nil];
}
- (void)setEqualizerAvailable:(nullable NSNumber *)equalizerAvailable {
- [store sdl_setObject:equalizerAvailable forName:SDLRPCParameterNameEqualizerAvailable];
+ [self.store sdl_setObject:equalizerAvailable forName:SDLRPCParameterNameEqualizerAvailable];
}
- (nullable NSNumber *)equalizerAvailable {
- return [store sdl_objectForName:SDLRPCParameterNameEqualizerAvailable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameEqualizerAvailable ofClass:NSNumber.class error:nil];
}
- (void)setEqualizerMaxChannelId:(nullable NSNumber *)equalizerMaxChannelId {
- [store sdl_setObject:equalizerMaxChannelId forName:SDLRPCParameterNameEqualizerMaxChannelId];
+ [self.store sdl_setObject:equalizerMaxChannelId forName:SDLRPCParameterNameEqualizerMaxChannelId];
}
- (nullable NSNumber *)equalizerMaxChannelId {
- return [store sdl_objectForName:SDLRPCParameterNameEqualizerMaxChannelId ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameEqualizerMaxChannelId ofClass:NSNumber.class error:nil];
}
@end
diff --git a/SmartDeviceLink/SDLAudioControlData.m b/SmartDeviceLink/SDLAudioControlData.m
index b205aee71..67296c9ae 100644
--- a/SmartDeviceLink/SDLAudioControlData.m
+++ b/SmartDeviceLink/SDLAudioControlData.m
@@ -25,36 +25,36 @@ - (instancetype)initWithSource:(nullable SDLPrimaryAudioSource)source keepContex
}
- (void)setSource:(nullable SDLPrimaryAudioSource)source {
- [store sdl_setObject:source forName:SDLRPCParameterNameSource];
+ [self.store sdl_setObject:source forName:SDLRPCParameterNameSource];
}
- (nullable SDLPrimaryAudioSource)source {
- return [store sdl_enumForName:SDLRPCParameterNameSource error:nil];
+ return [self.store sdl_enumForName:SDLRPCParameterNameSource error:nil];
}
- (void)setKeepContext:(nullable NSNumber *)keepContext {
- [store sdl_setObject:keepContext forName:SDLRPCParameterNameKeepContext];
+ [self.store sdl_setObject:keepContext forName:SDLRPCParameterNameKeepContext];
}
- (nullable NSNumber *)keepContext {
- return [store sdl_objectForName:SDLRPCParameterNameKeepContext ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameKeepContext ofClass:NSNumber.class error:nil];
}
- (void)setVolume:(nullable NSNumber *)volume {
- [store sdl_setObject:volume forName:SDLRPCParameterNameVolume];
+ [self.store sdl_setObject:volume forName:SDLRPCParameterNameVolume];
}
- (nullable NSNumber *)volume {
- return [store sdl_objectForName:SDLRPCParameterNameVolume ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameVolume ofClass:NSNumber.class error:nil];
}
- (void)setEqualizerSettings:(nullable NSArray *)equalizerSettings {
- [store sdl_setObject:equalizerSettings forName:SDLRPCParameterNameEqualizerSettings];
+ [self.store sdl_setObject:equalizerSettings forName:SDLRPCParameterNameEqualizerSettings];
}
- (nullable NSArray *)equalizerSettings {
- return [store sdl_objectsForName:SDLRPCParameterNameEqualizerSettings ofClass:SDLEqualizerSettings.class error:nil];
+ return [self.store sdl_objectsForName:SDLRPCParameterNameEqualizerSettings ofClass:SDLEqualizerSettings.class error:nil];
}
@end
diff --git a/SmartDeviceLink/SDLAudioFile.h b/SmartDeviceLink/SDLAudioFile.h
index e34c37a8d..794c50cab 100755
--- a/SmartDeviceLink/SDLAudioFile.h
+++ b/SmartDeviceLink/SDLAudioFile.h
@@ -12,21 +12,49 @@ NS_ASSUME_NONNULL_BEGIN
@interface SDLAudioFile : NSObject
-@property (copy, nonatomic, readonly) NSURL *inputFileURL;
+/**
+ If initialized with a file URL, the file URL it came from
+ */
+@property (nullable, copy, nonatomic, readonly) NSURL *inputFileURL;
-@property (copy, nonatomic, readonly) NSURL *outputFileURL;
+/**
+ If initialized with a file URL, where the transcoder should produce the transcoded PCM audio file
+ */
+@property (nullable, copy, nonatomic, readonly) NSURL *outputFileURL;
/**
In seconds. UINT32_MAX if unknown.
*/
@property (assign, nonatomic) UInt32 estimatedDuration;
+/**
+ The PCM audio data to be transferred and played
+ */
@property (copy, nonatomic, readonly) NSData *data;
+/**
+ The size of the PCM audio data in bytes
+ */
@property (assign, nonatomic, readonly) unsigned long long fileSize;
+/**
+ Initialize an audio file to be queued and played
+
+ @param inputURL The file that exists on the device to be transcoded and queued
+ @param outputURL The target URL that the transcoded file will be output to
+ @param duration The duration of the file
+ @return The audio file object
+ */
- (instancetype)initWithInputFileURL:(NSURL *)inputURL outputFileURL:(NSURL *)outputURL estimatedDuration:(UInt32)duration;
+/**
+ Initialize a buffer of PCM audio data to be queued and played
+
+ @param data The PCM audio data buffer
+ @return The audio file object
+ */
+- (instancetype)initWithData:(NSData *)data;
+
@end
NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLAudioFile.m b/SmartDeviceLink/SDLAudioFile.m
index 1d0e2ef98..46b50f540 100755
--- a/SmartDeviceLink/SDLAudioFile.m
+++ b/SmartDeviceLink/SDLAudioFile.m
@@ -32,6 +32,15 @@ - (instancetype)initWithInputFileURL:(NSURL *)inputURL outputFileURL:(NSURL *)ou
return self;
}
+- (instancetype)initWithData:(NSData *)data {
+ self = [super init];
+ if (!self) { return nil; }
+
+ _data = data;
+
+ return self;
+}
+
- (NSData *)data {
if (_data.length == 0) {
return [NSData dataWithContentsOfURL:_outputFileURL];
diff --git a/SmartDeviceLink/SDLAudioPassThruCapabilities.m b/SmartDeviceLink/SDLAudioPassThruCapabilities.m
index 51c1e64bb..c84263a24 100644
--- a/SmartDeviceLink/SDLAudioPassThruCapabilities.m
+++ b/SmartDeviceLink/SDLAudioPassThruCapabilities.m
@@ -12,30 +12,30 @@
@implementation SDLAudioPassThruCapabilities
- (void)setSamplingRate:(SDLSamplingRate)samplingRate {
- [store sdl_setObject:samplingRate forName:SDLRPCParameterNameSamplingRate];
+ [self.store sdl_setObject:samplingRate forName:SDLRPCParameterNameSamplingRate];
}
- (SDLSamplingRate)samplingRate {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameSamplingRate error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameSamplingRate error:&error];
}
- (void)setBitsPerSample:(SDLBitsPerSample)bitsPerSample {
- [store sdl_setObject:bitsPerSample forName:SDLRPCParameterNameBitsPerSample];
+ [self.store sdl_setObject:bitsPerSample forName:SDLRPCParameterNameBitsPerSample];
}
- (SDLBitsPerSample)bitsPerSample {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameBitsPerSample error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameBitsPerSample error:&error];
}
- (void)setAudioType:(SDLAudioType)audioType {
- [store sdl_setObject:audioType forName:SDLRPCParameterNameAudioType];
+ [self.store sdl_setObject:audioType forName:SDLRPCParameterNameAudioType];
}
- (SDLAudioType)audioType {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameAudioType error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameAudioType error:&error];
}
@end
diff --git a/SmartDeviceLink/SDLAudioStreamManager.h b/SmartDeviceLink/SDLAudioStreamManager.h
index e6608f8e1..b405cae5d 100755
--- a/SmartDeviceLink/SDLAudioStreamManager.h
+++ b/SmartDeviceLink/SDLAudioStreamManager.h
@@ -66,6 +66,22 @@ typedef NS_ENUM(NSInteger, SDLAudioStreamManagerError) {
*/
- (void)pushWithFileURL:(NSURL *)fileURL;
+/**
+ Push a new audio buffer onto the queue. Call `playNextWhenReady` to start playing the pushed audio buffer.
+
+ This data must be of the required PCM format. See SDLSystemCapabilityManager.pcmStreamCapability and SDLAudioPassThruCapability.h.
+
+ This is *an example* of a PCM format used by some head units:
+ - audioType: PCM
+ - samplingRate: 16kHZ
+ - bitsPerSample: 16 bits
+
+ There is generally only one channel to the data.
+
+ @param data The audio buffer to be pushed onto the queue
+ */
+- (void)pushWithData:(NSData *)data;
+
/**
Play the next item in the queue. If an item is currently playing, it will continue playing and this item will begin playing after it is completed.
diff --git a/SmartDeviceLink/SDLAudioStreamManager.m b/SmartDeviceLink/SDLAudioStreamManager.m
index 69312b0b5..ff16f2b16 100755
--- a/SmartDeviceLink/SDLAudioStreamManager.m
+++ b/SmartDeviceLink/SDLAudioStreamManager.m
@@ -46,10 +46,22 @@ - (instancetype)initWithManager:(id)streamManager
return self;
}
+- (void)stop {
+ dispatch_async(_audioQueue, ^{
+ self.shouldPlayWhenReady = NO;
+ [self.mutableQueue removeAllObjects];
+ });
+}
+
+#pragma mark - Getters
+
- (NSArray *)queue {
return [_mutableQueue copy];
}
+#pragma mark - Pushing to the Queue
+#pragma mark Files
+
- (void)pushWithFileURL:(NSURL *)fileURL {
dispatch_async(_audioQueue, ^{
[self sdl_pushWithContentsOfURL:fileURL];
@@ -79,6 +91,21 @@ - (void)sdl_pushWithContentsOfURL:(NSURL *)fileURL {
}
}
+#pragma mark Raw Data
+
+- (void)pushWithData:(NSData *)data {
+ dispatch_async(_audioQueue, ^{
+ [self sdl_pushWithData:data];
+ });
+}
+
+- (void)sdl_pushWithData:(NSData *)data {
+ SDLAudioFile *audioFile = [[SDLAudioFile alloc] initWithData:data];
+ [self.mutableQueue addObject:audioFile];
+}
+
+#pragma mark Playing from the Queue
+
- (void)playNextWhenReady {
dispatch_async(_audioQueue, ^{
[self sdl_playNextWhenReady];
@@ -104,34 +131,46 @@ - (void)sdl_playNextWhenReady {
[self.mutableQueue removeObjectAtIndex:0];
// Strip the first bunch of bytes (because of how Apple outputs the data) and send to the audio stream, if we don't do this, it will make a weird click sound
+ NSData *audioData = nil;
+ if (file.inputFileURL != nil) {
+ audioData = [file.data subdataWithRange:NSMakeRange(5760, (file.data.length - 5760))];
+ } else {
+ audioData = file.data;
+ }
+
+ // Send the audio file, which starts it playing immediately
SDLLogD(@"Playing audio file: %@", file);
- NSData *audioData = [file.data subdataWithRange:NSMakeRange(5760, (file.data.length - 5760))];
__block BOOL success = [self.streamManager sendAudioData:audioData];
self.playing = YES;
+ // Determine the length of the audio PCM data and perform a few items once the audio has finished playing
float audioLengthSecs = (float)audioData.length / (float)32000.0;
__weak typeof(self) weakself = self;
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(audioLengthSecs * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
- weakself.playing = NO;
+ __strong typeof(weakself) strongSelf = weakself;
+
+ strongSelf.playing = NO;
NSError *error = nil;
- if (weakself.delegate != nil) {
- [weakself.delegate audioStreamManager:weakself fileDidFinishPlaying:file.inputFileURL successfully:success];
+ if (strongSelf.delegate != nil) {
+ if (file.inputFileURL != nil) {
+ [strongSelf.delegate audioStreamManager:strongSelf fileDidFinishPlaying:file.inputFileURL successfully:success];
+ } else if ([strongSelf.delegate respondsToSelector:@selector(audioStreamManager:dataBufferDidFinishPlayingSuccessfully:)]) {
+ [strongSelf.delegate audioStreamManager:strongSelf dataBufferDidFinishPlayingSuccessfully:success];
+ }
}
+
SDLLogD(@"Ending Audio file: %@", file);
[[NSFileManager defaultManager] removeItemAtURL:file.outputFileURL error:&error];
- if (weakself.delegate != nil && error != nil) {
- [weakself.delegate audioStreamManager:weakself errorDidOccurForFile:file.inputFileURL error:error];
+ if (strongSelf.delegate != nil && error != nil) {
+ if (file.inputFileURL != nil) {
+ [strongSelf.delegate audioStreamManager:strongSelf errorDidOccurForFile:file.inputFileURL error:error];
+ } else if ([strongSelf.delegate respondsToSelector:@selector(audioStreamManager:errorDidOccurForDataBuffer:)]) {
+ [strongSelf.delegate audioStreamManager:strongSelf errorDidOccurForDataBuffer:error];
+ }
}
});
}
-- (void)stop {
- dispatch_async(_audioQueue, ^{
- self.shouldPlayWhenReady = NO;
- [self.mutableQueue removeAllObjects];
- });
-}
-
@end
NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLAudioStreamManagerDelegate.h b/SmartDeviceLink/SDLAudioStreamManagerDelegate.h
index acad1472c..04235d95d 100755
--- a/SmartDeviceLink/SDLAudioStreamManagerDelegate.h
+++ b/SmartDeviceLink/SDLAudioStreamManagerDelegate.h
@@ -29,12 +29,30 @@ NS_ASSUME_NONNULL_BEGIN
/**
Called when a file from the SDLAudioStreamManager could not play
- @param audioManager A reference to the audio stream manager
+ @param audioManager A reference to the audio stream manager
@param fileURL The URL that failed
@param error The error that occurred
*/
- (void)audioStreamManager:(SDLAudioStreamManager *)audioManager errorDidOccurForFile:(NSURL *)fileURL error:(NSError *)error;
+@optional
+
+/**
+ Called when a data buffer from the SDLAudioStreamManager finishes playing
+
+ @param audioManager A reference to the audio stream manager
+ @param successfully Whether or not the data buffer played successfully
+ */
+- (void)audioStreamManager:(SDLAudioStreamManager *)audioManager dataBufferDidFinishPlayingSuccessfully:(BOOL)successfully;
+
+/**
+ Called when a data buffer from the SDLAudioStreamManager could not play
+
+ @param audioManager A reference to the audio stream manager
+ @param error The error that occurred
+ */
+- (void)audioStreamManager:(SDLAudioStreamManager *)audioManager errorDidOccurForDataBuffer:(NSError *)error;
+
@end
NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLBackgroundTaskManager.h b/SmartDeviceLink/SDLBackgroundTaskManager.h
new file mode 100644
index 000000000..0732b6fda
--- /dev/null
+++ b/SmartDeviceLink/SDLBackgroundTaskManager.h
@@ -0,0 +1,44 @@
+//
+// SDLBackgroundTaskManager.h
+// SmartDeviceLink
+//
+// Created by Nicole on 6/25/19.
+// Copyright © 2019 smartdevicelink. All rights reserved.
+//
+
+#import
+#import
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * Class for managing a background task.
+ */
+@interface SDLBackgroundTaskManager : NSObject
+
+- (instancetype)init NS_UNAVAILABLE;
+
+/**
+ * Convenience init for starting a background task with a specific name.
+ *
+ * @param backgroundTaskName The name for the background task
+ * @return A SDLBackgroundTaskManager object
+ */
+- (instancetype)initWithBackgroundTaskName:(NSString *)backgroundTaskName;
+
+/**
+ * Starts a background task that allows the app to establish a session while app is backgrounded. If the app is not currently backgrounded, the background task will remain dormant until the app moves to the background.
+ */
+- (void)startBackgroundTask;
+
+/**
+ * Cleans up a background task when it is stopped. This should be called when:
+ *
+ * 1. The app has established a session.
+ * 2. The system has called the `expirationHandler` for the background task. The system may kill the app if the background task is not ended when `expirationHandler` is called.
+ */
+- (void)endBackgroundTask;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLBackgroundTaskManager.m b/SmartDeviceLink/SDLBackgroundTaskManager.m
new file mode 100644
index 000000000..2109a40cd
--- /dev/null
+++ b/SmartDeviceLink/SDLBackgroundTaskManager.m
@@ -0,0 +1,68 @@
+//
+// SDLBackgroundTaskManager.m
+// SmartDeviceLink
+//
+// Created by Nicole on 6/25/19.
+// Copyright © 2019 smartdevicelink. All rights reserved.
+//
+
+#import "SDLBackgroundTaskManager.h"
+
+#import "SDLLogMacros.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SDLBackgroundTaskManager ()
+@property (copy, nonatomic) NSString *backgroundTaskName;
+@property (assign, nonatomic) UIBackgroundTaskIdentifier currentBackgroundTaskId;
+
+@end
+
+@implementation SDLBackgroundTaskManager
+
+- (instancetype)initWithBackgroundTaskName:(NSString *)backgroundTaskName {
+ SDLLogV(@"SDLBackgroundTaskManager init with name %@", backgroundTaskName);
+ self = [super init];
+ if (!self) {
+ return nil;
+ }
+
+ _backgroundTaskName = backgroundTaskName;
+
+ return self;
+}
+
+- (void)startBackgroundTask {
+ if (self.currentBackgroundTaskId != UIBackgroundTaskInvalid) {
+ SDLLogV(@"The %@ background task is already running.", self.backgroundTaskName);
+ return;
+ }
+
+ __weak typeof(self) weakself = self;
+ self.currentBackgroundTaskId = [[UIApplication sharedApplication] beginBackgroundTaskWithName:self.backgroundTaskName expirationHandler:^{
+ SDLLogD(@"The %@ background task expired", self.backgroundTaskName);
+ [weakself endBackgroundTask];
+ }];
+
+ SDLLogD(@"The %@ background task started with id: %lu", self.backgroundTaskName, (unsigned long)self.currentBackgroundTaskId);
+}
+
+- (void)endBackgroundTask {
+ if (self.currentBackgroundTaskId == UIBackgroundTaskInvalid) {
+ SDLLogV(@"Background task already ended. Returning...");
+ return;
+ }
+
+ SDLLogD(@"Ending background task with id: %lu", (unsigned long)self.currentBackgroundTaskId);
+ [[UIApplication sharedApplication] endBackgroundTask:self.currentBackgroundTaskId];
+ self.currentBackgroundTaskId = UIBackgroundTaskInvalid;
+}
+
+- (void)dealloc {
+ [self endBackgroundTask];
+}
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLBeltStatus.m b/SmartDeviceLink/SDLBeltStatus.m
index 1432b9453..89a5271e3 100644
--- a/SmartDeviceLink/SDLBeltStatus.m
+++ b/SmartDeviceLink/SDLBeltStatus.m
@@ -12,138 +12,138 @@
@implementation SDLBeltStatus
- (void)setDriverBeltDeployed:(SDLVehicleDataEventStatus)driverBeltDeployed {
- [store sdl_setObject:driverBeltDeployed forName:SDLRPCParameterNameDriverBeltDeployed];
+ [self.store sdl_setObject:driverBeltDeployed forName:SDLRPCParameterNameDriverBeltDeployed];
}
- (SDLVehicleDataEventStatus)driverBeltDeployed {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameDriverBeltDeployed error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameDriverBeltDeployed error:&error];
}
- (void)setPassengerBeltDeployed:(SDLVehicleDataEventStatus)passengerBeltDeployed {
- [store sdl_setObject:passengerBeltDeployed forName:SDLRPCParameterNamePassengerBeltDeployed];
+ [self.store sdl_setObject:passengerBeltDeployed forName:SDLRPCParameterNamePassengerBeltDeployed];
}
- (SDLVehicleDataEventStatus)passengerBeltDeployed {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNamePassengerBeltDeployed error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNamePassengerBeltDeployed error:&error];
}
- (void)setPassengerBuckleBelted:(SDLVehicleDataEventStatus)passengerBuckleBelted {
- [store sdl_setObject:passengerBuckleBelted forName:SDLRPCParameterNamePassengerBuckleBelted];
+ [self.store sdl_setObject:passengerBuckleBelted forName:SDLRPCParameterNamePassengerBuckleBelted];
}
- (SDLVehicleDataEventStatus)passengerBuckleBelted {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNamePassengerBuckleBelted error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNamePassengerBuckleBelted error:&error];
}
- (void)setDriverBuckleBelted:(SDLVehicleDataEventStatus)driverBuckleBelted {
- [store sdl_setObject:driverBuckleBelted forName:SDLRPCParameterNameDriverBuckleBelted];
+ [self.store sdl_setObject:driverBuckleBelted forName:SDLRPCParameterNameDriverBuckleBelted];
}
- (SDLVehicleDataEventStatus)driverBuckleBelted {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameDriverBuckleBelted error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameDriverBuckleBelted error:&error];
}
- (void)setLeftRow2BuckleBelted:(SDLVehicleDataEventStatus)leftRow2BuckleBelted {
- [store sdl_setObject:leftRow2BuckleBelted forName:SDLRPCParameterNameLeftRow2BuckleBelted];
+ [self.store sdl_setObject:leftRow2BuckleBelted forName:SDLRPCParameterNameLeftRow2BuckleBelted];
}
- (SDLVehicleDataEventStatus)leftRow2BuckleBelted {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameLeftRow2BuckleBelted error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameLeftRow2BuckleBelted error:&error];
}
- (void)setPassengerChildDetected:(SDLVehicleDataEventStatus)passengerChildDetected {
- [store sdl_setObject:passengerChildDetected forName:SDLRPCParameterNamePassengerChildDetected];
+ [self.store sdl_setObject:passengerChildDetected forName:SDLRPCParameterNamePassengerChildDetected];
}
- (SDLVehicleDataEventStatus)passengerChildDetected {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNamePassengerChildDetected error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNamePassengerChildDetected error:&error];
}
- (void)setRightRow2BuckleBelted:(SDLVehicleDataEventStatus)rightRow2BuckleBelted {
- [store sdl_setObject:rightRow2BuckleBelted forName:SDLRPCParameterNameRightRow2BuckleBelted];
+ [self.store sdl_setObject:rightRow2BuckleBelted forName:SDLRPCParameterNameRightRow2BuckleBelted];
}
- (SDLVehicleDataEventStatus)rightRow2BuckleBelted {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameRightRow2BuckleBelted error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameRightRow2BuckleBelted error:&error];
}
- (void)setMiddleRow2BuckleBelted:(SDLVehicleDataEventStatus)middleRow2BuckleBelted {
- [store sdl_setObject:middleRow2BuckleBelted forName:SDLRPCParameterNameMiddleRow2BuckleBelted];
+ [self.store sdl_setObject:middleRow2BuckleBelted forName:SDLRPCParameterNameMiddleRow2BuckleBelted];
}
- (SDLVehicleDataEventStatus)middleRow2BuckleBelted {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameMiddleRow2BuckleBelted error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameMiddleRow2BuckleBelted error:&error];
}
- (void)setMiddleRow3BuckleBelted:(SDLVehicleDataEventStatus)middleRow3BuckleBelted {
- [store sdl_setObject:middleRow3BuckleBelted forName:SDLRPCParameterNameMiddleRow3BuckleBelted];
+ [self.store sdl_setObject:middleRow3BuckleBelted forName:SDLRPCParameterNameMiddleRow3BuckleBelted];
}
- (SDLVehicleDataEventStatus)middleRow3BuckleBelted {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameMiddleRow3BuckleBelted error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameMiddleRow3BuckleBelted error:&error];
}
- (void)setLeftRow3BuckleBelted:(SDLVehicleDataEventStatus)leftRow3BuckleBelted {
- [store sdl_setObject:leftRow3BuckleBelted forName:SDLRPCParameterNameLeftRow3BuckleBelted];
+ [self.store sdl_setObject:leftRow3BuckleBelted forName:SDLRPCParameterNameLeftRow3BuckleBelted];
}
- (SDLVehicleDataEventStatus)leftRow3BuckleBelted {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameLeftRow3BuckleBelted error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameLeftRow3BuckleBelted error:&error];
}
- (void)setRightRow3BuckleBelted:(SDLVehicleDataEventStatus)rightRow3BuckleBelted {
- [store sdl_setObject:rightRow3BuckleBelted forName:SDLRPCParameterNameRightRow3BuckleBelted];
+ [self.store sdl_setObject:rightRow3BuckleBelted forName:SDLRPCParameterNameRightRow3BuckleBelted];
}
- (SDLVehicleDataEventStatus)rightRow3BuckleBelted {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameRightRow3BuckleBelted error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameRightRow3BuckleBelted error:&error];
}
- (void)setLeftRearInflatableBelted:(SDLVehicleDataEventStatus)leftRearInflatableBelted {
- [store sdl_setObject:leftRearInflatableBelted forName:SDLRPCParameterNameLeftRearInflatableBelted];
+ [self.store sdl_setObject:leftRearInflatableBelted forName:SDLRPCParameterNameLeftRearInflatableBelted];
}
- (SDLVehicleDataEventStatus)leftRearInflatableBelted {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameLeftRearInflatableBelted error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameLeftRearInflatableBelted error:&error];
}
- (void)setRightRearInflatableBelted:(SDLVehicleDataEventStatus)rightRearInflatableBelted {
- [store sdl_setObject:rightRearInflatableBelted forName:SDLRPCParameterNameRightRearInflatableBelted];
+ [self.store sdl_setObject:rightRearInflatableBelted forName:SDLRPCParameterNameRightRearInflatableBelted];
}
- (SDLVehicleDataEventStatus)rightRearInflatableBelted {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameRightRearInflatableBelted error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameRightRearInflatableBelted error:&error];
}
- (void)setMiddleRow1BeltDeployed:(SDLVehicleDataEventStatus)middleRow1BeltDeployed {
- [store sdl_setObject:middleRow1BeltDeployed forName:SDLRPCParameterNameMiddleRow1BeltDeployed];
+ [self.store sdl_setObject:middleRow1BeltDeployed forName:SDLRPCParameterNameMiddleRow1BeltDeployed];
}
- (SDLVehicleDataEventStatus)middleRow1BeltDeployed {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameMiddleRow1BeltDeployed error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameMiddleRow1BeltDeployed error:&error];
}
- (void)setMiddleRow1BuckleBelted:(SDLVehicleDataEventStatus)middleRow1BuckleBelted {
- [store sdl_setObject:middleRow1BuckleBelted forName:SDLRPCParameterNameMiddleRow1BuckleBelted];
+ [self.store sdl_setObject:middleRow1BuckleBelted forName:SDLRPCParameterNameMiddleRow1BuckleBelted];
}
- (SDLVehicleDataEventStatus)middleRow1BuckleBelted {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameMiddleRow1BuckleBelted error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameMiddleRow1BuckleBelted error:&error];
}
@end
diff --git a/SmartDeviceLink/SDLBodyInformation.m b/SmartDeviceLink/SDLBodyInformation.m
index 5591998a3..fe8aa8b29 100644
--- a/SmartDeviceLink/SDLBodyInformation.m
+++ b/SmartDeviceLink/SDLBodyInformation.m
@@ -14,62 +14,62 @@
@implementation SDLBodyInformation
- (void)setParkBrakeActive:(NSNumber *)parkBrakeActive {
- [store sdl_setObject:parkBrakeActive forName:SDLRPCParameterNameParkBrakeActive];
+ [self.store sdl_setObject:parkBrakeActive forName:SDLRPCParameterNameParkBrakeActive];
}
- (NSNumber *)parkBrakeActive {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameParkBrakeActive ofClass:NSNumber.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameParkBrakeActive ofClass:NSNumber.class error:&error];
}
- (void)setIgnitionStableStatus:(SDLIgnitionStableStatus)ignitionStableStatus {
- [store sdl_setObject:ignitionStableStatus forName:SDLRPCParameterNameIgnitionStableStatus];
+ [self.store sdl_setObject:ignitionStableStatus forName:SDLRPCParameterNameIgnitionStableStatus];
}
- (SDLIgnitionStableStatus)ignitionStableStatus {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameIgnitionStableStatus error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameIgnitionStableStatus error:&error];
}
- (void)setIgnitionStatus:(SDLIgnitionStatus)ignitionStatus {
- [store sdl_setObject:ignitionStatus forName:SDLRPCParameterNameIgnitionStatus];
+ [self.store sdl_setObject:ignitionStatus forName:SDLRPCParameterNameIgnitionStatus];
}
- (SDLIgnitionStatus)ignitionStatus {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameIgnitionStatus error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameIgnitionStatus error:&error];
}
- (void)setDriverDoorAjar:(nullable NSNumber *)driverDoorAjar {
- [store sdl_setObject:driverDoorAjar forName:SDLRPCParameterNameDriverDoorAjar];
+ [self.store sdl_setObject:driverDoorAjar forName:SDLRPCParameterNameDriverDoorAjar];
}
- (nullable NSNumber *)driverDoorAjar {
- return [store sdl_objectForName:SDLRPCParameterNameDriverDoorAjar ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameDriverDoorAjar ofClass:NSNumber.class error:nil];
}
- (void)setPassengerDoorAjar:(nullable NSNumber *)passengerDoorAjar {
- [store sdl_setObject:passengerDoorAjar forName:SDLRPCParameterNamePassengerDoorAjar];
+ [self.store sdl_setObject:passengerDoorAjar forName:SDLRPCParameterNamePassengerDoorAjar];
}
- (nullable NSNumber *)passengerDoorAjar {
- return [store sdl_objectForName:SDLRPCParameterNamePassengerDoorAjar ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNamePassengerDoorAjar ofClass:NSNumber.class error:nil];
}
- (void)setRearLeftDoorAjar:(nullable NSNumber *)rearLeftDoorAjar {
- [store sdl_setObject:rearLeftDoorAjar forName:SDLRPCParameterNameRearLeftDoorAjar];
+ [self.store sdl_setObject:rearLeftDoorAjar forName:SDLRPCParameterNameRearLeftDoorAjar];
}
- (nullable NSNumber *)rearLeftDoorAjar {
- return [store sdl_objectForName:SDLRPCParameterNameRearLeftDoorAjar ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameRearLeftDoorAjar ofClass:NSNumber.class error:nil];
}
- (void)setRearRightDoorAjar:(nullable NSNumber *)rearRightDoorAjar {
- [store sdl_setObject:rearRightDoorAjar forName:SDLRPCParameterNameRearRightDoorAjar];
+ [self.store sdl_setObject:rearRightDoorAjar forName:SDLRPCParameterNameRearRightDoorAjar];
}
- (nullable NSNumber *)rearRightDoorAjar {
- return [store sdl_objectForName:SDLRPCParameterNameRearRightDoorAjar ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameRearRightDoorAjar ofClass:NSNumber.class error:nil];
}
@end
diff --git a/SmartDeviceLink/SDLButtonCapabilities.m b/SmartDeviceLink/SDLButtonCapabilities.m
index 79fbc3fdf..12cd24847 100644
--- a/SmartDeviceLink/SDLButtonCapabilities.m
+++ b/SmartDeviceLink/SDLButtonCapabilities.m
@@ -11,39 +11,39 @@
@implementation SDLButtonCapabilities
- (void)setName:(SDLButtonName)name {
- [store sdl_setObject:name forName:SDLRPCParameterNameName];
+ [self.store sdl_setObject:name forName:SDLRPCParameterNameName];
}
- (SDLButtonName)name {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameName error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameName error:&error];
}
- (void)setShortPressAvailable:(NSNumber *)shortPressAvailable {
- [store sdl_setObject:shortPressAvailable forName:SDLRPCParameterNameShortPressAvailable];
+ [self.store sdl_setObject:shortPressAvailable forName:SDLRPCParameterNameShortPressAvailable];
}
- (NSNumber *)shortPressAvailable {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameShortPressAvailable ofClass:NSNumber.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameShortPressAvailable ofClass:NSNumber.class error:&error];
}
- (void)setLongPressAvailable:(NSNumber *)longPressAvailable {
- [store sdl_setObject:longPressAvailable forName:SDLRPCParameterNameLongPressAvailable];
+ [self.store sdl_setObject:longPressAvailable forName:SDLRPCParameterNameLongPressAvailable];
}
- (NSNumber *)longPressAvailable {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameLongPressAvailable ofClass:NSNumber.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameLongPressAvailable ofClass:NSNumber.class error:&error];
}
- (void)setUpDownAvailable:(NSNumber *)upDownAvailable {
- [store sdl_setObject:upDownAvailable forName:SDLRPCParameterNameUpDownAvailable];
+ [self.store sdl_setObject:upDownAvailable forName:SDLRPCParameterNameUpDownAvailable];
}
- (NSNumber *)upDownAvailable {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameUpDownAvailable ofClass:NSNumber.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameUpDownAvailable ofClass:NSNumber.class error:&error];
}
@end
diff --git a/SmartDeviceLink/SDLButtonPress.m b/SmartDeviceLink/SDLButtonPress.m
index 7823edbe2..f79152830 100644
--- a/SmartDeviceLink/SDLButtonPress.m
+++ b/SmartDeviceLink/SDLButtonPress.m
@@ -11,11 +11,14 @@
@implementation SDLButtonPress
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameButtonPress]) {
}
return self;
}
+#pragma clang diagnostic pop
- (instancetype)initWithButtonName:(SDLButtonName) buttonName moduleType:(SDLModuleType) moduleType {
self = [self init];
@@ -30,30 +33,30 @@ - (instancetype)initWithButtonName:(SDLButtonName) buttonName moduleType:(SDLMod
}
- (void)setModuleType:(SDLModuleType)moduleType {
- [parameters sdl_setObject:moduleType forName:SDLRPCParameterNameModuleType];
+ [self.parameters sdl_setObject:moduleType forName:SDLRPCParameterNameModuleType];
}
- (SDLModuleType)moduleType {
NSError *error = nil;
- return [parameters sdl_enumForName:SDLRPCParameterNameModuleType error:&error];
+ return [self.parameters sdl_enumForName:SDLRPCParameterNameModuleType error:&error];
}
- (void)setButtonName:(SDLButtonName)buttonName {
- [parameters sdl_setObject:buttonName forName:SDLRPCParameterNameButtonName];
+ [self.parameters sdl_setObject:buttonName forName:SDLRPCParameterNameButtonName];
}
- (SDLButtonName)buttonName {
NSError *error = nil;
- return [parameters sdl_enumForName:SDLRPCParameterNameButtonName error:&error];
+ return [self.parameters sdl_enumForName:SDLRPCParameterNameButtonName error:&error];
}
- (void)setButtonPressMode:(SDLButtonPressMode)buttonPressMode {
- [parameters sdl_setObject:buttonPressMode forName:SDLRPCParameterNameButtonPressMode];
+ [self.parameters sdl_setObject:buttonPressMode forName:SDLRPCParameterNameButtonPressMode];
}
- (SDLButtonPressMode)buttonPressMode {
NSError *error = nil;
- return [parameters sdl_enumForName:SDLRPCParameterNameButtonPressMode error:&error];
+ return [self.parameters sdl_enumForName:SDLRPCParameterNameButtonPressMode error:&error];
}
@end
diff --git a/SmartDeviceLink/SDLButtonPressResponse.m b/SmartDeviceLink/SDLButtonPressResponse.m
index 6b0beb802..0dde4c52e 100644
--- a/SmartDeviceLink/SDLButtonPressResponse.m
+++ b/SmartDeviceLink/SDLButtonPressResponse.m
@@ -10,11 +10,14 @@
@implementation SDLButtonPressResponse
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameButtonPress]) {
}
return self;
}
+#pragma clang diagnostic pop
@end
diff --git a/SmartDeviceLink/SDLChangeRegistration.m b/SmartDeviceLink/SDLChangeRegistration.m
index 828653a39..87a14cb9d 100644
--- a/SmartDeviceLink/SDLChangeRegistration.m
+++ b/SmartDeviceLink/SDLChangeRegistration.m
@@ -13,11 +13,14 @@
@implementation SDLChangeRegistration
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameChangeRegistration]) {
}
return self;
}
+#pragma clang diagnostic pop
- (instancetype)initWithLanguage:(SDLLanguage)language hmiDisplayLanguage:(SDLLanguage)hmiDisplayLanguage {
self = [self initWithLanguage:language hmiDisplayLanguage:hmiDisplayLanguage appName:nil ttsName:nil ngnMediaScreenAppName:nil vrSynonyms:nil];
@@ -45,53 +48,53 @@ - (instancetype)initWithLanguage:(SDLLanguage)language hmiDisplayLanguage:(SDLLa
}
- (void)setLanguage:(SDLLanguage)language {
- [parameters sdl_setObject:language forName:SDLRPCParameterNameLanguage];
+ [self.parameters sdl_setObject:language forName:SDLRPCParameterNameLanguage];
}
- (SDLLanguage)language {
NSError *error = nil;
- return [parameters sdl_enumForName:SDLRPCParameterNameLanguage error:&error];
+ return [self.parameters sdl_enumForName:SDLRPCParameterNameLanguage error:&error];
}
- (void)setHmiDisplayLanguage:(SDLLanguage )hmiDisplayLanguage {
- [parameters sdl_setObject:hmiDisplayLanguage forName:SDLRPCParameterNameHMIDisplayLanguage];
+ [self.parameters sdl_setObject:hmiDisplayLanguage forName:SDLRPCParameterNameHMIDisplayLanguage];
}
- (SDLLanguage)hmiDisplayLanguage {
NSError *error = nil;
- return [parameters sdl_enumForName:SDLRPCParameterNameHMIDisplayLanguage error:&error];
+ return [self.parameters sdl_enumForName:SDLRPCParameterNameHMIDisplayLanguage error:&error];
}
- (void)setAppName:(nullable NSString *)appName {
- [parameters sdl_setObject:appName forName:SDLRPCParameterNameAppName];
+ [self.parameters sdl_setObject:appName forName:SDLRPCParameterNameAppName];
}
- (nullable NSString *)appName {
- return [[parameters sdl_objectForName:SDLRPCParameterNameAppName ofClass:NSString.class error:nil] copy];
+ return [[self.parameters sdl_objectForName:SDLRPCParameterNameAppName ofClass:NSString.class error:nil] copy];
}
- (void)setTtsName:(nullable NSArray *)ttsName {
- [parameters sdl_setObject:ttsName forName:SDLRPCParameterNameTTSName];
+ [self.parameters sdl_setObject:ttsName forName:SDLRPCParameterNameTTSName];
}
- (nullable NSArray *)ttsName {
- return [parameters sdl_objectsForName:SDLRPCParameterNameTTSName ofClass:SDLTTSChunk.class error:nil];
+ return [self.parameters sdl_objectsForName:SDLRPCParameterNameTTSName ofClass:SDLTTSChunk.class error:nil];
}
- (void)setNgnMediaScreenAppName:(nullable NSString *)ngnMediaScreenAppName {
- [parameters sdl_setObject:ngnMediaScreenAppName forName:SDLRPCParameterNameNGNMediaScreenAppName];
+ [self.parameters sdl_setObject:ngnMediaScreenAppName forName:SDLRPCParameterNameNGNMediaScreenAppName];
}
- (nullable NSString *)ngnMediaScreenAppName {
- return [parameters sdl_objectForName:SDLRPCParameterNameNGNMediaScreenAppName ofClass:NSString.class error:nil];
+ return [self.parameters sdl_objectForName:SDLRPCParameterNameNGNMediaScreenAppName ofClass:NSString.class error:nil];
}
- (void)setVrSynonyms:(nullable NSArray *)vrSynonyms {
- [parameters sdl_setObject:vrSynonyms forName:SDLRPCParameterNameVRSynonyms];
+ [self.parameters sdl_setObject:vrSynonyms forName:SDLRPCParameterNameVRSynonyms];
}
- (nullable NSArray *)vrSynonyms {
- return [parameters sdl_objectsForName:SDLRPCParameterNameVRSynonyms ofClass:NSString.class error:nil];
+ return [self.parameters sdl_objectsForName:SDLRPCParameterNameVRSynonyms ofClass:NSString.class error:nil];
}
@end
diff --git a/SmartDeviceLink/SDLChangeRegistrationResponse.m b/SmartDeviceLink/SDLChangeRegistrationResponse.m
index 0765ffb00..a40493503 100644
--- a/SmartDeviceLink/SDLChangeRegistrationResponse.m
+++ b/SmartDeviceLink/SDLChangeRegistrationResponse.m
@@ -12,11 +12,14 @@
@implementation SDLChangeRegistrationResponse
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameChangeRegistration]) {
}
return self;
}
+#pragma clang diagnostic pop
@end
diff --git a/SmartDeviceLink/SDLChoice.m b/SmartDeviceLink/SDLChoice.m
index 0734c2a66..e384ddf86 100644
--- a/SmartDeviceLink/SDLChoice.m
+++ b/SmartDeviceLink/SDLChoice.m
@@ -39,61 +39,61 @@ - (instancetype)initWithId:(UInt16)choiceId menuName:(NSString *)menuName vrComm
}
- (void)setChoiceID:(NSNumber *)choiceID {
- [store sdl_setObject:choiceID forName:SDLRPCParameterNameChoiceId];
+ [self.store sdl_setObject:choiceID forName:SDLRPCParameterNameChoiceId];
}
- (NSNumber *)choiceID {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameChoiceId ofClass:NSNumber.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameChoiceId ofClass:NSNumber.class error:&error];
}
- (void)setMenuName:(NSString *)menuName {
- [store sdl_setObject:menuName forName:SDLRPCParameterNameMenuName];
+ [self.store sdl_setObject:menuName forName:SDLRPCParameterNameMenuName];
}
- (NSString *)menuName {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameMenuName ofClass:NSString.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameMenuName ofClass:NSString.class error:&error];
}
- (void)setVrCommands:(nullable NSArray *)vrCommands {
- [store sdl_setObject:vrCommands forName:SDLRPCParameterNameVRCommands];
+ [self.store sdl_setObject:vrCommands forName:SDLRPCParameterNameVRCommands];
}
- (nullable NSArray *)vrCommands {
- return [store sdl_objectsForName:SDLRPCParameterNameVRCommands ofClass:NSString.class error:nil];
+ return [self.store sdl_objectsForName:SDLRPCParameterNameVRCommands ofClass:NSString.class error:nil];
}
- (void)setImage:(nullable SDLImage *)image {
- [store sdl_setObject:image forName:SDLRPCParameterNameImage];
+ [self.store sdl_setObject:image forName:SDLRPCParameterNameImage];
}
- (nullable SDLImage *)image {
- return [store sdl_objectForName:SDLRPCParameterNameImage ofClass:SDLImage.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameImage ofClass:SDLImage.class error:nil];
}
- (void)setSecondaryText:(nullable NSString *)secondaryText {
- [store sdl_setObject:secondaryText forName:SDLRPCParameterNameSecondaryText];
+ [self.store sdl_setObject:secondaryText forName:SDLRPCParameterNameSecondaryText];
}
- (nullable NSString *)secondaryText {
- return [store sdl_objectForName:SDLRPCParameterNameSecondaryText ofClass:NSString.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameSecondaryText ofClass:NSString.class error:nil];
}
- (void)setTertiaryText:(nullable NSString *)tertiaryText {
- [store sdl_setObject:tertiaryText forName:SDLRPCParameterNameTertiaryText];
+ [self.store sdl_setObject:tertiaryText forName:SDLRPCParameterNameTertiaryText];
}
- (nullable NSString *)tertiaryText {
- return [store sdl_objectForName:SDLRPCParameterNameTertiaryText ofClass:NSString.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameTertiaryText ofClass:NSString.class error:nil];
}
- (void)setSecondaryImage:(nullable SDLImage *)secondaryImage {
- [store sdl_setObject:secondaryImage forName:SDLRPCParameterNameSecondaryImage];
+ [self.store sdl_setObject:secondaryImage forName:SDLRPCParameterNameSecondaryImage];
}
- (nullable SDLImage *)secondaryImage {
- return [store sdl_objectForName:SDLRPCParameterNameSecondaryImage ofClass:SDLImage.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameSecondaryImage ofClass:SDLImage.class error:nil];
}
@end
diff --git a/SmartDeviceLink/SDLChoiceSet.m b/SmartDeviceLink/SDLChoiceSet.m
index da58749b4..0892e611d 100644
--- a/SmartDeviceLink/SDLChoiceSet.m
+++ b/SmartDeviceLink/SDLChoiceSet.m
@@ -57,7 +57,7 @@ - (instancetype)initWithTitle:(NSString *)title delegate:(id 500) {
- SDLLogW(@"Attempted to create a choice set with a %lu length. Only 500 characters are supported", (unsigned long)title.length);
+ SDLLogW(@"Attempted to create a choice set title with a %lu length. Only 500 characters are supported", (unsigned long)title.length);
return nil;
}
@@ -123,6 +123,14 @@ + (void)setDefaultLayout:(SDLChoiceSetLayout)defaultLayout {
_defaultLayout = defaultLayout;
}
+- (void)setHelpList:(nullable NSArray *)helpList {
+ _helpList = helpList;
+
+ for (NSUInteger i = 0; i < _helpList.count; i++) {
+ _helpList[i].position = @(i + 1);
+ }
+}
+
#pragma mark - Etc.
- (NSString *)description {
diff --git a/SmartDeviceLink/SDLChoiceSetManager.m b/SmartDeviceLink/SDLChoiceSetManager.m
index 21dff1cc5..037878fc5 100644
--- a/SmartDeviceLink/SDLChoiceSetManager.m
+++ b/SmartDeviceLink/SDLChoiceSetManager.m
@@ -183,7 +183,13 @@ - (void)didEnterStateStartupError {
#pragma mark Upload / Delete
- (void)preloadChoices:(NSArray *)choices withCompletionHandler:(nullable SDLPreloadChoiceCompletionHandler)handler {
- if (![self.currentState isEqualToString:SDLChoiceManagerStateReady]) { return; }
+ if ([self.currentState isEqualToString:SDLChoiceManagerStateShutdown]) {
+ if (handler != nil) {
+ NSError *error = [NSError sdl_choiceSetManager_incorrectState:self.currentState];
+ handler(error);
+ }
+ return;
+ }
NSMutableSet *choicesToUpload = [[self sdl_choicesToBeUploadedWithArray:choices] mutableCopy];
[choicesToUpload minusSet:self.preloadedMutableChoices];
@@ -372,7 +378,7 @@ - (void)sdl_findIdsOnChoices:(NSSet *)choices {
}
}
-#pragma mark - Setters
+#pragma mark - Keyboard Configuration
- (void)setKeyboardConfiguration:(nullable SDLKeyboardProperties *)keyboardConfiguration {
if (keyboardConfiguration == nil) {
diff --git a/SmartDeviceLink/SDLClimateControlCapabilities.m b/SmartDeviceLink/SDLClimateControlCapabilities.m
index e34c8405f..e2e488a94 100644
--- a/SmartDeviceLink/SDLClimateControlCapabilities.m
+++ b/SmartDeviceLink/SDLClimateControlCapabilities.m
@@ -39,132 +39,132 @@ - (instancetype)initWithModuleName:(NSString *)moduleName fanSpeedAvailable:(BOO
}
- (void)setModuleName:(NSString *)moduleName {
- [store sdl_setObject:moduleName forName:SDLRPCParameterNameModuleName];
+ [self.store sdl_setObject:moduleName forName:SDLRPCParameterNameModuleName];
}
- (NSString *)moduleName {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameModuleName ofClass:NSString.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameModuleName ofClass:NSString.class error:&error];
}
- (void)setFanSpeedAvailable:(nullable NSNumber *)fanSpeedAvailable {
- [store sdl_setObject:fanSpeedAvailable forName:SDLRPCParameterNameFanSpeedAvailable];
+ [self.store sdl_setObject:fanSpeedAvailable forName:SDLRPCParameterNameFanSpeedAvailable];
}
- (nullable NSNumber *)fanSpeedAvailable {
- return [store sdl_objectForName:SDLRPCParameterNameFanSpeedAvailable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameFanSpeedAvailable ofClass:NSNumber.class error:nil];
}
- (void)setDesiredTemperatureAvailable:(nullable NSNumber *)desiredTemperatureAvailable {
- [store sdl_setObject:desiredTemperatureAvailable forName:SDLRPCParameterNameDesiredTemperatureAvailable];
+ [self.store sdl_setObject:desiredTemperatureAvailable forName:SDLRPCParameterNameDesiredTemperatureAvailable];
}
- (nullable NSNumber *)desiredTemperatureAvailable {
- return [store sdl_objectForName:SDLRPCParameterNameDesiredTemperatureAvailable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameDesiredTemperatureAvailable ofClass:NSNumber.class error:nil];
}
- (void)setAcEnableAvailable:(nullable NSNumber *)acEnableAvailable {
- [store sdl_setObject:acEnableAvailable forName:SDLRPCParameterNameACEnableAvailable];
+ [self.store sdl_setObject:acEnableAvailable forName:SDLRPCParameterNameACEnableAvailable];
}
- (nullable NSNumber *)acEnableAvailable {
- return [store sdl_objectForName:SDLRPCParameterNameACEnableAvailable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameACEnableAvailable ofClass:NSNumber.class error:nil];
}
- (void)setAcMaxEnableAvailable:(nullable NSNumber *)acMaxEnableAvailable {
- [store sdl_setObject:acMaxEnableAvailable forName:SDLRPCParameterNameACMaxEnableAvailable];
+ [self.store sdl_setObject:acMaxEnableAvailable forName:SDLRPCParameterNameACMaxEnableAvailable];
}
- (nullable NSNumber *)acMaxEnableAvailable {
- return [store sdl_objectForName:SDLRPCParameterNameACMaxEnableAvailable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameACMaxEnableAvailable ofClass:NSNumber.class error:nil];
}
- (void)setCirculateAirEnableAvailable:(nullable NSNumber *)circulateAirEnableAvailable {
- [store sdl_setObject:circulateAirEnableAvailable forName:SDLRPCParameterNameCirculateAirEnableAvailable];
+ [self.store sdl_setObject:circulateAirEnableAvailable forName:SDLRPCParameterNameCirculateAirEnableAvailable];
}
- (nullable NSNumber *)circulateAirEnableAvailable {
- return [store sdl_objectForName:SDLRPCParameterNameCirculateAirEnableAvailable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameCirculateAirEnableAvailable ofClass:NSNumber.class error:nil];
}
- (void)setAutoModeEnableAvailable:(nullable NSNumber *)autoModeEnableAvailable {
- [store sdl_setObject:autoModeEnableAvailable forName:SDLRPCParameterNameAutoModeEnableAvailable];
+ [self.store sdl_setObject:autoModeEnableAvailable forName:SDLRPCParameterNameAutoModeEnableAvailable];
}
- (nullable NSNumber *)autoModeEnableAvailable {
- return [store sdl_objectForName:SDLRPCParameterNameAutoModeEnableAvailable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameAutoModeEnableAvailable ofClass:NSNumber.class error:nil];
}
- (void)setDualModeEnableAvailable:(nullable NSNumber *)dualModeEnableAvailable {
- [store sdl_setObject:dualModeEnableAvailable forName:SDLRPCParameterNameDualModeEnableAvailable];
+ [self.store sdl_setObject:dualModeEnableAvailable forName:SDLRPCParameterNameDualModeEnableAvailable];
}
- (nullable NSNumber *)dualModeEnableAvailable {
- return [store sdl_objectForName:SDLRPCParameterNameDualModeEnableAvailable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameDualModeEnableAvailable ofClass:NSNumber.class error:nil];
}
- (void)setDefrostZoneAvailable:(nullable NSNumber *)defrostZoneAvailable {
- [store sdl_setObject:defrostZoneAvailable forName:SDLRPCParameterNameDefrostZoneAvailable];
+ [self.store sdl_setObject:defrostZoneAvailable forName:SDLRPCParameterNameDefrostZoneAvailable];
}
- (nullable NSNumber *)defrostZoneAvailable {
- return [store sdl_objectForName:SDLRPCParameterNameDefrostZoneAvailable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameDefrostZoneAvailable ofClass:NSNumber.class error:nil];
}
- (void)setDefrostZone:(nullable NSArray *)defrostZone {
- [store sdl_setObject:defrostZone forName:SDLRPCParameterNameDefrostZone];
+ [self.store sdl_setObject:defrostZone forName:SDLRPCParameterNameDefrostZone];
}
- (nullable NSArray *)defrostZone {
- return [store sdl_enumsForName:SDLRPCParameterNameDefrostZone error:nil];
+ return [self.store sdl_enumsForName:SDLRPCParameterNameDefrostZone error:nil];
}
- (void)setVentilationModeAvailable:(nullable NSNumber *)ventilationModeAvailable {
- [store sdl_setObject:ventilationModeAvailable forName:SDLRPCParameterNameVentilationModeAvailable];
+ [self.store sdl_setObject:ventilationModeAvailable forName:SDLRPCParameterNameVentilationModeAvailable];
}
- (nullable NSNumber *)ventilationModeAvailable {
- return [store sdl_objectForName:SDLRPCParameterNameVentilationModeAvailable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameVentilationModeAvailable ofClass:NSNumber.class error:nil];
}
- (void)setVentilationMode:(nullable NSArray *)ventilationMode {
- [store sdl_setObject:ventilationMode forName:SDLRPCParameterNameVentilationMode];
+ [self.store sdl_setObject:ventilationMode forName:SDLRPCParameterNameVentilationMode];
}
- (nullable NSArray *)ventilationMode {
- return [store sdl_enumsForName:SDLRPCParameterNameVentilationMode error:nil];
+ return [self.store sdl_enumsForName:SDLRPCParameterNameVentilationMode error:nil];
}
- (void)setHeatedSteeringWheelAvailable:(nullable NSNumber *)heatedSteeringWheelAvailable {
- [store sdl_setObject:heatedSteeringWheelAvailable forName:SDLRPCParameterNameHeatedSteeringWheelAvailable];
+ [self.store sdl_setObject:heatedSteeringWheelAvailable forName:SDLRPCParameterNameHeatedSteeringWheelAvailable];
}
- (nullable NSNumber *)heatedSteeringWheelAvailable {
- return [store sdl_objectForName:SDLRPCParameterNameHeatedSteeringWheelAvailable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameHeatedSteeringWheelAvailable ofClass:NSNumber.class error:nil];
}
- (void)setHeatedWindshieldAvailable:(nullable NSNumber *)heatedWindshieldAvailable {
- [store sdl_setObject:heatedWindshieldAvailable forName:SDLRPCParameterNameHeatedWindshieldAvailable];
+ [self.store sdl_setObject:heatedWindshieldAvailable forName:SDLRPCParameterNameHeatedWindshieldAvailable];
}
- (nullable NSNumber *)heatedWindshieldAvailable {
- return [store sdl_objectForName:SDLRPCParameterNameHeatedWindshieldAvailable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameHeatedWindshieldAvailable ofClass:NSNumber.class error:nil];
}
- (void)setHeatedRearWindowAvailable:(nullable NSNumber *)heatedRearWindowAvailable {
- [store sdl_setObject:heatedRearWindowAvailable forName:SDLRPCParameterNameHeatedRearWindowAvailable];
+ [self.store sdl_setObject:heatedRearWindowAvailable forName:SDLRPCParameterNameHeatedRearWindowAvailable];
}
- (nullable NSNumber *)heatedRearWindowAvailable {
- return [store sdl_objectForName:SDLRPCParameterNameHeatedRearWindowAvailable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameHeatedRearWindowAvailable ofClass:NSNumber.class error:nil];
}
- (void)setHeatedMirrorsAvailable:(nullable NSNumber *)heatedMirrorsAvailable {
- [store sdl_setObject:heatedMirrorsAvailable forName:SDLRPCParameterNameHeatedMirrorsAvailable];
+ [self.store sdl_setObject:heatedMirrorsAvailable forName:SDLRPCParameterNameHeatedMirrorsAvailable];
}
- (nullable NSNumber *)heatedMirrorsAvailable {
- return [store sdl_objectForName:SDLRPCParameterNameHeatedMirrorsAvailable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameHeatedMirrorsAvailable ofClass:NSNumber.class error:nil];
}
@end
diff --git a/SmartDeviceLink/SDLClimateControlData.m b/SmartDeviceLink/SDLClimateControlData.m
index f5e312e58..e84e87821 100644
--- a/SmartDeviceLink/SDLClimateControlData.m
+++ b/SmartDeviceLink/SDLClimateControlData.m
@@ -39,115 +39,115 @@ - (instancetype)initWithFanSpeed:(nullable NSNumber *)fanSpeed desiredTe
}
- (void)setFanSpeed:(nullable NSNumber *)fanSpeed {
- [store sdl_setObject:fanSpeed forName:SDLRPCParameterNameFanSpeed];
+ [self.store sdl_setObject:fanSpeed forName:SDLRPCParameterNameFanSpeed];
}
- (nullable NSNumber *)fanSpeed {
- return [store sdl_objectForName:SDLRPCParameterNameFanSpeed ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameFanSpeed ofClass:NSNumber.class error:nil];
}
- (void)setCurrentTemperature:(nullable SDLTemperature *)currentTemperature {
- [store sdl_setObject:currentTemperature forName:SDLRPCParameterNameCurrentTemperature];
+ [self.store sdl_setObject:currentTemperature forName:SDLRPCParameterNameCurrentTemperature];
}
- (nullable SDLTemperature *)currentTemperature {
- return [store sdl_objectForName:SDLRPCParameterNameCurrentTemperature ofClass:SDLTemperature.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameCurrentTemperature ofClass:SDLTemperature.class error:nil];
}
- (void)setDesiredTemperature:(nullable SDLTemperature *)desiredTemperature {
- [store sdl_setObject:desiredTemperature forName:SDLRPCParameterNameDesiredTemperature];
+ [self.store sdl_setObject:desiredTemperature forName:SDLRPCParameterNameDesiredTemperature];
}
- (nullable SDLTemperature *)desiredTemperature {
- return [store sdl_objectForName:SDLRPCParameterNameDesiredTemperature ofClass:SDLTemperature.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameDesiredTemperature ofClass:SDLTemperature.class error:nil];
}
- (void)setAcEnable:(nullable NSNumber *)acEnable {
- [store sdl_setObject:acEnable forName:SDLRPCParameterNameACEnable];
+ [self.store sdl_setObject:acEnable forName:SDLRPCParameterNameACEnable];
}
- (nullable NSNumber *)acEnable {
- return [store sdl_objectForName:SDLRPCParameterNameACEnable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameACEnable ofClass:NSNumber.class error:nil];
}
- (void)setCirculateAirEnable:(nullable NSNumber *)circulateAirEnable {
- [store sdl_setObject:circulateAirEnable forName:SDLRPCParameterNameCirculateAirEnable];
+ [self.store sdl_setObject:circulateAirEnable forName:SDLRPCParameterNameCirculateAirEnable];
}
- (nullable NSNumber *)circulateAirEnable {
- return [store sdl_objectForName:SDLRPCParameterNameCirculateAirEnable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameCirculateAirEnable ofClass:NSNumber.class error:nil];
}
- (void)setAutoModeEnable:(nullable NSNumber *)autoModeEnable {
- [store sdl_setObject:autoModeEnable forName:SDLRPCParameterNameAutoModeEnable];
+ [self.store sdl_setObject:autoModeEnable forName:SDLRPCParameterNameAutoModeEnable];
}
- (nullable NSNumber *)autoModeEnable {
- return [store sdl_objectForName:SDLRPCParameterNameAutoModeEnable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameAutoModeEnable ofClass:NSNumber.class error:nil];
}
- (void)setDefrostZone:(nullable SDLDefrostZone)defrostZone {
- [store sdl_setObject:defrostZone forName:SDLRPCParameterNameDefrostZone];
+ [self.store sdl_setObject:defrostZone forName:SDLRPCParameterNameDefrostZone];
}
- (nullable SDLDefrostZone)defrostZone {
- return [store sdl_enumForName:SDLRPCParameterNameDefrostZone error:nil];
+ return [self.store sdl_enumForName:SDLRPCParameterNameDefrostZone error:nil];
}
- (void)setDualModeEnable:(nullable NSNumber *)dualModeEnable {
- [store sdl_setObject:dualModeEnable forName:SDLRPCParameterNameDualModeEnable];
+ [self.store sdl_setObject:dualModeEnable forName:SDLRPCParameterNameDualModeEnable];
}
- (nullable NSNumber *)dualModeEnable {
- return [store sdl_objectForName:SDLRPCParameterNameDualModeEnable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameDualModeEnable ofClass:NSNumber.class error:nil];
}
- (void)setAcMaxEnable:(nullable NSNumber *)acMaxEnable {
- [store sdl_setObject:acMaxEnable forName:SDLRPCParameterNameACMaxEnable];
+ [self.store sdl_setObject:acMaxEnable forName:SDLRPCParameterNameACMaxEnable];
}
- (nullable NSNumber *)acMaxEnable {
- return [store sdl_objectForName:SDLRPCParameterNameACMaxEnable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameACMaxEnable ofClass:NSNumber.class error:nil];
}
- (void)setVentilationMode:(nullable SDLVentilationMode)ventilationMode {
- [store sdl_setObject:ventilationMode forName:SDLRPCParameterNameVentilationMode];
+ [self.store sdl_setObject:ventilationMode forName:SDLRPCParameterNameVentilationMode];
}
- (nullable SDLVentilationMode)ventilationMode {
- return [store sdl_enumForName:SDLRPCParameterNameVentilationMode error:nil];
+ return [self.store sdl_enumForName:SDLRPCParameterNameVentilationMode error:nil];
}
- (void)setHeatedSteeringWheelEnable:(nullable NSNumber *)heatedSteeringWheelEnable {
- [store sdl_setObject:heatedSteeringWheelEnable forName:SDLRPCParameterNameHeatedSteeringWheelEnable];
+ [self.store sdl_setObject:heatedSteeringWheelEnable forName:SDLRPCParameterNameHeatedSteeringWheelEnable];
}
- (nullable NSNumber *)heatedSteeringWheelEnable {
- return [store sdl_objectForName:SDLRPCParameterNameHeatedSteeringWheelEnable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameHeatedSteeringWheelEnable ofClass:NSNumber.class error:nil];
}
- (void)setHeatedWindshieldEnable:(nullable NSNumber *)heatedWindshieldEnable {
- [store sdl_setObject:heatedWindshieldEnable forName:SDLRPCParameterNameHeatedWindshieldEnable];
+ [self.store sdl_setObject:heatedWindshieldEnable forName:SDLRPCParameterNameHeatedWindshieldEnable];
}
- (nullable NSNumber *)heatedWindshieldEnable {
- return [store sdl_objectForName:SDLRPCParameterNameHeatedWindshieldEnable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameHeatedWindshieldEnable ofClass:NSNumber.class error:nil];
}
- (void)setHeatedRearWindowEnable:(nullable NSNumber *)heatedRearWindowEnable {
- [store sdl_setObject:heatedRearWindowEnable forName:SDLRPCParameterNameHeatedRearWindowEnable];
+ [self.store sdl_setObject:heatedRearWindowEnable forName:SDLRPCParameterNameHeatedRearWindowEnable];
}
- (nullable NSNumber *)heatedRearWindowEnable {
- return [store sdl_objectForName:SDLRPCParameterNameHeatedRearWindowEnable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameHeatedRearWindowEnable ofClass:NSNumber.class error:nil];
}
- (void)setHeatedMirrorsEnable:(nullable NSNumber *)heatedMirrorsEnable {
- [store sdl_setObject:heatedMirrorsEnable forName:SDLRPCParameterNameHeatedMirrorsEnable];
+ [self.store sdl_setObject:heatedMirrorsEnable forName:SDLRPCParameterNameHeatedMirrorsEnable];
}
- (nullable NSNumber *)heatedMirrorsEnable {
- return [store sdl_objectForName:SDLRPCParameterNameHeatedMirrorsEnable ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameHeatedMirrorsEnable ofClass:NSNumber.class error:nil];
}
@end
diff --git a/SmartDeviceLink/SDLCloudAppProperties.m b/SmartDeviceLink/SDLCloudAppProperties.m
index 389ab0144..3a2ad32a2 100644
--- a/SmartDeviceLink/SDLCloudAppProperties.m
+++ b/SmartDeviceLink/SDLCloudAppProperties.m
@@ -44,60 +44,60 @@ - (instancetype)initWithAppID:(NSString *)appID nicknames:(nullable NSArray *)nicknames {
- [store sdl_setObject:nicknames forName:SDLRPCParameterNameNicknames];
+ [self.store sdl_setObject:nicknames forName:SDLRPCParameterNameNicknames];
}
- (nullable NSArray *)nicknames {
- return [store sdl_objectsForName:SDLRPCParameterNameNicknames ofClass:NSString.class error:nil];
+ return [self.store sdl_objectsForName:SDLRPCParameterNameNicknames ofClass:NSString.class error:nil];
}
- (void)setAppID:(NSString *)appID {
- [store sdl_setObject:appID forName:SDLRPCParameterNameAppId];
+ [self.store sdl_setObject:appID forName:SDLRPCParameterNameAppId];
}
- (NSString *)appID {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNameAppId ofClass:NSString.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNameAppId ofClass:NSString.class error:&error];
}
- (void)setEnabled:(nullable NSNumber *)enabled {
- [store sdl_setObject:enabled forName:SDLRPCParameterNameEnabled];
+ [self.store sdl_setObject:enabled forName:SDLRPCParameterNameEnabled];
}
- (nullable NSNumber *)enabled {
- return [store sdl_objectForName:SDLRPCParameterNameEnabled ofClass:NSNumber.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameEnabled ofClass:NSNumber.class error:nil];
}
- (void)setAuthToken:(nullable NSString *)authToken {
- [store sdl_setObject:authToken forName:SDLRPCParameterNameAuthToken];
+ [self.store sdl_setObject:authToken forName:SDLRPCParameterNameAuthToken];
}
- (nullable NSString *)authToken {
- return [store sdl_objectForName:SDLRPCParameterNameAuthToken ofClass:NSString.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameAuthToken ofClass:NSString.class error:nil];
}
- (void)setCloudTransportType:(nullable NSString *)cloudTransportType {
- [store sdl_setObject:cloudTransportType forName:SDLRPCParameterNameCloudTransportType];
+ [self.store sdl_setObject:cloudTransportType forName:SDLRPCParameterNameCloudTransportType];
}
- (nullable NSString *)cloudTransportType {
- return [store sdl_objectForName:SDLRPCParameterNameCloudTransportType ofClass:NSString.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameCloudTransportType ofClass:NSString.class error:nil];
}
- (void)setHybridAppPreference:(nullable SDLHybridAppPreference)hybridAppPreference {
- [store sdl_setObject:hybridAppPreference forName:SDLRPCParameterNameHybridAppPreference];
+ [self.store sdl_setObject:hybridAppPreference forName:SDLRPCParameterNameHybridAppPreference];
}
- (nullable SDLHybridAppPreference)hybridAppPreference {
- return [store sdl_enumForName:SDLRPCParameterNameHybridAppPreference error:nil];
+ return [self.store sdl_enumForName:SDLRPCParameterNameHybridAppPreference error:nil];
}
- (void)setEndpoint:(nullable NSString *)endpoint {
- [store sdl_setObject:endpoint forName:SDLRPCParameterNameEndpoint];
+ [self.store sdl_setObject:endpoint forName:SDLRPCParameterNameEndpoint];
}
- (nullable NSString *)endpoint {
- return [store sdl_objectForName:SDLRPCParameterNameEndpoint ofClass:NSString.class error:nil];
+ return [self.store sdl_objectForName:SDLRPCParameterNameEndpoint ofClass:NSString.class error:nil];
}
@end
diff --git a/SmartDeviceLink/SDLClusterModeStatus.m b/SmartDeviceLink/SDLClusterModeStatus.m
index 05b635357..1558c0522 100644
--- a/SmartDeviceLink/SDLClusterModeStatus.m
+++ b/SmartDeviceLink/SDLClusterModeStatus.m
@@ -11,39 +11,39 @@
@implementation SDLClusterModeStatus
- (void)setPowerModeActive:(NSNumber *)powerModeActive {
- [store sdl_setObject:powerModeActive forName:SDLRPCParameterNamePowerModeActive];
+ [self.store sdl_setObject:powerModeActive forName:SDLRPCParameterNamePowerModeActive];
}
- (NSNumber *)powerModeActive {
NSError *error = nil;
- return [store sdl_objectForName:SDLRPCParameterNamePowerModeActive ofClass:NSNumber.class error:&error];
+ return [self.store sdl_objectForName:SDLRPCParameterNamePowerModeActive ofClass:NSNumber.class error:&error];
}
- (void)setPowerModeQualificationStatus:(SDLPowerModeQualificationStatus)powerModeQualificationStatus {
- [store sdl_setObject:powerModeQualificationStatus forName:SDLRPCParameterNamePowerModeQualificationStatus];
+ [self.store sdl_setObject:powerModeQualificationStatus forName:SDLRPCParameterNamePowerModeQualificationStatus];
}
- (SDLPowerModeQualificationStatus)powerModeQualificationStatus {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNamePowerModeQualificationStatus error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNamePowerModeQualificationStatus error:&error];
}
- (void)setCarModeStatus:(SDLCarModeStatus)carModeStatus {
- [store sdl_setObject:carModeStatus forName:SDLRPCParameterNameCarModeStatus];
+ [self.store sdl_setObject:carModeStatus forName:SDLRPCParameterNameCarModeStatus];
}
- (SDLCarModeStatus)carModeStatus {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNameCarModeStatus error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNameCarModeStatus error:&error];
}
- (void)setPowerModeStatus:(SDLPowerModeStatus)powerModeStatus {
- [store sdl_setObject:powerModeStatus forName:SDLRPCParameterNamePowerModeStatus];
+ [self.store sdl_setObject:powerModeStatus forName:SDLRPCParameterNamePowerModeStatus];
}
- (SDLPowerModeStatus)powerModeStatus {
NSError *error = nil;
- return [store sdl_enumForName:SDLRPCParameterNamePowerModeStatus error:&error];
+ return [self.store sdl_enumForName:SDLRPCParameterNamePowerModeStatus error:&error];
}
@end
diff --git a/SmartDeviceLink/SDLControlFramePayloadAudioStartServiceAck.m b/SmartDeviceLink/SDLControlFramePayloadAudioStartServiceAck.m
index be5460bb4..2dd186b1f 100644
--- a/SmartDeviceLink/SDLControlFramePayloadAudioStartServiceAck.m
+++ b/SmartDeviceLink/SDLControlFramePayloadAudioStartServiceAck.m
@@ -65,7 +65,11 @@ - (nullable NSData *)data {
}
- (void)sdl_parse:(NSData *)data {
- BsonObject payloadObject = bson_object_from_bytes((BytePtr)data.bytes);
+ BsonObject payloadObject;
+ size_t retval = bson_object_from_bytes_len(&payloadObject, (BytePtr)data.bytes, data.length);
+ if (retval <= 0) {
+ return;
+ }
self.mtu = bson_object_get_int64(&payloadObject, SDLControlFrameMTUKey);
diff --git a/SmartDeviceLink/SDLControlFramePayloadEndService.m b/SmartDeviceLink/SDLControlFramePayloadEndService.m
index 372400e7d..cabfb09df 100644
--- a/SmartDeviceLink/SDLControlFramePayloadEndService.m
+++ b/SmartDeviceLink/SDLControlFramePayloadEndService.m
@@ -65,7 +65,11 @@ - (nullable NSData *)data {
}
- (void)sdl_parse:(NSData *)data {
- BsonObject payloadObject = bson_object_from_bytes((BytePtr)data.bytes);
+ BsonObject payloadObject;
+ size_t retval = bson_object_from_bytes_len(&payloadObject, (BytePtr)data.bytes, data.length);
+ if (retval <= 0) {
+ return;
+ }
self.hashId = bson_object_get_int32(&payloadObject, SDLControlFrameHashIdKey);
diff --git a/SmartDeviceLink/SDLControlFramePayloadNak.m b/SmartDeviceLink/SDLControlFramePayloadNak.m
index 15f5c517c..55b9a6dad 100644
--- a/SmartDeviceLink/SDLControlFramePayloadNak.m
+++ b/SmartDeviceLink/SDLControlFramePayloadNak.m
@@ -70,7 +70,12 @@ - (nullable NSData *)data {
}
- (void)sdl_parse:(NSData *)data {
- BsonObject payloadObject = bson_object_from_bytes((BytePtr)data.bytes);
+ BsonObject payloadObject;
+ size_t retval = bson_object_from_bytes_len(&payloadObject, (BytePtr)data.bytes, data.length);
+ if (retval <= 0) {
+ return;
+ }
+
BsonArray *arrayObject = bson_object_get_array(&payloadObject, SDLControlFrameRejectedParams);
if (arrayObject == NULL) {
return;
diff --git a/SmartDeviceLink/SDLControlFramePayloadRPCStartService.m b/SmartDeviceLink/SDLControlFramePayloadRPCStartService.m
index d943d6a47..6409884d0 100644
--- a/SmartDeviceLink/SDLControlFramePayloadRPCStartService.m
+++ b/SmartDeviceLink/SDLControlFramePayloadRPCStartService.m
@@ -64,7 +64,11 @@ - (nullable NSData *)data {
}
- (void)sdl_parse:(NSData *)data {
- BsonObject payloadObject = bson_object_from_bytes((BytePtr)data.bytes);
+ BsonObject payloadObject;
+ size_t retval = bson_object_from_bytes_len(&payloadObject, (BytePtr)data.bytes, data.length);
+ if (retval <= 0) {
+ return;
+ }
char *utf8String = bson_object_get_string(&payloadObject, SDLControlFrameProtocolVersionKey);
if (utf8String != NULL) {
diff --git a/SmartDeviceLink/SDLControlFramePayloadRPCStartServiceAck.m b/SmartDeviceLink/SDLControlFramePayloadRPCStartServiceAck.m
index b9e54d9a3..e6afae672 100644
--- a/SmartDeviceLink/SDLControlFramePayloadRPCStartServiceAck.m
+++ b/SmartDeviceLink/SDLControlFramePayloadRPCStartServiceAck.m
@@ -114,7 +114,11 @@ - (nullable NSData *)data {
}
- (void)sdl_parse:(NSData *)data {
- BsonObject payloadObject = bson_object_from_bytes((BytePtr)data.bytes);
+ BsonObject payloadObject;
+ size_t retval = bson_object_from_bytes_len(&payloadObject, (BytePtr)data.bytes, data.length);
+ if (retval <= 0) {
+ return;
+ }
self.hashId = bson_object_get_int32(&payloadObject, SDLControlFrameHashIdKey);
self.mtu = bson_object_get_int64(&payloadObject, SDLControlFrameMTUKey);
diff --git a/SmartDeviceLink/SDLControlFramePayloadRegisterSecondaryTransportNak.m b/SmartDeviceLink/SDLControlFramePayloadRegisterSecondaryTransportNak.m
index 570d41fa5..600fd1b61 100644
--- a/SmartDeviceLink/SDLControlFramePayloadRegisterSecondaryTransportNak.m
+++ b/SmartDeviceLink/SDLControlFramePayloadRegisterSecondaryTransportNak.m
@@ -64,7 +64,11 @@ - (nullable NSData *)data {
}
- (void)sdl_parse:(NSData *)data {
- BsonObject payloadObject = bson_object_from_bytes((BytePtr)data.bytes);
+ BsonObject payloadObject;
+ size_t retval = bson_object_from_bytes_len(&payloadObject, (BytePtr)data.bytes, data.length);
+ if (retval <= 0) {
+ return;
+ }
char *reasonString = bson_object_get_string(&payloadObject, SDLControlFrameReasonKey);
if (reasonString != NULL) {
diff --git a/SmartDeviceLink/SDLControlFramePayloadTransportEventUpdate.m b/SmartDeviceLink/SDLControlFramePayloadTransportEventUpdate.m
index daaf3f13c..24b49ccec 100644
--- a/SmartDeviceLink/SDLControlFramePayloadTransportEventUpdate.m
+++ b/SmartDeviceLink/SDLControlFramePayloadTransportEventUpdate.m
@@ -80,7 +80,11 @@ - (nullable NSData *)data {
}
- (void)sdl_parse:(NSData *)data {
- BsonObject payloadObject = bson_object_from_bytes((BytePtr)data.bytes);
+ BsonObject payloadObject;
+ size_t retval = bson_object_from_bytes_len(&payloadObject, (BytePtr)data.bytes, data.length);
+ if (retval <= 0) {
+ return;
+ }
char *utf8String = bson_object_get_string(&payloadObject, SDLControlFrameTCPIPAddressKey);
if (utf8String != NULL) {
diff --git a/SmartDeviceLink/SDLControlFramePayloadVideoStartService.m b/SmartDeviceLink/SDLControlFramePayloadVideoStartService.m
index d33698ebb..d8dc841be 100644
--- a/SmartDeviceLink/SDLControlFramePayloadVideoStartService.m
+++ b/SmartDeviceLink/SDLControlFramePayloadVideoStartService.m
@@ -87,7 +87,11 @@ - (nullable NSData *)data {
}
- (void)sdl_parse:(NSData *)data {
- BsonObject payloadObject = bson_object_from_bytes((BytePtr)data.bytes);
+ BsonObject payloadObject;
+ size_t retval = bson_object_from_bytes_len(&payloadObject, (BytePtr)data.bytes, data.length);
+ if (retval <= 0) {
+ return;
+ }
self.height = bson_object_get_int32(&payloadObject, SDLControlFrameHeightKey);
self.width = bson_object_get_int32(&payloadObject, SDLControlFrameWidthKey);
diff --git a/SmartDeviceLink/SDLControlFramePayloadVideoStartServiceAck.m b/SmartDeviceLink/SDLControlFramePayloadVideoStartServiceAck.m
index d690d6690..7f071df50 100644
--- a/SmartDeviceLink/SDLControlFramePayloadVideoStartServiceAck.m
+++ b/SmartDeviceLink/SDLControlFramePayloadVideoStartServiceAck.m
@@ -93,7 +93,11 @@ - (nullable NSData *)data {
}
- (void)sdl_parse:(NSData *)data {
- BsonObject payloadObject = bson_object_from_bytes((BytePtr)data.bytes);
+ BsonObject payloadObject;
+ size_t retval = bson_object_from_bytes_len(&payloadObject, (BytePtr)data.bytes, data.length);
+ if (retval <= 0) {
+ return;
+ }
self.mtu = bson_object_get_int64(&payloadObject, SDLControlFrameMTUKey);
self.height = bson_object_get_int32(&payloadObject, SDLControlFrameHeightKey);
diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
index d35a0470b..00ee17093 100644
--- a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
+++ b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
@@ -13,11 +13,14 @@
@implementation SDLCreateInteractionChoiceSet
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameCreateInteractionChoiceSet]) {
}
return self;
}
+#pragma clang diagnostic pop
- (instancetype)initWithId:(UInt32)choiceId choiceSet:(NSArray *)choiceSet {
self = [self init];
@@ -31,21 +34,21 @@ - (instancetype)initWithId:(UInt32)choiceId choiceSet:(NSArray *)ch
}
- (void)setInteractionChoiceSetID:(NSNumber *)interactionChoiceSetID {
- [parameters sdl_setObject:interactionChoiceSetID forName:SDLRPCParameterNameInteractionChoiceSetId];
+ [self.parameters sdl_setObject:interactionChoiceSetID forName:SDLRPCParameterNameInteractionChoiceSetId];
}
- (NSNumber *)interactionChoiceSetID {
NSError *error = nil;
- return [parameters sdl_objectForName:SDLRPCParameterNameInteractionChoiceSetId ofClass:NSNumber.class error:&error];
+ return [self.parameters sdl_objectForName:SDLRPCParameterNameInteractionChoiceSetId ofClass:NSNumber.class error:&error];
}
- (void)setChoiceSet:(NSArray *)choiceSet {
- [parameters sdl_setObject:choiceSet forName:SDLRPCParameterNameChoiceSet];
+ [self.parameters sdl_setObject:choiceSet forName:SDLRPCParameterNameChoiceSet];
}
- (NSArray