CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish preliminary offline support

Browse Source 
* ProgressProvider now has an abort() call
* Abort button support added to the progress dialog
* YggdrasilTask and MojangAccount adapted to support abort

YggdrasilTask will time out after 10 seconds of no network activity, or when the user pushes the Play Offline button.
In offline mode, all instance update tasks are skipped! This will need further work.
This commit is contained in:
Petr Mrázek
2013-12-08 17:34:45 +01:00
parent f028aa76bc
commit 0cb8ff40b2
24 changed files with 224 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
logic/auth/MojangAccount.cpp
View File

@ -134,22 +134,21 @@ AccountStatus MojangAccount::accountStatus() const
return Online;
}
bool MojangAccount::login(QString password)
std::shared_ptr<Task> MojangAccount::login(QString password)
{
if(m_currentTask)
return false;
return m_currentTask;
if(password.isEmpty())
{
m_currentTask.reset(new RefreshTask(this, this));
m_currentTask.reset(new RefreshTask(this));
}
else
{
m_currentTask.reset(new AuthenticateTask(this, password, this));
m_currentTask.reset(new AuthenticateTask(this, password));
}
connect(m_currentTask.get(), SIGNAL(succeeded()), SLOT(authSucceeded()));
connect(m_currentTask.get(), SIGNAL(failed(QString)), SLOT(authFailed(QString)));
m_currentTask->start();
return true;
return m_currentTask;
}
void MojangAccount::authSucceeded()
@ -161,8 +160,13 @@ void MojangAccount::authSucceeded()
void MojangAccount::authFailed(QString reason)
{
m_online = false;
m_accessToken = QString();
// This is emitted when the yggdrasil tasks time out or are cancelled.
// -> we treat the error as no-op
if(reason != "Yggdrasil task cancelled.")
{
m_online = false;
m_accessToken = QString();
emit changed();
}
m_currentTask.reset();
emit changed();
}