sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-23 03:10:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move friend request to a more understandable place in connection flow

Browse Source
This commit is contained in:
Dean Herbert
2020-12-18 15:16:48 +09:00
parent 206bf3713e
commit d36169f697
1 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
osu.Game/Online/API/APIAccess.cs
View File

@ -140,6 +140,7 @@ namespace osu.Game.Online.API
} }
var userReq = new GetUserRequest(); var userReq = new GetUserRequest();
userReq.Success += u => userReq.Success += u =>
{ {
localUser.Value = u; localUser.Value = u;
@ -148,15 +149,6 @@ namespace osu.Game.Online.API
localUser.Value.Status.Value = new UserStatusOnline(); localUser.Value.Status.Value = new UserStatusOnline();
failureCount = 0; failureCount = 0;
fetchFriends(() =>
{
//we're connected!
state.Value = APIState.Online;
}, () =>
{
state.Value = APIState.Failing;
});
}; };
if (!handleRequest(userReq)) if (!handleRequest(userReq))
@ -166,6 +158,19 @@ namespace osu.Game.Online.API
continue; continue;
} }
// getting user's friends is considered part of the connection process.
var friendsReq = new GetFriendsRequest();
friendsReq.Success += res =>
{
friends.AddRange(res);
//we're connected!
state.Value = APIState.Online;
};
if (!handleRequest(friendsReq))
state.Value = APIState.Failing;
// The Success callback event is fired on the main thread, so we should wait for that to run before proceeding. // The Success callback event is fired on the main thread, so we should wait for that to run before proceeding.
// Without this, we will end up circulating this Connecting loop multiple times and queueing up many web requests // Without this, we will end up circulating this Connecting loop multiple times and queueing up many web requests
// before actually going online. // before actually going online.
@ -257,19 +262,6 @@ namespace osu.Game.Online.API
return null; return null;
} }
private void fetchFriends(Action onSuccess, Action onFail)
{
var friendsReq = new GetFriendsRequest();
friendsReq.Success += res =>
{
Friends.AddRange(res);
onSuccess?.Invoke();
};
if (!handleRequest(friendsReq))
onFail?.Invoke();
}
/// <summary> /// <summary>
/// Handle a single API request. /// Handle a single API request.
/// Ensures all exceptions are caught and dealt with correctly. /// Ensures all exceptions are caught and dealt with correctly.