12 files changed, 88 insertions, 37 deletions

diff --git a/api/logic/minecraft/auth/MojangAccount.cpp b/api/logic/minecraft/auth/MojangAccount.cpp
index f4c628a6..edad4344 100644
--- a/api/logic/minecraft/auth/MojangAccount.cpp
+++ b/api/logic/minecraft/auth/MojangAccount.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Authors: Orochimarufan <orochimarufan.x3@gmail.com>
  *
@@ -170,8 +170,7 @@ AccountStatus MojangAccount::accountStatus() const
 		return Verified;
 }
 
-std::shared_ptr<YggdrasilTask> MojangAccount::login(AuthSessionPtr session,
-													QString password)
+std::shared_ptr<YggdrasilTask> MojangAccount::login(AuthSessionPtr session, QString password)
 {
 	Q_ASSERT(m_currentTask.get() == nullptr);
 
@@ -186,18 +185,28 @@ std::shared_ptr<YggdrasilTask> MojangAccount::login(AuthSessionPtr session,
 		return nullptr;
 	}
 
-	if (password.isEmpty())
+	if(accountStatus() == Verified && !session->wants_online)
 	{
-		m_currentTask.reset(new RefreshTask(this));
+		session->status = AuthSession::PlayableOffline;
+		session->auth_server_online = false;
+		fillSession(session);
+		return nullptr;
 	}
 	else
 	{
-		m_currentTask.reset(new AuthenticateTask(this, password));
-	}
-	m_currentTask->assignSession(session);
+		if (password.isEmpty())
+		{
+			m_currentTask.reset(new RefreshTask(this));
+		}
+		else
+		{
+			m_currentTask.reset(new AuthenticateTask(this, password));
+		}
+		m_currentTask->assignSession(session);
 
-	connect(m_currentTask.get(), SIGNAL(succeeded()), SLOT(authSucceeded()));
-	connect(m_currentTask.get(), SIGNAL(failed(QString)), SLOT(authFailed(QString)));
+		connect(m_currentTask.get(), SIGNAL(succeeded()), SLOT(authSucceeded()));
+		connect(m_currentTask.get(), SIGNAL(failed(QString)), SLOT(authFailed(QString)));
+	}
 	return m_currentTask;
 }
 
diff --git a/api/logic/minecraft/auth/MojangAccount.h b/api/logic/minecraft/auth/MojangAccount.h
index c7f15723..b2bbc357 100644
--- a/api/logic/minecraft/auth/MojangAccount.h
+++ b/api/logic/minecraft/auth/MojangAccount.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/logic/minecraft/auth/MojangAccountList.cpp b/api/logic/minecraft/auth/MojangAccountList.cpp
index bcda1703..21ae188a 100644
--- a/api/logic/minecraft/auth/MojangAccountList.cpp
+++ b/api/logic/minecraft/auth/MojangAccountList.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,34 +53,47 @@ const MojangAccountPtr MojangAccountList::at(int i) const
 
 void MojangAccountList::addAccount(const MojangAccountPtr account)
 {
-	beginResetModel();
+	int row = m_accounts.count();
+	beginInsertRows(QModelIndex(), row, row);
 	connect(account.get(), SIGNAL(changed()), SLOT(accountChanged()));
 	m_accounts.append(account);
-	endResetModel();
+	endInsertRows();
 	onListChanged();
 }
 
 void MojangAccountList::removeAccount(const QString &username)
 {
-	beginResetModel();
+	int idx = 0;
 	for (auto account : m_accounts)
 	{
 		if (account->username() == username)
 		{
+			beginRemoveRows(QModelIndex(), idx, idx);
 			m_accounts.removeOne(account);
+			endRemoveRows();
 			return;
 		}
+		idx++;
 	}
-	endResetModel();
 	onListChanged();
 }
 
 void MojangAccountList::removeAccount(QModelIndex index)
 {
-	beginResetModel();
-	m_accounts.removeAt(index.row());
-	endResetModel();
-	onListChanged();
+	int row = index.row();
+	if(index.isValid() && row >= 0 && row < m_accounts.size())
+	{
+		auto & account = m_accounts[row];
+		if(account == m_activeAccount)
+		{
+			m_activeAccount = nullptr;
+			onActiveChanged();
+		}
+		beginRemoveRows(QModelIndex(), row, row);
+		m_accounts.removeAt(index.row());
+		endRemoveRows();
+		onListChanged();
+	}
 }
 
 MojangAccountPtr MojangAccountList::activeAccount() const
@@ -90,21 +103,49 @@ MojangAccountPtr MojangAccountList::activeAccount() const
 
 void MojangAccountList::setActiveAccount(const QString &username)
 {
-	beginResetModel();
-	if (username.isEmpty())
+	if (username.isEmpty() && m_activeAccount)
 	{
+		int idx = 0;
+		auto prevActiveAcc = m_activeAccount;
 		m_activeAccount = nullptr;
+		for (MojangAccountPtr account : m_accounts)
+		{
+			if (account == prevActiveAcc)
+			{
+				emit dataChanged(index(idx), index(idx));
+			}
+			idx ++;
+		}
+		onActiveChanged();
 	}
 	else
 	{
+		auto currentActiveAccount = m_activeAccount;
+		int currentActiveAccountIdx = -1;
+		auto newActiveAccount = m_activeAccount;
+		int newActiveAccountIdx = -1;
+		int idx = 0;
 		for (MojangAccountPtr account : m_accounts)
 		{
 			if (account->username() == username)
-				m_activeAccount = account;
+			{
+				newActiveAccount = account;
+				newActiveAccountIdx = idx;
+			}
+			if(currentActiveAccount == account)
+			{
+				currentActiveAccountIdx = idx;
+			}
+			idx++;
+		}
+		if(currentActiveAccount != newActiveAccount)
+		{
+			emit dataChanged(index(currentActiveAccountIdx), index(currentActiveAccountIdx));
+			emit dataChanged(index(newActiveAccountIdx), index(newActiveAccountIdx));
+			m_activeAccount = newActiveAccount;
+			onActiveChanged();
 		}
 	}
-	endResetModel();
-	onActiveChanged();
 }
 
 void MojangAccountList::accountChanged()
@@ -167,7 +208,7 @@ QVariant MojangAccountList::data(const QModelIndex &index, int role) const
 		switch (index.column())
 		{
 		case ActiveColumn:
-			return account == m_activeAccount;
+			return account == m_activeAccount ? Qt::Checked : Qt::Unchecked;
 		}
 
 	default:
@@ -207,13 +248,13 @@ QVariant MojangAccountList::headerData(int section, Qt::Orientation orientation,
 	}
 }
 
-int MojangAccountList::rowCount(const QModelIndex &parent) const
+int MojangAccountList::rowCount(const QModelIndex &) const
 {
 	// Return count
 	return count();
 }
 
-int MojangAccountList::columnCount(const QModelIndex &parent) const
+int MojangAccountList::columnCount(const QModelIndex &) const
 {
 	return 2;
 }
diff --git a/api/logic/minecraft/auth/MojangAccountList.h b/api/logic/minecraft/auth/MojangAccountList.h
index 0a7a10d9..dd6c07e8 100644
--- a/api/logic/minecraft/auth/MojangAccountList.h
+++ b/api/logic/minecraft/auth/MojangAccountList.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/logic/minecraft/auth/YggdrasilTask.cpp b/api/logic/minecraft/auth/YggdrasilTask.cpp
index 425da76a..f17d803f 100644
--- a/api/logic/minecraft/auth/YggdrasilTask.cpp
+++ b/api/logic/minecraft/auth/YggdrasilTask.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -130,6 +130,7 @@ void YggdrasilTask::processReply()
 			   "</ul>"));
 		return;
 	// used for invalid credentials and similar errors. Fall through.
+	case QNetworkReply::ContentAccessDenied:
 	case QNetworkReply::ContentOperationNotPermittedError:
 		break;
 	default:
diff --git a/api/logic/minecraft/auth/YggdrasilTask.h b/api/logic/minecraft/auth/YggdrasilTask.h
index f21c2733..b165d3e9 100644
--- a/api/logic/minecraft/auth/YggdrasilTask.h
+++ b/api/logic/minecraft/auth/YggdrasilTask.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/logic/minecraft/auth/flows/AuthenticateTask.cpp b/api/logic/minecraft/auth/flows/AuthenticateTask.cpp
index ad892073..ff4e7d47 100644
--- a/api/logic/minecraft/auth/flows/AuthenticateTask.cpp
+++ b/api/logic/minecraft/auth/flows/AuthenticateTask.cpp
@@ -1,5 +1,5 @@
 
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/logic/minecraft/auth/flows/AuthenticateTask.h b/api/logic/minecraft/auth/flows/AuthenticateTask.h
index a15c8a9e..ab7a6e64 100644
--- a/api/logic/minecraft/auth/flows/AuthenticateTask.h
+++ b/api/logic/minecraft/auth/flows/AuthenticateTask.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/logic/minecraft/auth/flows/RefreshTask.cpp b/api/logic/minecraft/auth/flows/RefreshTask.cpp
index 76738900..73050907 100644
--- a/api/logic/minecraft/auth/flows/RefreshTask.cpp
+++ b/api/logic/minecraft/auth/flows/RefreshTask.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/logic/minecraft/auth/flows/RefreshTask.h b/api/logic/minecraft/auth/flows/RefreshTask.h
index 3c99101e..a97b54e6 100644
--- a/api/logic/minecraft/auth/flows/RefreshTask.h
+++ b/api/logic/minecraft/auth/flows/RefreshTask.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/logic/minecraft/auth/flows/ValidateTask.cpp b/api/logic/minecraft/auth/flows/ValidateTask.cpp
index f82e6542..b6d6c823 100644
--- a/api/logic/minecraft/auth/flows/ValidateTask.cpp
+++ b/api/logic/minecraft/auth/flows/ValidateTask.cpp
@@ -1,5 +1,5 @@
 
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/logic/minecraft/auth/flows/ValidateTask.h b/api/logic/minecraft/auth/flows/ValidateTask.h
index a93bc76e..77de24c7 100644
--- a/api/logic/minecraft/auth/flows/ValidateTask.h
+++ b/api/logic/minecraft/auth/flows/ValidateTask.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.