From 8a84263d2b7f30bdb87a0b49c1d84454ece38b21 Mon Sep 17 00:00:00 2001
From: Alexander Tkachev
Date: Tue, 14 Jun 2016 21:16:11 +0600
Subject: CLOUD: Do saves sync on Storage connect
---
backends/cloud/cloudmanager.cpp | 7 ++++++-
backends/cloud/dropbox/dropboxstorage.cpp | 3 +--
backends/cloud/googledrive/googledrivestorage.cpp | 2 --
backends/cloud/onedrive/onedrivestorage.cpp | 2 --
4 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'backends/cloud')
diff --git a/backends/cloud/cloudmanager.cpp b/backends/cloud/cloudmanager.cpp
index 38b740216b..a6f5575b3a 100644
--- a/backends/cloud/cloudmanager.cpp
+++ b/backends/cloud/cloudmanager.cpp
@@ -124,7 +124,12 @@ void CloudManager::replaceStorage(Storage *storage, uint32 index) {
_activeStorage = storage;
_currentStorageIndex = index;
save();
- if (_activeStorage) _activeStorage->info(nullptr, nullptr); //automatically calls setStorageUsername()
+
+ //do what should be done on first Storage connect
+ if (_activeStorage) {
+ _activeStorage->info(nullptr, nullptr); //automatically calls setStorageUsername()
+ _activeStorage->syncSaves(nullptr, nullptr);
+ }
}
Storage *CloudManager::getCurrentStorage() const {
diff --git a/backends/cloud/dropbox/dropboxstorage.cpp b/backends/cloud/dropbox/dropboxstorage.cpp
index b677b56ff9..d77e958da7 100644
--- a/backends/cloud/dropbox/dropboxstorage.cpp
+++ b/backends/cloud/dropbox/dropboxstorage.cpp
@@ -76,6 +76,7 @@ void DropboxStorage::codeFlowComplete(Networking::JsonResponse response) {
if (json) {
Common::JSONObject result = json->asObject();
if (!result.contains("access_token") || !result.contains("uid")) {
+ warning(json->stringify(true).c_str());
warning("Bad response, no token/uid passed");
} else {
_token = result.getVal("access_token")->asString();
@@ -83,8 +84,6 @@ void DropboxStorage::codeFlowComplete(Networking::JsonResponse response) {
CloudConfig.removeKey("dropbox_code");
CloudMan.replaceStorage(this, kStorageDropboxId);
CloudConfig.flushToDisk();
- debug("Done! You can use Dropbox now! Look:");
- CloudMan.testFeature();
}
delete json;
diff --git a/backends/cloud/googledrive/googledrivestorage.cpp b/backends/cloud/googledrive/googledrivestorage.cpp
index 2b044ce12a..1e31121d6c 100644
--- a/backends/cloud/googledrive/googledrivestorage.cpp
+++ b/backends/cloud/googledrive/googledrivestorage.cpp
@@ -125,8 +125,6 @@ void GoogleDriveStorage::codeFlowComplete(BoolResponse response) {
CloudConfig.removeKey("googledrive_code");
CloudMan.replaceStorage(this, kStorageGoogleDriveId);
CloudConfig.flushToDisk();
- debug("Done! You can use Google Drive now! Look:");
- CloudMan.testFeature();
}
void GoogleDriveStorage::saveConfig(Common::String keyPrefix) {
diff --git a/backends/cloud/onedrive/onedrivestorage.cpp b/backends/cloud/onedrive/onedrivestorage.cpp
index bc1a4ff130..b91d1cdce1 100644
--- a/backends/cloud/onedrive/onedrivestorage.cpp
+++ b/backends/cloud/onedrive/onedrivestorage.cpp
@@ -119,8 +119,6 @@ void OneDriveStorage::codeFlowComplete(BoolResponse response) {
CloudConfig.removeKey("onedrive_code");
CloudMan.replaceStorage(this, kStorageOneDriveId);
CloudConfig.flushToDisk();
- debug("Done! You can use OneDrive now! Look:");
- CloudMan.syncSaves();
}
void OneDriveStorage::saveConfig(Common::String keyPrefix) {
--
cgit v1.2.3