From f2464c218c5ec65fea393a3b39f14da2ae784b9e Mon Sep 17 00:00:00 2001 From: Joel Fischer Date: Thu, 13 Oct 2016 10:29:35 -0400 Subject: [PATCH] Update to v4.3.0-rc.6 --- CHANGELOG.md | 4 ++++ README.md | 2 +- SmartDeviceLink-iOS.podspec | 2 +- SmartDeviceLink/Info.plist | 2 +- SmartDeviceLink/SDLError.m | 16 ++++++++-------- SmartDeviceLink/SDLProxy.m | 2 +- SmartDeviceLink_Example/Info.plist | 2 +- 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b3e6fd97..797d44c93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 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) ### Bug Fixes * Fixed an issue where "SmartDeviceLink.h" would not be available through cocoapods. diff --git a/README.md b/README.md index c4fd33dc7..07abecd04 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ See the [roadmap](https://github.com/smartdevicelink/sdl_ios/wiki/Roadmap) to se You can install this library using [Cocoapods](https://cocoapods.org/pods/SmartDeviceLink-iOS). You can get started with Cocoapods by [following their install guide](https://guides.cocoapods.org/using/getting-started.html#getting-started), and learn how to use Cocoapods to install dependencies [by following this guide](https://guides.cocoapods.org/using/using-cocoapods.html). -In your podfile, you want to add `pod 'SmartDeviceLink-iOS', '4.3.0-rc.5'`. Then run `pod install` inside your terminal. With Cocoapods, we support iOS 6.0+. +In your podfile, you want to add `pod 'SmartDeviceLink-iOS', '4.3.0-rc.6'`. Then run `pod install` inside your terminal. With Cocoapods, we support iOS 6.0+. ##### Carthage diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec index d6a803d9d..c53042382 100644 --- a/SmartDeviceLink-iOS.podspec +++ b/SmartDeviceLink-iOS.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "SmartDeviceLink-iOS" -s.version = "4.3.0-rc.5" +s.version = "4.3.0-rc.6" s.summary = "Connect your app with cars!" s.homepage = "https://github.com/smartdevicelink/SmartDeviceLink-iOS" s.license = { :type => "New BSD", :file => "LICENSE" } diff --git a/SmartDeviceLink/Info.plist b/SmartDeviceLink/Info.plist index 34224c4fc..836dd16ba 100644 --- a/SmartDeviceLink/Info.plist +++ b/SmartDeviceLink/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 4.3.0-rc.3 + 4.3.0-rc.6 CFBundleSignature ???? CFBundleVersion diff --git a/SmartDeviceLink/SDLError.m b/SmartDeviceLink/SDLError.m index 8595ecc4d..d60e877f7 100644 --- a/SmartDeviceLink/SDLError.m +++ b/SmartDeviceLink/SDLError.m @@ -117,19 +117,19 @@ + (NSError *)sdl_fileManager_noKnownFileError { + (NSError *)sdl_fileManager_unableToStartError { NSDictionary *userInfo = @{ - NSLocalizedDescriptionKey: NSLocalizedString(@"The file manager was unable to start", nil), - NSLocalizedFailureReasonErrorKey: NSLocalizedString(@"This may be because files are not supported on this unit and / or LISTFILES returned an error", nil), - NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(@"Make sure that the system is sending back a proper LIST FILES response", nil) - }; + NSLocalizedDescriptionKey: NSLocalizedString(@"The file manager was unable to start", nil), + NSLocalizedFailureReasonErrorKey: NSLocalizedString(@"This may be because files are not supported on this unit and / or LISTFILES returned an error", nil), + NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(@"Make sure that the system is sending back a proper LIST FILES response", nil) + }; return [NSError errorWithDomain:SDLErrorDomainFileManager code:SDLFileManagerErrorNoKnownFile userInfo:userInfo]; } + (NSError *)sdl_fileManager_unableToUploadError { NSDictionary *userInfo = @{ - NSLocalizedDescriptionKey: NSLocalizedString(@"The file manager was unable to send this file", nil), - NSLocalizedFailureReasonErrorKey: NSLocalizedString(@"This could be because the file manager has not started, or the head unit does not support files", nil), - NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(@"Make sure that the system is sending back a proper LIST FILES response and check the file manager's state", nil) - }; + NSLocalizedDescriptionKey: NSLocalizedString(@"The file manager was unable to send this file", nil), + NSLocalizedFailureReasonErrorKey: NSLocalizedString(@"This could be because the file manager has not started, or the head unit does not support files", nil), + NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(@"Make sure that the system is sending back a proper LIST FILES response and check the file manager's state", nil) + }; return [NSError errorWithDomain:SDLErrorDomainFileManager code:SDLFileManagerErrorNoKnownFile userInfo:userInfo]; } diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m index 08f04dc74..918a4e660 100644 --- a/SmartDeviceLink/SDLProxy.m +++ b/SmartDeviceLink/SDLProxy.m @@ -50,7 +50,7 @@ typedef void (^URLSessionTaskCompletionHandler)(NSData *data, NSURLResponse *response, NSError *error); typedef void (^URLSessionDownloadTaskCompletionHandler)(NSURL *location, NSURLResponse *response, NSError *error); -NSString *const SDLProxyVersion = @"4.3.0-rc.5"; +NSString *const SDLProxyVersion = @"4.3.0-rc.6"; const float startSessionTime = 10.0; const float notifyProxyClosedDelay = 0.1; const int POLICIES_CORRELATION_ID = 65535; diff --git a/SmartDeviceLink_Example/Info.plist b/SmartDeviceLink_Example/Info.plist index f31075e26..1fc0a6580 100644 --- a/SmartDeviceLink_Example/Info.plist +++ b/SmartDeviceLink_Example/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.3.0-rc.5 + 4.3.0-rc.6 CFBundleSignature ???? CFBundleVersion