Added condition in WindowStateManager for selecting proper scene used with role Application (#23945)

jpiechowiak · web-flow · commit 6bfd7e16f620 · 2024-08-06T11:56:49.000+01:00
diff --git a/src/Essentials/src/Platform/WindowStateManager.ios.cs b/src/Essentials/src/Platform/WindowStateManager.ios.cs
@@ -140,7 +140,8 @@ public void Init(Func<UIViewController?>? getCurrentUIViewController) =>
 				try
 				{
 					using var scenes = UIApplication.SharedApplication.ConnectedScenes;
-					var windowScene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
+					var windowScene = scenes.ToArray().OfType<UIWindowScene>().FirstOrDefault(scene => 
+						scene.Session.Role == UIWindowSceneSessionRole.Application);
 					return windowScene?.Windows.FirstOrDefault();
 				}
 				catch (InvalidCastException)
@@ -163,7 +164,8 @@ public void Init(Func<UIViewController?>? getCurrentUIViewController) =>
 				try
 				{
 					using var scenes = UIApplication.SharedApplication.ConnectedScenes;
-					var windowScene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
+					var windowScene = scenes.ToArray().OfType<UIWindowScene>().FirstOrDefault(scene => 
+						scene.Session.Role == UIWindowSceneSessionRole.Application);
 					return windowScene?.Windows;
 				}
 				catch (InvalidCastException)

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,8 @@ public void Init(Func<UIViewController?>? getCurrentUIViewController) =>`
`140`	`140`	`try`
`141`	`141`	`{`
`142`	`142`	`using var scenes = UIApplication.SharedApplication.ConnectedScenes;`
`143`		`- var windowScene = scenes.ToArray<UIWindowScene>().FirstOrDefault();`
	`143`	`+ var windowScene = scenes.ToArray().OfType<UIWindowScene>().FirstOrDefault(scene =>`
	`144`	`+ scene.Session.Role == UIWindowSceneSessionRole.Application);`
`144`	`145`	`return windowScene?.Windows.FirstOrDefault();`
`145`	`146`	`}`
`146`	`147`	`catch (InvalidCastException)`
`@@ -163,7 +164,8 @@ public void Init(Func<UIViewController?>? getCurrentUIViewController) =>`
`163`	`164`	`try`
`164`	`165`	`{`
`165`	`166`	`using var scenes = UIApplication.SharedApplication.ConnectedScenes;`
`166`		`- var windowScene = scenes.ToArray<UIWindowScene>().FirstOrDefault();`
	`167`	`+ var windowScene = scenes.ToArray().OfType<UIWindowScene>().FirstOrDefault(scene =>`
	`168`	`+ scene.Session.Role == UIWindowSceneSessionRole.Application);`
`167`	`169`	`return windowScene?.Windows;`
`168`	`170`	`}`
`169`	`171`	`catch (InvalidCastException)`