Removing class check and fixed test casebugfix/issue-1097-Add-Missing-ProtocolViolationCheck

2 files changed, 3 insertions, 3 deletions

diff --git a/SmartDeviceLink/SDLLifecycleManager.m b/SmartDeviceLink/SDLLifecycleManager.m
index 02ddfeb84..23eebd272 100644
--- a/SmartDeviceLink/SDLLifecycleManager.m
+++ b/SmartDeviceLink/SDLLifecycleManager.m
@@ -789,7 +789,7 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
         [self sdl_transitionToState:SDLLifecycleStateStopped];
     } else if ([self.lifecycleStateMachine isCurrentState:SDLLifecycleStateStopped]) {
         return;
-    } else if ([appUnregisteredNotification.reason isKindOfClass:[NSString class]] && ([appUnregisteredNotification.reason isEqualToEnum:SDLAppInterfaceUnregisteredReasonAppUnauthorized] || [appUnregisteredNotification.reason isEqualToString:SDLAppInterfaceUnregisteredReasonProtocolViolation])) {
+    } else if (appUnregisteredNotification.reason != nil && ([appUnregisteredNotification.reason isEqualToEnum:SDLAppInterfaceUnregisteredReasonAppUnauthorized] || [appUnregisteredNotification.reason isEqualToString:SDLAppInterfaceUnregisteredReasonProtocolViolation])) {
         // HAX: The string check is due to a core "feature" that could cause -1 to be sent as the enum value, which will crash here.
         [self sdl_transitionToState:SDLLifecycleStateStopped];
     } else {
diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m
index 1c326b2a7..0385898d2 100644
--- a/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m
+++ b/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m
@@ -525,7 +525,7 @@ describe(@"a lifecycle manager", ^{
                     SDLRPCNotificationNotification *notification = [[SDLRPCNotificationNotification alloc] initWithName:SDLDidReceiveAppUnregisteredNotification object:testManager.notificationDispatcher rpcNotification:unreg];
                     
                     [[NSNotificationCenter defaultCenter] postNotification:notification];
-                    expect(testManager.lifecycleState).toEventually(match(SDLLifecycleStateStopped));
+                    expect(testManager.lifecycleState).toEventually(equal(SDLLifecycleStateStopped));
                 });
        
                 it(@"should attempt to stop the manager when an APP_UNAUTHORIZED notification is recieved", ^{
@@ -536,7 +536,7 @@ describe(@"a lifecycle manager", ^{
                     SDLRPCNotificationNotification *notification = [[SDLRPCNotificationNotification alloc] initWithName:SDLDidReceiveAppUnregisteredNotification object:testManager.notificationDispatcher rpcNotification:unreg];
                     
                     [[NSNotificationCenter defaultCenter] postNotification:notification];
-                    expect(testManager.lifecycleState).toEventually(match(SDLLifecycleStateStopped));
+                    expect(testManager.lifecycleState).toEventually(equal(SDLLifecycleStateStopped));
                 });
             });