AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-17 03:25:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

When you go back to main screen in launcher and try to sign in again, attempt to resume current login instead of always doing a fresh login (Unless a different signin username has been typed in)

Browse Source
This commit is contained in:
UnknownShadow200 2020-10-26 09:12:51 +11:00
parent beba09b2ef
commit 6652f9f316
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/LScreens.c
View File

@ -901,6 +901,19 @@ static void MainScreen_TickCheckUpdates(struct MainScreen* s) {
LWidget_Redraw(&s->lblUpdate); LWidget_Redraw(&s->lblUpdate);
} }
static void MainScreen_LoginPhase2(struct MainScreen* s, const cc_string* user) {
/* website returns case correct username */
if (!String_Equals(&s->iptUsername.text, user)) {
LInput_SetText(&s->iptUsername, user);
LWidget_Redraw(&s->iptUsername);
}
String_Copy(&Game_Username, user);
FetchServersTask_Run();
LLabel_SetConst(&s->lblStatus, "&eRetrieving servers list..");
LWidget_Redraw(&s->lblStatus);
}
static void MainScreen_TickGetToken(struct MainScreen* s) { static void MainScreen_TickGetToken(struct MainScreen* s) {
if (!GetTokenTask.Base.working) return; if (!GetTokenTask.Base.working) return;
LWebTask_Tick(&GetTokenTask.Base); LWebTask_Tick(&GetTokenTask.Base);
@ -911,8 +924,13 @@ static void MainScreen_TickGetToken(struct MainScreen* s) {
return; return;
} }
SignInTask_Run(&s->iptUsername.text, &s->iptPassword.text, if (String_CaselessEquals(&GetTokenTask.username, &s->iptUsername.text)) {
&MFAScreen_Instance.iptCode.text); /* Already logged in, go straight to fetching servers */
MainScreen_LoginPhase2(s, &GetTokenTask.username);
} else {
SignInTask_Run(&s->iptUsername.text, &s->iptPassword.text,
&MFAScreen_Instance.iptCode.text);
}
} }
static void MainScreen_TickSignIn(struct MainScreen* s) { static void MainScreen_TickSignIn(struct MainScreen* s) {
@ -926,16 +944,7 @@ static void MainScreen_TickSignIn(struct MainScreen* s) {
LLabel_SetConst(&s->lblStatus, SignInTask.error); LLabel_SetConst(&s->lblStatus, SignInTask.error);
LWidget_Redraw(&s->lblStatus); LWidget_Redraw(&s->lblStatus);
} else if (SignInTask.Base.success) { } else if (SignInTask.Base.success) {
/* website returns case correct username */ MainScreen_LoginPhase2(s, &SignInTask.username);
if (!String_Equals(&s->iptUsername.text, &SignInTask.username)) {
LInput_SetText(&s->iptUsername, &SignInTask.username);
LWidget_Redraw(&s->iptUsername);
}
String_Copy(&Game_Username, &SignInTask.username);
FetchServersTask_Run();
LLabel_SetConst(&s->lblStatus, "&eRetrieving servers list..");
LWidget_Redraw(&s->lblStatus);
} else { } else {
MainScreen_Error(&SignInTask.Base, "signing in"); MainScreen_Error(&SignInTask.Base, "signing in");
} }