summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicoleYarroch <nicole@livio.io>2019-12-18 13:24:23 -0500
committerNicoleYarroch <nicole@livio.io>2019-12-18 13:24:23 -0500
commita166ec74daaaec5ab644042154dc427c175c50cc (patch)
treefde4ad59dd3f219eb60eb3f6040241f2a9386e3f
parentcad7c88cb43d8a210a0155694e05d9957cd6d47c (diff)
downloadsdl_ios-a166ec74daaaec5ab644042154dc427c175c50cc.tar.gz
Fixed lockscreen not showing when app foregrounded
-rw-r--r--SmartDeviceLink/SDLLockScreenManager.m4
-rw-r--r--SmartDeviceLink/SDLLockScreenPresenter.m3
2 files changed, 3 insertions, 4 deletions
diff --git a/SmartDeviceLink/SDLLockScreenManager.m b/SmartDeviceLink/SDLLockScreenManager.m
index 6b80a5522..8892e95d0 100644
--- a/SmartDeviceLink/SDLLockScreenManager.m
+++ b/SmartDeviceLink/SDLLockScreenManager.m
@@ -135,9 +135,9 @@ NS_ASSUME_NONNULL_BEGIN
if (!weakSelf.canPresent) {
[weakSelf.presenter updateLockScreenToShow:NO];
}
-
- [weakSelf sdl_checkLockScreen];
});
+
+ [self sdl_checkLockScreen];
}
- (void)sdl_driverDistractionStateDidChange:(SDLRPCNotificationNotification *)notification {
diff --git a/SmartDeviceLink/SDLLockScreenPresenter.m b/SmartDeviceLink/SDLLockScreenPresenter.m
index bb5ff6aa6..1b40cbda4 100644
--- a/SmartDeviceLink/SDLLockScreenPresenter.m
+++ b/SmartDeviceLink/SDLLockScreenPresenter.m
@@ -50,11 +50,10 @@ NS_ASSUME_NONNULL_BEGIN
}
- (void)updateLockScreenToShow:(BOOL)show {
- if (show == self.presented) { return; }
self.presented = show;
if (show) {
- [self sdl_presentLockscreenWithCompletionHandler:^{
+ [self sdl_presentWithCompletionHandler:^{
if (self.presented) { return; }
SDLLogV(@"The lockscreen has been presented but needs to be dismissed");