From ecaf65f98c621257531fc96c5ce2d977c92fa0a7 Mon Sep 17 00:00:00 2001 From: Dominik Titl <78549750+morning4coffe-dev@users.noreply.github.com> Date: Fri, 25 Oct 2024 13:06:32 +0200 Subject: [PATCH 1/2] chore: Make Current BaseActivity nullable --- src/Uno.UI/BaseActivity.Android.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Uno.UI/BaseActivity.Android.cs b/src/Uno.UI/BaseActivity.Android.cs index 8911a2e1acce..f1d62529ee68 100644 --- a/src/Uno.UI/BaseActivity.Android.cs +++ b/src/Uno.UI/BaseActivity.Android.cs @@ -1,4 +1,6 @@ -using System; + + +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; @@ -82,7 +84,9 @@ public static IImmutableDictionary Instances /// For more info look at the lifecycle diagram documented here: https://developer.android.com/reference/android/app/Activity.html. /// /// - public static BaseActivity Current => _current; +#nullable enable + public static BaseActivity? Current => _current; +#nullable disable /// /// Gets the first BaseActivity which is set as current. Unlike the , this method will wait until a BaseActivity is set as Current. From 96d8e8d822393ca569042f8e81aa4ade1da07d7c Mon Sep 17 00:00:00 2001 From: Dominik Titl <78549750+morning4coffe-dev@users.noreply.github.com> Date: Sat, 26 Oct 2024 23:24:32 +0200 Subject: [PATCH 2/2] chore: Remove empty space --- src/Uno.UI/BaseActivity.Android.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Uno.UI/BaseActivity.Android.cs b/src/Uno.UI/BaseActivity.Android.cs index f1d62529ee68..565fde4c23db 100644 --- a/src/Uno.UI/BaseActivity.Android.cs +++ b/src/Uno.UI/BaseActivity.Android.cs @@ -1,6 +1,4 @@ - - -using System; +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq;