summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Fischer <joeljfischer@gmail.com>2022-01-04 13:15:39 -0500
committerJoel Fischer <joeljfischer@gmail.com>2022-01-04 13:15:39 -0500
commit69cab131ad6d9ae232f05d451743d2f444b8eb6d (patch)
tree37b31fb009c24955849e4f1d2475a21548da6793
parent605dbde3e1c34cb4ac520c8a3454dde15778b002 (diff)
downloadsdl_ios-69cab131ad6d9ae232f05d451743d2f444b8eb6d.tar.gz
Fix
* Lock screen fix b/c accidentally removed dispatcher assignment * Lock screen status log clarifications
-rw-r--r--SmartDeviceLink/private/SDLLockScreenStatusInfo.m10
-rw-r--r--SmartDeviceLink/private/SDLLockScreenStatusManager.m1
2 files changed, 10 insertions, 1 deletions
diff --git a/SmartDeviceLink/private/SDLLockScreenStatusInfo.m b/SmartDeviceLink/private/SDLLockScreenStatusInfo.m
index d7395c11f..9ff6460ea 100644
--- a/SmartDeviceLink/private/SDLLockScreenStatusInfo.m
+++ b/SmartDeviceLink/private/SDLLockScreenStatusInfo.m
@@ -37,7 +37,15 @@ NS_ASSUME_NONNULL_BEGIN
}
- (NSString *)description {
- return [NSString stringWithFormat:@"driverDistractionStatus: %@, userSelected: %@, lockScreenStatus: %lu, hmiLevel: %@", self.driverDistractionStatus, self.userSelected, (unsigned long)self.lockScreenStatus, self.hmiLevel];
+ return [NSString stringWithFormat:@"driverDistractionStatus: %@, userSelected: %@, lockScreenStatus: %@, hmiLevel: %@", (self.driverDistractionStatus ? @"ON" : @"OFF"), (self.userSelected ? @"YES" : @"NO"), [self descriptionForStatus:self.lockScreenStatus], self.hmiLevel];
+}
+
+- (NSString *)descriptionForStatus:(SDLLockScreenStatus)status {
+ switch (status) {
+ case SDLLockScreenStatusOff: return @"Off";
+ case SDLLockScreenStatusOptional: return @"Optional";
+ case SDLLockScreenStatusRequired: return @"Required";
+ }
}
@end
diff --git a/SmartDeviceLink/private/SDLLockScreenStatusManager.m b/SmartDeviceLink/private/SDLLockScreenStatusManager.m
index 402b8739b..d4d3a0f3f 100644
--- a/SmartDeviceLink/private/SDLLockScreenStatusManager.m
+++ b/SmartDeviceLink/private/SDLLockScreenStatusManager.m
@@ -31,6 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
self = [super init];
if (!self) { return nil; }
+ _notificationDispatcher = dispatcher;
_userSelected = NO;
_driverDistracted = NO;
_haveDriverDistractionStatus = NO;