Update for v4.5.04.5.0-beta.2

15 files changed, 64 insertions, 39 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d24c48dd..5d3548ea5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 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.
+* Added in nil-checks for SDLStreamingMediaManager's startSession completionHandlers.
+* 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
 ### Bug Fixes
 * Altered how Security libraries get the app id so they can start downloads faster.
diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec
index 70ea7dac7..a9d4c5feb 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.5.0-beta.1"
+s.version      = "4.5.0-beta.2"
 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-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
index a97dc6102..169f2fd8c 100644
--- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
+++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
@@ -4306,6 +4306,7 @@
 					};
 					5D61FA251A84237100846EE7 = {
 						CreatedOnToolsVersion = 6.1.1;
+						LastSwiftMigration = 0820;
 					};
 				};
 			};
@@ -5116,6 +5117,7 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -5155,6 +5157,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -5285,7 +5288,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.smartdevicelink.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -5315,7 +5318,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.smartdevicelink.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
diff --git a/SmartDeviceLink/Info.plist b/SmartDeviceLink/Info.plist
index 0ab46e104..8e9873841 100644
--- a/SmartDeviceLink/Info.plist
+++ b/SmartDeviceLink/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.5.0-beta.1</string>
+	<string>4.5.0-beta.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/SmartDeviceLink/SDLFileManager.m b/SmartDeviceLink/SDLFileManager.m
index 21e476a2e..86507224b 100644
--- a/SmartDeviceLink/SDLFileManager.m
+++ b/SmartDeviceLink/SDLFileManager.m
@@ -226,7 +226,7 @@ SDLFileManagerState *const SDLFileManagerStateStartupError = @"StartupError";
         }
         return;
     }
-    
+
     // Make sure we are able to send files
     if (![self.currentState isEqualToString:SDLFileManagerStateReady]) {
         if (handler != nil) {
@@ -234,16 +234,16 @@ SDLFileManagerState *const SDLFileManagerStateStartupError = @"StartupError";
         }
         return;
     }
-    
+
     // Check our overwrite settings and error out if it would overwrite
     if (file.overwrite == NO && [self.remoteFileNames containsObject:file.name]) {
         if (handler != nil) {
             handler(NO, self.bytesAvailable, [NSError sdl_fileManager_cannotOverwriteError]);
         }
-        
+
         return;
     }
-    
+
     // If we didn't error out over the overwrite, then continue on
     [self sdl_uploadFile:file completionHandler:handler];
 }
diff --git a/SmartDeviceLink/SDLGetWaypoints.h b/SmartDeviceLink/SDLGetWaypoints.h
index 9f5187bd8..a596e45a6 100644
--- a/SmartDeviceLink/SDLGetWaypoints.h
+++ b/SmartDeviceLink/SDLGetWaypoints.h
@@ -21,5 +21,5 @@
 @end
 
 __deprecated_msg("Use SDLGetWayPoints instead")
-@interface SDLGetWaypoints : SDLGetWayPoints
-@end
+    @interface SDLGetWaypoints : SDLGetWayPoints
+                                 @end
diff --git a/SmartDeviceLink/SDLGetWaypointsResponse.h b/SmartDeviceLink/SDLGetWaypointsResponse.h
index f673cfc5b..fe1489c7d 100644
--- a/SmartDeviceLink/SDLGetWaypointsResponse.h
+++ b/SmartDeviceLink/SDLGetWaypointsResponse.h
@@ -19,5 +19,5 @@
 @end
 
 __deprecated_msg("Use SDLGetWayPointsResponse instead")
-@interface SDLGetWaypointsResponse : SDLGetWayPointsResponse
-@end
+    @interface SDLGetWaypointsResponse : SDLGetWayPointsResponse
+                                         @end
diff --git a/SmartDeviceLink/SDLOnWaypointChange.h b/SmartDeviceLink/SDLOnWaypointChange.h
index a7d011a83..58b5fca81 100644
--- a/SmartDeviceLink/SDLOnWaypointChange.h
+++ b/SmartDeviceLink/SDLOnWaypointChange.h
@@ -17,5 +17,5 @@
 @end
 
 __deprecated_msg("Use SDLOnWayPointChange instead")
-@interface SDLOnWaypointChange : SDLOnWayPointChange
-@end
+    @interface SDLOnWaypointChange : SDLOnWayPointChange
+                                     @end
diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m
index fb89d57f7..5a1513534 100644
--- a/SmartDeviceLink/SDLProxy.m
+++ b/SmartDeviceLink/SDLProxy.m
@@ -49,7 +49,7 @@ typedef NSString SDLVehicleMake;
 typedef void (^URLSessionTaskCompletionHandler)(NSData *data, NSURLResponse *response, NSError *error);
 typedef void (^URLSessionDownloadTaskCompletionHandler)(NSURL *location, NSURLResponse *response, NSError *error);
 
-NSString *const SDLProxyVersion = @"4.5.0-beta.1";
+NSString *const SDLProxyVersion = @"4.5.0-beta.2";
 const float startSessionTime = 10.0;
 const float notifyProxyClosedDelay = 0.1;
 const int POLICIES_CORRELATION_ID = 65535;
diff --git a/SmartDeviceLink/SDLStreamingMediaManager.m b/SmartDeviceLink/SDLStreamingMediaManager.m
index 63321f134..55a361bc7 100644
--- a/SmartDeviceLink/SDLStreamingMediaManager.m
+++ b/SmartDeviceLink/SDLStreamingMediaManager.m
@@ -145,8 +145,10 @@ NS_ASSUME_NONNULL_BEGIN
                                     typeof(weakSelf) strongSelf = weakSelf;
                                     // If success, we will get an ACK or NACK, so those methods will handle calling the video block
                                     if (!success) {
-                                        if (strongSelf.videoStartBlock == nil) { return; }
-                                        
+                                        if (strongSelf.videoStartBlock == nil) {
+                                            return;
+                                        }
+
                                         strongSelf.videoStartBlock(NO, NO, error);
                                         strongSelf.videoStartBlock = nil;
                                     }
@@ -182,8 +184,10 @@ NS_ASSUME_NONNULL_BEGIN
                                     typeof(weakSelf) strongSelf = weakSelf;
                                     // If this passes, we will get an ACK or NACK, so those methods will handle calling the audio block
                                     if (!success) {
-                                        if (strongSelf.audioStartBlock == nil) { return; }
-                                        
+                                        if (strongSelf.audioStartBlock == nil) {
+                                            return;
+                                        }
+
                                         strongSelf.audioStartBlock(NO, NO, error);
                                         strongSelf.audioStartBlock = nil;
                                     }
@@ -281,9 +285,11 @@ NS_ASSUME_NONNULL_BEGIN
         case SDLServiceType_Audio: {
             self.audioSessionConnected = YES;
             self.audioSessionEncrypted = header.encrypted;
-            
-            if (self.audioStartBlock == nil) { return; }
-            
+
+            if (self.audioStartBlock == nil) {
+                return;
+            }
+
             self.audioStartBlock(YES, header.encrypted, nil);
             self.audioStartBlock = nil;
         } break;
@@ -294,19 +300,23 @@ NS_ASSUME_NONNULL_BEGIN
             if (!success) {
                 [self sdl_teardownCompressionSession];
                 [self.protocol endServiceWithType:SDLServiceType_Video];
-                
-                if (self.videoStartBlock == nil) { return; }
-                
+
+                if (self.videoStartBlock == nil) {
+                    return;
+                }
+
                 self.videoStartBlock(NO, header.encrypted, error);
                 self.videoStartBlock = nil;
-                
+
                 return;
             }
 
             self.videoSessionConnected = YES;
             self.videoSessionEncrypted = header.encrypted;
-            
-            if (self.videoStartBlock == nil) { return; }
+
+            if (self.videoStartBlock == nil) {
+                return;
+            }
 
             self.videoStartBlock(YES, header.encrypted, nil);
             self.videoStartBlock = nil;
@@ -320,7 +330,9 @@ NS_ASSUME_NONNULL_BEGIN
         case SDLServiceType_Audio: {
             NSError *error = [NSError errorWithDomain:SDLErrorDomainStreamingMediaAudio code:SDLStreamingAudioErrorHeadUnitNACK userInfo:nil];
 
-            if (self.audioStartBlock == nil) { return; }
+            if (self.audioStartBlock == nil) {
+                return;
+            }
 
             self.audioStartBlock(NO, NO, error);
             self.audioStartBlock = nil;
@@ -328,7 +340,9 @@ NS_ASSUME_NONNULL_BEGIN
         case SDLServiceType_Video: {
             NSError *error = [NSError errorWithDomain:SDLErrorDomainStreamingMediaVideo code:SDLStreamingVideoErrorHeadUnitNACK userInfo:nil];
 
-            if (self.videoStartBlock == nil) { return; }
+            if (self.videoStartBlock == nil) {
+                return;
+            }
 
             self.videoStartBlock(NO, NO, error);
             self.videoStartBlock = nil;
diff --git a/SmartDeviceLink/SDLSubscribeWaypoints.h b/SmartDeviceLink/SDLSubscribeWaypoints.h
index 0ccd67f80..fb04caf97 100644
--- a/SmartDeviceLink/SDLSubscribeWaypoints.h
+++ b/SmartDeviceLink/SDLSubscribeWaypoints.h
@@ -15,5 +15,5 @@
 @end
 
 __deprecated_msg("Use SDLSubscribeWayPoints instead")
-@interface SDLSubscribeWaypoints : SDLSubscribeWayPoints
-@end
+    @interface SDLSubscribeWaypoints : SDLSubscribeWayPoints
+                                       @end
diff --git a/SmartDeviceLink/SDLSubscribeWaypointsResponse.h b/SmartDeviceLink/SDLSubscribeWaypointsResponse.h
index 53e51e163..cd13c2af6 100644
--- a/SmartDeviceLink/SDLSubscribeWaypointsResponse.h
+++ b/SmartDeviceLink/SDLSubscribeWaypointsResponse.h
@@ -8,5 +8,5 @@
 @end
 
 __deprecated_msg("Use SDLSubscribeWayPointsResponse instead")
-@interface SDLSubscribeWaypointsResponse : SDLSubscribeWayPointsResponse
-@end
+    @interface SDLSubscribeWaypointsResponse : SDLSubscribeWayPointsResponse
+                                               @end
diff --git a/SmartDeviceLink/SDLUnsubscribeWaypoints.h b/SmartDeviceLink/SDLUnsubscribeWaypoints.h
index 6d0857c98..d5e477ad7 100644
--- a/SmartDeviceLink/SDLUnsubscribeWaypoints.h
+++ b/SmartDeviceLink/SDLUnsubscribeWaypoints.h
@@ -8,5 +8,5 @@
 @end
 
 __deprecated_msg("Use SDLUnsubscribeWayPoints instead")
-@interface SDLUnsubscribeWaypoints : SDLUnsubscribeWayPoints
-@end
+    @interface SDLUnsubscribeWaypoints : SDLUnsubscribeWayPoints
+                                         @end
diff --git a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h b/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h
index 1d8eac28d..11a9e7961 100644
--- a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h
+++ b/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h
@@ -8,5 +8,5 @@
 @end
 
 __deprecated_msg("Use SDLUnsubscribeWayPointsResponse instead")
-@interface SDLUnsubscribeWaypointsResponse : SDLUnsubscribeWayPointsResponse
-@end
+    @interface SDLUnsubscribeWaypointsResponse : SDLUnsubscribeWayPointsResponse
+                                                 @end
diff --git a/SmartDeviceLink_Example/Info.plist b/SmartDeviceLink_Example/Info.plist
index 763ce529e..3d23b0b7f 100644
--- a/SmartDeviceLink_Example/Info.plist
+++ b/SmartDeviceLink_Example/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.5.0-beta.1</string>
+	<string>4.5.0-beta.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>