Add thread safety to APIAccess.LocalUser

Fix crash when attempting to import on mobile platforms

osu.Android.props

@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.810.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.810.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.810.2" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
     <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->

osu.Game/Database/LegacyImportManager.cs

@@ -42,7 +42,7 @@ namespace osu.Game.Database
         [Resolved]
         private RealmAccess realmAccess { get; set; } = null!;
 
-        [Resolved]
+        [Resolved(canBeNull: true)] // canBeNull required while we remain on mono for mobile platforms.
         private DesktopGameHost? desktopGameHost { get; set; }
 
         [Resolved]

osu.Game/Online/API/APIAccess.cs

@@ -137,6 +137,17 @@ namespace osu.Game.Online.API
 
                         state.Value = APIState.Connecting;
 
+                        if (localUser.IsDefault)
+                        {
+                            // Show a placeholder user if saved credentials are available.
+                            // This is useful for storing local scores and showing a placeholder username after starting the game,
+                            // until a valid connection has been established.
+                            setLocalUser(new APIUser
+                            {
+                                Username = ProvidedUsername,
+                            });
+                        }
+
                         // save the username at this point, if the user requested for it to be.
                         config.SetValue(OsuSetting.Username, config.Get<bool>(OsuSetting.SaveUsername) ? ProvidedUsername : string.Empty);
 
@@ -177,12 +188,12 @@ namespace osu.Game.Online.API
                             else
                                 failConnectionProcess();
                         };
-                        userReq.Success += u =>
+                        userReq.Success += user =>
                         {
-                            localUser.Value = u;
-
                             // todo: save/pull from settings
-                            localUser.Value.Status.Value = new UserStatusOnline();
+                            user.Status.Value = new UserStatusOnline();
+
+                            setLocalUser(user);
 
                             failureCount = 0;
                         };
@@ -402,7 +413,7 @@ namespace osu.Game.Online.API
             }
         }
 
-        public bool IsLoggedIn => localUser.Value.Id > 1; // TODO: should this also be true if attempting to connect?
+        public bool IsLoggedIn => State.Value > APIState.Offline;
 
         public void Queue(APIRequest request)
         {
@@ -442,7 +453,7 @@ namespace osu.Game.Online.API
             // Scheduled prior to state change such that the state changed event is invoked with the correct user and their friends present
             Schedule(() =>
             {
-                localUser.Value = createGuestUser();
+                setLocalUser(createGuestUser());
                 friends.Clear();
             });
 
@@ -452,6 +463,8 @@ namespace osu.Game.Online.API
 
         private static APIUser createGuestUser() => new GuestUser();
 
+        private void setLocalUser(APIUser user) => Scheduler.Add(() => localUser.Value = user, false);
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

osu.Game/Online/API/IAPIProvider.cs

@@ -13,19 +13,16 @@ namespace osu.Game.Online.API
     {
         /// <summary>
         /// The local user.
-        /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
         /// </summary>
         IBindable<APIUser> LocalUser { get; }
 
         /// <summary>
         /// The user's friends.
-        /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
         /// </summary>
         IBindableList<APIUser> Friends { get; }
 
         /// <summary>
         /// The current user's activity.
-        /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
         /// </summary>
         IBindable<UserActivity> Activity { get; }
 

osu.Game/Overlays/BeatmapListingOverlay.cs

@@ -104,11 +104,11 @@ namespace osu.Game.Overlays
             filterControl.CardSize.BindValueChanged(_ => onCardSizeChanged());
 
             apiUser = api.LocalUser.GetBoundCopy();
-            apiUser.BindValueChanged(_ =>
+            apiUser.BindValueChanged(_ => Schedule(() =>
             {
                 if (api.IsLoggedIn)
                     addContentToResultsArea(Drawable.Empty());
-            });
+            }));
         }
 
         public void ShowWithSearch(string query)

osu.Game/Screens/Play/Player.cs

@@ -249,6 +249,9 @@ namespace osu.Game.Screens.Play
             // this is intentionally done in two stages to ensure things are in a loaded state before exposing the ruleset to skin sources.
             GameplayClockContainer.Add(rulesetSkinProvider);
 
+            if (cancellationToken.IsCancellationRequested)
+                return;
+
             rulesetSkinProvider.AddRange(new Drawable[]
             {
                 failAnimationLayer = new FailAnimation(DrawableRuleset)
@@ -279,6 +282,9 @@ namespace osu.Game.Screens.Play
                 },
             });
 
+            if (cancellationToken.IsCancellationRequested)
+                return;
+
             if (Configuration.AllowRestart)
             {
                 rulesetSkinProvider.Add(new HotkeyRetryOverlay

osu.Game/osu.Game.csproj

@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.14.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.810.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.810.2" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.810.0" />
     <PackageReference Include="Sentry" Version="3.19.0" />
     <PackageReference Include="SharpCompress" Version="0.32.1" />

osu.iOS.props

@@ -61,7 +61,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.810.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.810.2" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.810.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
@@ -84,7 +84,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.14" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.810.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.810.2" />
     <PackageReference Include="SharpCompress" Version="0.32.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />