From e6242b0be8fc9f9abc4daf87f80675cca46df4d9 Mon Sep 17 00:00:00 2001
From: Alexander Tkachev
Date: Thu, 9 Jun 2016 18:49:17 +0600
Subject: GUI: Add Refresh button in Options Cloud tab

Commit changes CloudManager and Storages so they would automatically
refresh the fields when the could.
---
 backends/cloud/onedrive/onedrivestorage.cpp | 41 ++++++++++++++++-------------
 1 file changed, 22 insertions(+), 19 deletions(-)

(limited to 'backends/cloud/onedrive/onedrivestorage.cpp')

diff --git a/backends/cloud/onedrive/onedrivestorage.cpp b/backends/cloud/onedrive/onedrivestorage.cpp
index 82681756c4..178d43c8be 100644
--- a/backends/cloud/onedrive/onedrivestorage.cpp
+++ b/backends/cloud/onedrive/onedrivestorage.cpp
@@ -139,28 +139,31 @@ void OneDriveStorage::infoInnerCallback(StorageInfoCallback outerCallback, Netwo
 		delete outerCallback;
 		return;
 	}
-
-	if (outerCallback) {
-		Common::JSONObject info = json->asObject();
-
-		Common::String uid, name, email;
-		uint64 quotaUsed = 0, quotaAllocated = 26843545600L; // 25 GB, because I actually don't know any way to find out the real one
-
-		if (info.contains("createdBy") && info.getVal("createdBy")->isObject()) {
-			Common::JSONObject createdBy = info.getVal("createdBy")->asObject();
-			if (createdBy.contains("user") && createdBy.getVal("user")->isObject()) {
-				Common::JSONObject user = createdBy.getVal("user")->asObject();
-				uid = user.getVal("id")->asString();
-				name = user.getVal("displayName")->asString();
-			}
+	
+	Common::JSONObject info = json->asObject();
+
+	Common::String uid, name, email;
+	uint64 quotaUsed = 0, quotaAllocated = 26843545600L; // 25 GB, because I actually don't know any way to find out the real one
+
+	if (info.contains("createdBy") && info.getVal("createdBy")->isObject()) {
+		Common::JSONObject createdBy = info.getVal("createdBy")->asObject();
+		if (createdBy.contains("user") && createdBy.getVal("user")->isObject()) {
+			Common::JSONObject user = createdBy.getVal("user")->asObject();
+			uid = user.getVal("id")->asString();
+			name = user.getVal("displayName")->asString();
 		}
+	}
 
-		if (info.contains("size") && info.getVal("size")->isIntegerNumber()) {
-			quotaUsed = info.getVal("size")->asIntegerNumber();
-		}
+	if (info.contains("size") && info.getVal("size")->isIntegerNumber()) {
+		quotaUsed = info.getVal("size")->asIntegerNumber();
+	}
+
+	Common::String username = email;
+	if (username == "") username = name;
+	if (username == "") username = uid;
+	CloudMan.setStorageUsername(kStorageOneDriveId, username);
 
-		CloudMan.setStorageUsedSpace(kStorageOneDriveId, quotaUsed); //TODO that's not ScummVM's actually
-		CloudMan.setStorageUsername(kStorageOneDriveId, email);
+	if (outerCallback) {
 		(*outerCallback)(StorageInfoResponse(nullptr, StorageInfo(uid, name, email, quotaUsed, quotaAllocated)));
 		delete outerCallback;
 	}
-- 
cgit v1.2.3