Finish preliminary offline support

* 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.

6 files changed, 81 insertions, 77 deletions

diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 69591f8b..fd35e94e 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -777,83 +777,58 @@ void MainWindow::doLaunch()
 			accounts->setActiveAccount(account->username());
 	}
 
-	if (account.get() != nullptr)
-	{
-		doLaunchInst(m_selectedInstance, account);
-	}
-}
-
-void MainWindow::doLaunchInst(BaseInstance* instance, MojangAccountPtr account)
-{
-	// We'll need to validate the access token to make sure the account is still logged in.
-	/*
-	ProgressDialog progDialog(this);
-	RefreshTask refreshtask(account, &progDialog);
-	progDialog.exec(&refreshtask);
+	// if no account is selected, we bail
+	if (!account.get())
+		return;
 
-	if (refreshtask.successful())
-	{
-		prepareLaunch(m_selectedInstance, account);
-	}
-	else
+	// do the login. if the account has an access token, try to refresh it first.
+	if(account->accountStatus() != NotVerified)
 	{
-		YggdrasilTask::Error *error = refreshtask.getError();
+		// We'll need to validate the access token to make sure the account is still logged in.
+		ProgressDialog progDialog(this);
+		progDialog.setSkipButton(true, tr("Play Offline"));
+		auto task = account->login();
+		progDialog.exec(task.get());
 
-		if (error != nullptr)
+		auto status = account->accountStatus();
+		if(status == Online) // Online mode! Refresh the token.
 		{
-			if (error->getErrorMessage().contains("invalid token", Qt::CaseInsensitive))
-			{
-				// TODO: Allow the user to enter their password and "refresh" their access token.
-				if (doRefreshToken(account, tr("Your account's access token is invalid. Please enter your password to log in again.")))
-					doLaunchInst(instance, account);
-			}
-			else
-			{
-				CustomMessageBox::selectable(
-					this, tr("Access Token Validation Error"),
-					tr("There was an error when trying to validate your access token.\n"
-					   "Details: %s").arg(error->getDisplayMessage()),
-					QMessageBox::Warning, QMessageBox::Ok)->exec();
-			}
+			updateInstance(m_selectedInstance, account);
+			return;
 		}
-		else
+		else if(status == Verified) // Offline mode with a verified account
 		{
-			CustomMessageBox::selectable(
-				this, tr("Access Token Validation Error"),
-				tr("There was an unknown error when trying to validate your access token."
-				   "The authentication server might be down, or you might not be connected to "
-				   "the Internet."),
-				QMessageBox::Warning, QMessageBox::Ok)->exec();
+			launchInstance(m_selectedInstance, account);
+			return;
 		}
 	}
-	*/
+	if (loginWithPassword(account, tr("Your account is currently not logged in. Please enter your password to log in again.")))
+		updateInstance(m_selectedInstance, account);
 }
 
-bool MainWindow::doRefreshToken(MojangAccountPtr account, const QString& errorMsg)
+bool MainWindow::loginWithPassword(MojangAccountPtr account, const QString& errorMsg)
 {
-	/*
 	EditAccountDialog passDialog(errorMsg, this, EditAccountDialog::PasswordField);
 	if (passDialog.exec() == QDialog::Accepted)
 	{
 		// To refresh the token, we just create an authenticate task with the given account and the user's password.
 		ProgressDialog progDialog(this);
-		AuthenticateTask authTask(account, passDialog.password(), &progDialog);
-		progDialog.exec(&authTask);
-		if (authTask.successful())
+		auto task = account->login(passDialog.password());
+		progDialog.exec(task.get());
+		if(task->successful())
 			return true;
 		else
 		{
 			// If the authentication task failed, recurse with the task's error message.
-			return doRefreshToken(account, authTask.failReason());
+			return loginWithPassword(account, task->failReason());
 		}
 	}
-	else return false;*/
 	return false;
 }
 
-void MainWindow::prepareLaunch(BaseInstance* instance, MojangAccountPtr account)
+void MainWindow::updateInstance(BaseInstance* instance, MojangAccountPtr account)
 {
-	Task *updateTask = instance->doUpdate(true);
+	auto updateTask = instance->doUpdate(true);
 	if (!updateTask)
 	{
 		launchInstance(instance, account);
@@ -861,10 +836,9 @@ void MainWindow::prepareLaunch(BaseInstance* instance, MojangAccountPtr account)
 	else
 	{
 		ProgressDialog tDialog(this);
-		connect(updateTask, &Task::succeeded, [this, instance, account] { launchInstance(instance, account); });
-		connect(updateTask, SIGNAL(failed(QString)), SLOT(onGameUpdateError(QString)));
-		tDialog.exec(updateTask);
-		delete updateTask;
+		connect(updateTask.get(), &Task::succeeded, [this, instance, account] { launchInstance(instance, account); });
+		connect(updateTask.get(), SIGNAL(failed(QString)), SLOT(onGameUpdateError(QString)));
+		tDialog.exec(updateTask.get());
 	}
 }
 
diff --git a/gui/MainWindow.h b/gui/MainWindow.h
index 59cfa3c9..62c9797e 100644
--- a/gui/MainWindow.h
+++ b/gui/MainWindow.h
@@ -110,18 +110,13 @@ slots:
 	 * If no default account is selected, prompts the user to pick an account.
 	 */
 	void doLaunch();
-	
-	/*!
-	 * Launches the given instance with the given account.
-	 */
-	void doLaunchInst(BaseInstance* instance, MojangAccountPtr account);
 
 	/*!
 	 * Opens an input dialog, allowing the user to input their password and refresh its access token.
 	 * This function will execute the proper Yggdrasil task to refresh the access token.
 	 * Returns true if successful. False if the user cancelled.
 	 */
-	bool doRefreshToken(MojangAccountPtr account, const QString& errorMsg="");
+	bool loginWithPassword(MojangAccountPtr account, const QString& errorMsg="");
 
 	/*!
 	 * Launches the given instance with the given account.
@@ -132,7 +127,7 @@ slots:
 	/*!
 	 * Prepares the given instance for launch with the given account.
 	 */
-	void prepareLaunch(BaseInstance* instance, MojangAccountPtr account);
+	void updateInstance(BaseInstance* instance, MojangAccountPtr account);
 
 	void onGameUpdateError(QString error);
 
diff --git a/gui/dialogs/AccountListDialog.cpp b/gui/dialogs/AccountListDialog.cpp
index e1f65c16..8dae5f07 100644
--- a/gui/dialogs/AccountListDialog.cpp
+++ b/gui/dialogs/AccountListDialog.cpp
@@ -25,6 +25,7 @@
 #include <gui/dialogs/EditAccountDialog.h>
 #include <gui/dialogs/ProgressDialog.h>
 #include <gui/dialogs/AccountSelectDialog.h>
+#include <logic/tasks/Task.h>
 
 #include <MultiMC.h>
 
@@ -117,14 +118,14 @@ void AccountListDialog::addAccount(const QString& errMsg)
 		QString password(loginDialog.password());
 
 		MojangAccountPtr account = MojangAccount::createFromUsername(username);
-/*
 		ProgressDialog progDialog(this);
-		AuthenticateTask authTask(account, password, &progDialog);
-		if (progDialog.exec(&authTask))
+		auto task = account->login(password);
+		progDialog.exec(task.get());
+		if(task->successful())
 		{
-			// Add the authenticated account to the accounts list.
-			MojangAccountPtr account = authTask.getMojangAccount();
 			m_accounts->addAccount(account);
+			if (m_accounts->count() == 1)
+				m_accounts->setActiveAccount(account->username());
 
 			// Grab associated player skins
 			auto job = new NetJob("Player skins: " + account->username());
@@ -141,6 +142,5 @@ void AccountListDialog::addAccount(const QString& errMsg)
 
 			job->start();
 		}
-		*/
 	}
 }
diff --git a/gui/dialogs/ProgressDialog.cpp b/gui/dialogs/ProgressDialog.cpp
index ca433dab..ba14cca2 100644
--- a/gui/dialogs/ProgressDialog.cpp
+++ b/gui/dialogs/ProgressDialog.cpp
@@ -25,9 +25,23 @@ ProgressDialog::ProgressDialog(QWidget *parent) : QDialog(parent), ui(new Ui::Pr
 {
 	MultiMCPlatform::fixWM_CLASS(this);
 	ui->setupUi(this);
+	this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
+	setSkipButton(false);
+	changeProgress(0, 100);
+}
+
+void ProgressDialog::setSkipButton(bool present, QString label)
+{
+	ui->skipButton->setEnabled(present);
+	ui->skipButton->setVisible(present);
+	ui->skipButton->setText(label);
 	updateSize();
+}
 
-	changeProgress(0, 100);
+void ProgressDialog::on_skipButton_clicked(bool checked)
+{
+	Q_UNUSED(checked);
+	task->abort();
 }
 
 ProgressDialog::~ProgressDialog()
@@ -51,9 +65,13 @@ int ProgressDialog::exec(ProgressProvider *task)
 	connect(task, SIGNAL(status(QString)), SLOT(changeStatus(const QString &)));
 	connect(task, SIGNAL(progress(qint64, qint64)), SLOT(changeProgress(qint64, qint64)));
 
-	// this makes sure that the task is started after the dialog is created
-	QMetaObject::invokeMethod(task, "start", Qt::QueuedConnection);
-	return QDialog::exec();
+	// if this didn't connect to an already running task, invoke start
+	if(!task->isRunning())
+		task->start();
+	if(task->isRunning())
+		return QDialog::exec();
+	else
+		return 0;
 }
 
 ProgressProvider *ProgressDialog::getTask()
diff --git a/gui/dialogs/ProgressDialog.h b/gui/dialogs/ProgressDialog.h
index 0029d3ec..fe63a826 100644
--- a/gui/dialogs/ProgressDialog.h
+++ b/gui/dialogs/ProgressDialog.h
@@ -35,6 +35,7 @@ public:
 	void updateSize();
 
 	int exec(ProgressProvider *task);
+	void setSkipButton(bool present, QString label = QString());
 
 	ProgressProvider *getTask();
 
@@ -47,7 +48,10 @@ slots:
 	void changeStatus(const QString &status);
 	void changeProgress(qint64 current, qint64 total);
 
-signals:
+	
+private
+slots:
+	void on_skipButton_clicked(bool checked);
 
 protected:
 	virtual void keyPressEvent(QKeyEvent *e);
diff --git a/gui/dialogs/ProgressDialog.ui b/gui/dialogs/ProgressDialog.ui
index a56d2a92..04b8fef3 100644
--- a/gui/dialogs/ProgressDialog.ui
+++ b/gui/dialogs/ProgressDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>68</height>
+    <height>100</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -25,8 +25,8 @@
   <property name="windowTitle">
    <string>Please wait...</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
     <widget class="QLabel" name="statusLabel">
      <property name="text">
       <string>Task Status...</string>
@@ -36,7 +36,7 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QProgressBar" name="taskProgressBar">
      <property name="value">
       <number>24</number>
@@ -46,6 +46,19 @@
      </property>
     </widget>
    </item>
+   <item row="2" column="0">
+    <widget class="QPushButton" name="skipButton">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Skip</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>