chore: Wait for initialization to complete

(cherry picked from commit 4188b5f)
unoplatform · Feb 11, 2025 · fe873d1 · fe873d1
1 parent 27845a6
commit fe873d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Application.cs b/src/Uno.UI/UI/Xaml/Application.cs
@@ -444,7 +444,10 @@ private void SetRequestedTheme(ApplicationTheme requestedTheme)
 
 		internal void OnRequestedThemeChanged()
 		{
-			ApplySystemOverlaysTheming();
+			if (InitializationComplete)
+			{
+				ApplySystemOverlaysTheming();
+			}
 			OnResourcesChanged(ResourceUpdateReason.ThemeResource);
 		}
 

diff --git a/src/Uno.UI/UI/Xaml/Window/Native/NativeWindowWrapper.Android.cs b/src/Uno.UI/UI/Xaml/Window/Native/NativeWindowWrapper.Android.cs
@@ -199,8 +199,9 @@ internal void ApplySystemOverlaysTheming()
 		if ((int)Android.OS.Build.VERSION.SdkInt >= 35)
 		{
 			// In edge-to-edge experience we want to adjust the theming of status bar to match the app theme.
-			if ((ContextHelper.Current is Activity activity) &&
-			activity.Window?.DecorView is { FitsSystemWindows: false } decorView)
+			if ((ContextHelper.TryGetCurrent(out var context)) &&
+				context is Activity activity &&
+				activity.Window?.DecorView is { FitsSystemWindows: false } decorView)
 			{
 				var requestedTheme = Microsoft.UI.Xaml.Application.Current.RequestedTheme;