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

55
logic/auth/YggdrasilTask.h
View File

@ -19,6 +19,7 @@
#include <QString>
#include <QJsonObject>
#include <QTimer>
#include "logic/auth/MojangAccount.h"
@ -32,39 +33,17 @@ class YggdrasilTask : public Task
Q_OBJECT
public:
explicit YggdrasilTask(MojangAccount * account, QObject *parent = 0);
~YggdrasilTask();
/**
* Class describing a Yggdrasil error response.
*/
class Error
struct Error
{
public:
Error(const QString& shortError, const QString& errorMessage, const QString& cause) :
m_shortError(shortError), m_errorMessage(errorMessage), m_cause(cause) {}
QString getShortError() const { return m_shortError; }
QString getErrorMessage() const { return m_errorMessage; }
QString getCause() const { return m_cause; }
/// Gets the string to display in the GUI for describing this error.
QString getDisplayMessage()
{
return getErrorMessage();
}
protected:
QString m_shortError;
QString m_errorMessage;
QString m_errorMessageShort;
QString m_errorMessageVerbose;
QString m_cause;
};
/**
* Returns a pointer to a YggdrasilTask::Error object if an error has occurred.
* If no error has occurred, returns a null pointer.
*/
virtual Error *getError() const;
protected:
/**
* Enum for describing the state of the current task.
@ -115,13 +94,25 @@ protected:
*/
virtual QString getStateMessage(const State state) const;
MojangAccount *m_account = nullptr;
QNetworkReply *m_netReply;
Error *m_error = nullptr;
protected
slots:
void processReply(QNetworkReply *reply);
void processReply();
void refreshTimers(qint64, qint64);
void heartbeat();
public
slots:
virtual void abort() override;
protected:
// FIXME: segfault disaster waiting to happen
MojangAccount *m_account = nullptr;
QNetworkReply *m_netReply = nullptr;
std::shared_ptr<Error> m_error;
QTimer timeout_keeper;
QTimer counter;
int count = 0; // num msec since time reset
const int timeout_max = 10000;
const int time_step = 50;
};