summaryrefslogtreecommitdiff
path: root/SmartDeviceLink_Example
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release/5.0.0' into feature/streaming_media_managerJoel Fischer2017-08-161-4/+8
|\ | | | | | | | | # Conflicts: # SmartDeviceLink-iOS.xcodeproj/project.pbxproj
| * Merge branch 'release/5.0.0' into feature/issue_536_input_stream_file_managerNicoleYarroch2017-07-314-42/+80
| |\
| * | Updated carthageNicoleYarroch2017-04-051-4/+8
| | | | | | | | | | | | Signed-off-by: NicoleYarroch <nicole@livio.io>
* | | Merge branch 'release/5.0.0' into feature/streaming_media_managerJoel Fischer2017-08-013-38/+77
|\ \ \ | | |/ | |/| | | | | | | | | | | | | # Conflicts: # SmartDeviceLink-iOS.podspec # SmartDeviceLink-iOS.xcodeproj/project.pbxproj # SmartDeviceLink/SDLStreamingMediaManager.m
| * | Merge branch 'jamescs-feature/implement_SDL_0080_multisession_protocol' into ↵Joel Fischer2017-07-281-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | release/5.0.0 # Conflicts: # SmartDeviceLink/SDLIAPTransport.m
| | * | Added multisession protocol to info.plist for example appJames Sokoll2017-07-281-0/+1
| | | |
| | * | Fix system capability response handlers not firingfeature/611_system_capabilities_query_rpcJoel Fischer2017-07-131-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix some headers not being public # Conflicts: # SmartDeviceLink-iOS.xcodeproj/project.pbxproj
| * | | Merge branch 'develop' into release/5.0.0Joel Fischer2017-07-101-1/+1
| |\ \ \ | | |/ /
| | * | Update for v4.6.14.6.1Joel Fischer2017-07-101-1/+1
| | | |
| * | | Merge branch 'master' into release/5.0.0Joel Fischer2017-07-103-38/+76
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | # Conflicts: # SmartDeviceLink-iOS.xcodeproj/project.pbxproj # SmartDeviceLink_Example/Classes/ProxyManager.m
| | * | [Example App] Fix a compiler errorJoel Fischer2017-07-031-2/+2
| | | |
| | * | Update example app with a GetVehicleData commandJoel Fischer2017-06-292-36/+68
| | | |
| | * | Update for 4.6.0-rc.24.6.0-rc.2Joel Fischer2017-06-261-1/+1
| | | |
| | * | small cleanupbugfix/issue_625BrettyWhite2017-06-141-4/+2
| | | |
| | * | FIx crash when using example app with iAPBrettyWhite2017-06-141-0/+8
| | | |
| * | | Merge branch 'master' into developJoel Fischer2017-06-051-1/+1
| |\ \ \ |/ / / / | | _ / | | / | | | | | | | | | | | | | | | | | | | | | # Conflicts: # SmartDeviceLink-iOS.xcodeproj/project.pbxproj # SmartDeviceLink/SDLIAPSession.h # SmartDeviceLink/SDLIAPSession.m # SmartDeviceLink/SDLIAPTransport.m # SmartDeviceLink/SDLLifecycleManager.m # SmartDeviceLink/SDLProxy.m # SmartDeviceLink/SDLRPCRequestFactory.m
| * | Update for v4.6.04.6.0-rc.1Joel Fischer2017-06-011-1/+1
| | |
* | | Merge branch 'master' into developJoel Fischer2017-04-182-4/+3
|\ \ \ | |/ / | | / | |/ |/| # Conflicts: # SmartDeviceLink/SDLProxyFactory.m
| * Remove uses of @importhotfix/issue_595Joel Fischer2017-03-312-4/+3
| |
* | Update how log module filters workJoel Fischer2017-03-211-0/+1
| | | | | | | | * [Example App] Add an example filter
* | File logging fixesJoel Fischer2017-03-211-0/+3
| | | | | | | | * [Example app] Added additional logging
* | Merge remote-tracking branch 'origin/develop' into ↵Muller, Alexander (A.)2017-03-171-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/issue_545_redesign_logging * origin/develop: Updated appType to return when setting to nil with default value. Changed NSString category name from Enum to SDLEnum. Added convenience isEqualToEnum function. Update README.md # Conflicts: # SmartDeviceLink-iOS.xcodeproj/project.pbxproj # SmartDeviceLink/SDLEnum.h # SmartDeviceLink/SDLProxy.m
| * | Added convenience isEqualToEnum function.feature/issue_577_enum_equalityMuller, Alexander (A.)2017-03-131-5/+5
| | |
* | | Targets are now hashableJoel Fischer2017-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | * [Example App] Fix debug log configuration * Fix SDLLog.swift not found * Fix SDLLog.swift functions not compiling * Comments on logging stuff
* | | Update example app to use sdl loggerJoel Fischer2017-03-092-14/+18
| | |
* | | Fix last commitJoel Fischer2017-03-091-3/+0
| | |
* | | Merge branch 'develop' into feature/issue_545_redesign_loggingJoel Fischer2017-03-092-6/+8
|\ \ \ | |/ / | | | | | | | | | # Conflicts: # SmartDeviceLink/SDLLifecycleManager.m
| * | Merge branch 'develop' into feature/issue_537_handler_specificityJoel Fischer2017-03-092-2/+2
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # SmartDeviceLink/SDLResponseDispatcher.m
| | * \ Merge remote-tracking branch 'origin/master' into developMuller, Alexander (A.)2017-03-081-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: Update LICENSE Update to v4.5.5 Tiny style update Prevent infinite loops in send block while by checking ostream state.
| | | * Update to v4.5.54.5.5Joel Fischer2017-03-071-1/+1
| | | |
| * | | Fix handler updates in example app and unit testsJoel Fischer2017-03-031-5/+7
| | | |
* | | | Merge branch 'develop' into feature/issue_545_redesign_loggingJoel Fischer2017-03-071-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' into developJoel Fischer2017-03-071-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Fixed issue with incorrectly setting state on manager disconnect.hotfix/issue_560Muller, Alexander (A.)2017-03-021-1/+1
| | | |
* | | | In progress SDLDebugTool log replacementsJoel Fischer2017-03-032-6/+4
| | | |
* | | | Comment out all `SDLDebugTool` callsJoel Fischer2017-03-032-3/+5
|/ / /
* | | Merge remote-tracking branch 'origin/master' into developMuller, Alexander (A.)2017-02-281-1/+1
|\ \ \ | |/ / | | / | |/ |/| | | | | | | * origin/master: Update to v4.5.4 Improved state machine throw. Also added in more specific spec to handle this. Added in more descriptive exception throw for debugging. Adding in check for nullable properties of video encoder callback
| * Update to v4.5.44.5.4Joel Fischer2017-02-241-1/+1
| |
* | Merge branch 'master' into developJoel Fischer2017-02-081-1/+1
|\ \ | |/
| * Update for v4.5.34.5.3Joel Fischer2017-02-081-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developMuller, Alexander (A.)2017-02-071-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * origin/master: Set compressionSession to null so we do not accidentally over-release it. Added check for hmi equality and old send delegate if not equal. Set swift-version for cocoapods until we can upgrade tests Update to v4.5.2 Run clang-format Moved point at which we set the logging to be before we initialize anything within the lifecycle manager. Update logger to initialize on lifecycle initialization, not start Fixed issue with SDLDebugTool not keeping state with proxy recycle.
| * Update to v4.5.24.5.2Joel Fischer2017-01-271-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developMuller, Alexander (A.)2017-01-265-39/+57
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: Fixed issue with retain cycle within the dispatch_after block. Fix double semi-colon Re-add reconnecting state Don’t auto-reconnect in example project Cleaned up ProxyManager startWithReadyHandler: In order to restart properly, we need to start only after managerDidDisconnect (per new documentation). Adding a fix to restarting the proxy around an Apple Bug. Adding a note about stopping SDLManager. Removing Reconnecting state and instead using started. Updated lifecycle manager states to handle stopping the manager correctly. Fixed issue with stopping the proxy didn't actually stop it. # Conflicts: # SmartDeviceLink-iOS.xcodeproj/project.pbxproj # SmartDeviceLink/SDLLifecycleManager.m
| * Re-add reconnecting stateJoel Fischer2017-01-263-33/+44
| |
| * Don’t auto-reconnect in example projectJoel Fischer2017-01-262-4/+5
| | | | | | | | | | | | ##### Example Project * Fix not properly updating proxy state * Fix connect button not properly updating
| * Cleaned up ProxyManager startWithReadyHandler:Muller, Alexander (A.)2017-01-251-4/+5
| |
| * In order to restart properly, we need to start only after ↵Muller, Alexander (A.)2017-01-251-1/+5
| | | | | | | | managerDidDisconnect (per new documentation).
| * Fixed issue with stopping the proxy didn't actually stop it.Muller, Alexander (A.)2017-01-201-1/+2
| |
* | Merge pull request #508 from ↵Joel Fischer2017-01-241-5/+5
|\ \ | | | | | | | | | | | | smartdevicelink/feature/sdl_0005_immutable_rpc_collections [SDL-0005] Immutable RPC collections
| * | Update broken tests and example app to use immutable arraysJoel Fischer2017-01-201-5/+5
| | |
View Lorry Controller Status