Fixed the wrong window being shown by lock screen presenter #1503
Conversation
NicoleYarroch
changed the title
Fixed black screen when lock screen is presented in background
NicoleYarroch
changed the title
| __weak typeof(self) weakself = self; | ||
| dispatch_async(dispatch_get_main_queue(), ^{ | ||
| if (!([UIApplication sharedApplication].applicationState == UIApplicationStateActive)) { | ||
| // Don't present lock screen when app is backgrounded because the screenshot will be a black screen |
There was a problem hiding this comment.
What code causes this to work correctly when the app comes into the foreground?
There was a problem hiding this comment.
This code was removed
|
|
||
| - (void)sdl_checkLockScreenStatus { | ||
| // Present the VC depending on the lock screen status | ||
| if (self.config.displayMode == SDLLockScreenConfigurationDisplayModeAlways) { |
There was a problem hiding this comment.
The indentation is 6 spaces. Do you have Xcode Preferences -> Text Editing -> Indentation, "Prefer Indent Using: Spaces" and "Tab Width / Indent Width" set to 4?
| NSArray<UIWindow *> *windows = appWindowScene.windows; | ||
| UIWindow *appWindow = nil; | ||
| for (UIWindow *window in windows) { | ||
| if (window != self.lockWindow) { | ||
| if (window.isKeyWindow) { |
There was a problem hiding this comment.
I don't think this will work for apps using iOS 13 scene API. keyWindow is deprecated, though this API appears not to be. In any case, I wouldn't trust it.
There was a problem hiding this comment.
This code was removed
| @@ -98,10 +99,11 @@ - (void)sdl_presentIOS13 { | |||
| } | |||
| } | |||
|
|
|||
| // Find the currently visible app window | |||
There was a problem hiding this comment.
Fixed. Apparently in Xcode a tab = 4 spaces and in GitHub 6
| @@ -169,7 +174,7 @@ - (void)sdl_dismissIOS12 { | |||
| UIWindow *appWindow = nil; | |||
| for (UIWindow *window in windows) { | |||
| SDLLogV(@"Checking window: %@", window); | |||
| if (window != self.lockWindow) { | |||
| if ([window.rootViewController isKindOfClass:[self.coveredRootViewController class]]) { | |||
There was a problem hiding this comment.
Can you directly check equality between window.rootViewController and coveredRootViewController? Imagine if the same class (or in the case of using isKindOfClass a subclass) is used in multiple windows.
There was a problem hiding this comment.
This code was removed
| @@ -204,7 +209,7 @@ - (void)sdl_dismissIOS13 { | |||
| UIWindow *appWindow = nil; | |||
| for (UIWindow *window in windows) { | |||
| SDLLogV(@"Checking window: %@", window); | |||
| if (window != self.lockWindow) { | |||
| if ([window.rootViewController isKindOfClass:[self.coveredRootViewController class]]) { | |||
There was a problem hiding this comment.
This code was removed
|
Closing in favor of #1509 as pretty much all the code was changed. |
joeljfischer
deleted the
bugfix/issue_1501_wrong_appwindow_shown_on_lockscreen_dismissal
branch
Fixes #1501
This PR is ready for review.
Risk
This PR makes no API changes.
Testing Plan
Unit Tests
Unit tests were run.
Core Tests
Smoke tests perform with SYNC 3.
Core version / branch / commit hash / module tested against: SYNC 3 v3.0
HMI name / version / branch / commit hash / module tested against: SYNC 3 v3.0
Summary
Fixed the lock screen presenter selecting the wrong
UIWindowwhen the app has multipleUIWindows. This bug created the following issues:UIWindowwas made visible when dismissing the lock screen window.Changelog
Bug Fixes
UIWindowwhen the app has multipleUIWindows.Tasks Remaining:
CLA