Fix old protocol methods still in use

2 files changed, 16 insertions, 15 deletions

diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m
index d2b913f7d..ef5eb9857 100644
--- a/SmartDeviceLink/SDLProxy.m
+++ b/SmartDeviceLink/SDLProxy.m
@@ -216,12 +216,12 @@ static float DefaultConnectionTimeout = 45.0;
     [self invokeMethodOnDelegates:@selector(onError:) withObject:e];
 }
 
-- (void)handleProtocolStartSessionACK:(SDLProtocolHeader *)header {
+- (void)handleProtocolStartServiceACKMessage:(SDLProtocolMessage *)startServiceACK {
     // Turn off the timer, the start session response came back
     [self.startSessionTimer cancel];
-    SDLLogV(@"StartSession (response)\nSessionId: %d for serviceType %d", header.sessionID, header.serviceType);
+    SDLLogV(@"StartSession (response)\nSessionId: %d for serviceType %d", startServiceACK.header.sessionID, startServiceACK.header.serviceType);
 
-    if (header.serviceType == SDLServiceTypeRPC) {
+    if (startServiceACK.header.serviceType == SDLServiceTypeRPC) {
         [self invokeMethodOnDelegates:@selector(onProxyOpened) withObject:nil];
     }
 }
diff --git a/SmartDeviceLink/SDLStreamingMediaLifecycleManager.m b/SmartDeviceLink/SDLStreamingMediaLifecycleManager.m
index 86523c0f4..76489e012 100644
--- a/SmartDeviceLink/SDLStreamingMediaLifecycleManager.m
+++ b/SmartDeviceLink/SDLStreamingMediaLifecycleManager.m
@@ -16,6 +16,7 @@
 #import "SDLLogMacros.h"
 #import "SDLNotificationConstants.h"
 #import "SDLOnHMIStatus.h"
+#import "SDLProtocolMessage.h"
 #import "SDLRegisterAppInterfaceResponse.h"
 #import "SDLRPCNotificationNotification.h"
 #import "SDLRPCResponseNotification.h"
@@ -371,32 +372,32 @@ static NSUInteger const SDLFramesToSendOnBackground = 30;
 }
 
 #pragma mark - SDLProtocolListener
-- (void)handleProtocolStartSessionACK:(SDLProtocolHeader *)header {
-    switch (header.serviceType) {
+- (void)handleProtocolStartServiceACKMessage:(SDLProtocolMessage *)startServiceACK {
+    switch (startServiceACK.header.serviceType) {
         case SDLServiceTypeAudio: {
-            _audioEncrypted = header.encrypted;
-            
+            _audioEncrypted = startServiceACK.header.encrypted;
+
             [self.audioStreamStateMachine transitionToState:SDLAudioStreamStateReady];
         } break;
         case SDLServiceTypeVideo: {
-            _videoEncrypted = header.encrypted;
-            
+            _videoEncrypted = startServiceACK.header.encrypted;
+
             [self.videoStreamStateMachine transitionToState:SDLVideoStreamStateReady];
         } break;
         default: break;
     }
 }
 
-- (void)handleProtocolStartSessionNACK:(SDLServiceType)serviceType {
-    [self sdl_transitionToStoppedState:serviceType];
+- (void)handleProtocolStartServiceNAKMessage:(SDLProtocolMessage *)startServiceNAK {
+    [self sdl_transitionToStoppedState:startServiceNAK.header.serviceType];
 }
 
-- (void)handleProtocolEndSessionACK:(SDLServiceType)serviceType {
-    [self sdl_transitionToStoppedState:serviceType];
+- (void)handleProtocolEndServiceACKMessage:(SDLProtocolMessage *)endServiceACK {
+    [self sdl_transitionToStoppedState:endServiceACK.header.serviceType];
 }
 
-- (void)handleProtocolEndSessionNACK:(SDLServiceType)serviceType {
-    [self sdl_transitionToStoppedState:serviceType];
+- (void)handleProtocolEndServiceNAKMessage:(SDLProtocolMessage *)endServiceNAK {
+    [self sdl_transitionToStoppedState:endServiceNAK.header.serviceType];
 }
 
 #pragma mark - SDLVideoEncoderDelegate