Fix StreamingMediaManager always trying to start with encryption

smartdevicelink · Feb 18, 2016 · f782e8d · f782e8d
1 parent 8a5b736
commit f782e8d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 20 deletions.
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m
@@ -161,8 +161,8 @@ - (void)addSecurityManager:(Class)securityManagerClass forMake:(NSString *)vehic
 }
 
 - (id<SDLSecurityType>)securityManagerForMake:(NSString *)make {
-    if ((make != nil) && (_securityManagers[make] != nil)) {
-        Class securityManagerClass = _securityManagers[make];
+    if ((make != nil) && (self.securityManagers[make] != nil)) {
+        Class securityManagerClass = self.securityManagers[make];
         return [[securityManagerClass alloc] init];
     }
 

diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLStreamingMediaManager.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLStreamingMediaManager.m
@@ -82,15 +82,19 @@ - (void)startVideoSessionWithEncryption:(BOOL)encryption startBlock:(SDLStreamin
 
     self.videoStartBlock = [startBlock copy];
 
-    __weak typeof(self) weakSelf = self;
-    [self.protocol startEncryptedServiceWithType:SDLServiceType_Video completionHandler:^(BOOL success, NSError *error) {
-        typeof(weakSelf) strongSelf = weakSelf;
-        // If this passes, we will get an ACK or NACK, so those methods will handle calling the video block
-        if (!success) {
-            strongSelf.videoStartBlock(NO, NO, error);
-            strongSelf.videoStartBlock = nil;
-        }
-    }];
+    if (encryption) {
+        __weak typeof(self) weakSelf = self;
+        [self.protocol startEncryptedServiceWithType:SDLServiceType_Video completionHandler:^(BOOL success, NSError *error) {
+            typeof(weakSelf) strongSelf = weakSelf;
+            // If success, we will get an ACK or NACK, so those methods will handle calling the video block
+            if (!success) {
+                strongSelf.videoStartBlock(NO, NO, error);
+                strongSelf.videoStartBlock = nil;
+            }
+        }];
+    } else {
+        [self.protocol startServiceWithType:SDLServiceType_Video];
+    }
 }
 
 - (void)stopVideoSession {
@@ -110,15 +114,19 @@ - (void)startAudioStreamingWithStartBlock:(SDLStreamingStartBlock)startBlock {
 - (void)startAudioStreamingWithEncryption:(BOOL)encryption startBlock:(SDLStreamingStartBlock)startBlock {
     self.audioStartBlock = [startBlock copy];
 
-    __weak typeof(self) weakSelf = self;
-    [self.protocol startEncryptedServiceWithType:SDLServiceType_Audio completionHandler:^(BOOL success, NSError *error) {
-        typeof(weakSelf) strongSelf = weakSelf;
-        // If this passes, we will get an ACK or NACK, so those methods will handle calling the video block
-        if (!success) {
-            strongSelf.audioStartBlock(NO, NO, error);
-            strongSelf.audioStartBlock = nil;
-        }
-    }];
+    if (encryption) {
+        __weak typeof(self) weakSelf = self;
+        [self.protocol startEncryptedServiceWithType:SDLServiceType_Audio completionHandler:^(BOOL success, NSError *error) {
+            typeof(weakSelf) strongSelf = weakSelf;
+            // If this passes, we will get an ACK or NACK, so those methods will handle calling the video block
+            if (!success) {
+                strongSelf.audioStartBlock(NO, NO, error);
+                strongSelf.audioStartBlock = nil;
+            }
+        }];
+    } else {
+        [self.protocol startServiceWithType:SDLServiceType_Audio];
+    }
 }
 
 - (void)stopAudioSession {