1 files changed, 69 insertions, 6 deletions

diff --git a/SmartDeviceLink/SDLLockScreenStatusManager.m b/SmartDeviceLink/SDLLockScreenStatusManager.m
index 4ab22faa4..e661abd80 100644
--- a/SmartDeviceLink/SDLLockScreenStatusManager.m
+++ b/SmartDeviceLink/SDLLockScreenStatusManager.m
@@ -6,7 +6,13 @@
 #import "SDLLockScreenStatusManager.h"
 
 #import "SDLLockScreenStatus.h"
+#import "SDLLogMacros.h"
+#import "SDLNotificationConstants.h"
+#import "SDLNotificationDispatcher.h"
+#import "SDLOnDriverDistraction.h"
+#import "SDLOnHMIStatus.h"
 #import "SDLOnLockScreenStatus.h"
+#import "SDLRPCNotificationNotification.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -21,13 +27,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark - Lifecycle
 
-- (instancetype)init {
+- (instancetype)initWithNotificationDispatcher:(SDLNotificationDispatcher *)dispatcher {
     self = [super init];
-    if (self) {
-        _userSelected = NO;
-        _driverDistracted = NO;
-        _haveDriverDistractionStatus = NO;
-    }
+    if (!self) { return nil; }
+
+    _userSelected = NO;
+    _driverDistracted = NO;
+    _haveDriverDistractionStatus = NO;
+
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sdl_hmiStatusDidUpdate:) name:SDLDidChangeHMIStatusNotification object:dispatcher];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sdl_driverDistractionDidUpdate:) name:SDLDidChangeDriverDistractionStateNotification object:dispatcher];
+
     return self;
 }
 
@@ -68,39 +78,92 @@ NS_ASSUME_NONNULL_BEGIN
     return notification;
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 - (SDLLockScreenStatus)lockScreenStatus {
+#pragma clang diagnostic pop
     if (self.hmiLevel == nil || [self.hmiLevel isEqualToEnum:SDLHMILevelNone]) {
         // App is not active on the car
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         return SDLLockScreenStatusOff;
+#pragma clang diagnostic pop
     } else if ([self.hmiLevel isEqualToEnum:SDLHMILevelBackground]) {
         // App is in the background on the car
         if (self.userSelected) {
             // It was user selected
             if (self.haveDriverDistractionStatus && !self.driverDistracted) {
                 // We have the distraction status, and the driver is not distracted
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
                 return SDLLockScreenStatusOptional;
+#pragma clang diagnostic pop
             } else {
                 // We don't have the distraction status, and/or the driver is distracted
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
                 return SDLLockScreenStatusRequired;
+#pragma clang diagnostic pop
             }
         } else {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
             return SDLLockScreenStatusOff;
+#pragma clang diagnostic pop
         }
     } else if ([self.hmiLevel isEqualToEnum:SDLHMILevelFull] || [self.hmiLevel isEqualToEnum: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
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
             return SDLLockScreenStatusOptional;
+#pragma clang diagnostic pop
         } else {
             // We don't have the distraction status, and/or the driver is distracted
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
             return SDLLockScreenStatusRequired;
+#pragma clang diagnostic pop
         }
     } else {
         // This shouldn't be possible.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         return SDLLockScreenStatusOff;
+#pragma clang diagnostic pop
     }
 }
 
+#pragma mark - Utilities
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+- (void)sdl_postLockScreenStatus:(SDLOnLockScreenStatus *)statusNotification {
+    SDLRPCNotificationNotification *notification = [[SDLRPCNotificationNotification alloc] initWithName:SDLDidChangeLockScreenStatusNotification object:self rpcNotification:statusNotification];
+#pragma clang diagnostic pop
+
+    SDLLogD(@"Lock screen status changed. Sending new notification: %@", notification);
+    [[NSNotificationCenter defaultCenter] postNotification:notification];
+}
+
+
+#pragma mark - Observers
+
+- (void)sdl_hmiStatusDidUpdate:(SDLRPCNotificationNotification *)notification {
+    SDLOnHMIStatus *hmiStatus = notification.notification;
+
+    self.hmiLevel = hmiStatus.hmiLevel;
+    [self sdl_postLockScreenStatus:self.lockScreenStatusNotification];
+}
+
+- (void)sdl_driverDistractionDidUpdate:(SDLRPCNotificationNotification *)notification {
+    SDLOnDriverDistraction *driverDistraction = notification.notification;
+
+    self.driverDistracted = [driverDistraction.state isEqualToEnum:SDLDriverDistractionStateOn];
+    [self sdl_postLockScreenStatus:self.lockScreenStatusNotification];
+}
+
 @end
 
 NS_ASSUME_NONNULL_END