1 files changed, 13 insertions, 14 deletions

diff --git a/SmartDeviceLink/SDLLockScreenStatusManager.m b/SmartDeviceLink/SDLLockScreenStatusManager.m
index 86350b0d0..08742991d 100644
--- a/SmartDeviceLink/SDLLockScreenStatusManager.m
+++ b/SmartDeviceLink/SDLLockScreenStatusManager.m
@@ -5,7 +5,6 @@
 
 #import "SDLLockScreenStatusManager.h"
 
-#import "SDLHMILevel.h"
 #import "SDLLockScreenStatus.h"
 #import "SDLOnLockScreenStatus.h"
 
@@ -40,14 +39,14 @@
     _haveDriverDistractionStatus = YES;
 }
 
-- (void)setHmiLevel:(SDLHMILevel *)hmiLevel {
+- (void)setHmiLevel:(SDLHMILevel)hmiLevel {
     if (_hmiLevel != hmiLevel) {
         _hmiLevel = hmiLevel;
     }
 
-    if ([hmiLevel isEqualToEnum:[SDLHMILevel FULL]] || [hmiLevel isEqualToEnum:[SDLHMILevel LIMITED]]) {
+    if ([hmiLevel isEqualToString:SDLHMILevelFull] || [hmiLevel isEqualToString:SDLHMILevelLimited]) {
         self.userSelected = YES;
-    } else if ([hmiLevel isEqualToEnum:[SDLHMILevel NONE]]) {
+    } else if ([hmiLevel isEqualToString:SDLHMILevelNone]) {
         self.userSelected = NO;
     }
 }
@@ -65,30 +64,30 @@
     return notification;
 }
 
-- (SDLLockScreenStatus *)lockScreenStatus {
-    if (self.hmiLevel == nil || [self.hmiLevel isEqualToEnum:[SDLHMILevel NONE]]) {
+- (SDLLockScreenStatus)lockScreenStatus {
+    if (self.hmiLevel == nil || [self.hmiLevel isEqualToString:SDLHMILevelNone]) {
         // App is not active on the car
-        return [SDLLockScreenStatus OFF];
-    } else if ([self.hmiLevel isEqualToEnum:[SDLHMILevel BACKGROUND]]) {
+        return SDLLockScreenStatusOff;
+    } else if ([self.hmiLevel isEqualToString:SDLHMILevelBackground]) {
         // App is in the background on the car
         // The lockscreen depends entirely on if the user selected the app
         if (self.userSelected) {
-            return [SDLLockScreenStatus REQUIRED];
+            return SDLLockScreenStatusRequired;
         } else {
-            return [SDLLockScreenStatus OFF];
+            return SDLLockScreenStatusOff;
         }
-    } else if ([self.hmiLevel isEqualToEnum:[SDLHMILevel FULL]] || [self.hmiLevel isEqualToEnum:[SDLHMILevel LIMITED]]) {
+    } else if ([self.hmiLevel isEqualToString:SDLHMILevelFull] || [self.hmiLevel isEqualToString:SDLHMILevelLimited]) {
         // App is in the foreground on the car in some manner
         if (self.haveDriverDistractionStatus && !self.driverDistracted) {
             // We have the distraction status, and the driver is not distracted
-            return [SDLLockScreenStatus OPTIONAL];
+            return SDLLockScreenStatusOptional;
         } else {
             // We don't have the distraction status, and/or the driver is distracted
-            return [SDLLockScreenStatus REQUIRED];
+            return SDLLockScreenStatusRequired;
         }
     } else {
         // This shouldn't be possible.
-        return [SDLLockScreenStatus OFF];
+        return SDLLockScreenStatusOff;
     }
 }