aboutsummaryrefslogtreecommitdiff
path: root/backends/cloud/dropbox/dropboxstorage.cpp
diff options
context:
space:
mode:
authorAlexander Tkachev2016-06-12 11:47:52 +0600
committerAlexander Tkachev2016-08-24 16:07:55 +0600
commitdbafbf25693f13a9a3105379dd2b964095712fce (patch)
tree53663ef067cc6aa4f1affdca4e2bba476a8183a2 /backends/cloud/dropbox/dropboxstorage.cpp
parent2a2beaebc53ff6ef580a12b986d17147df3f15bc (diff)
downloadscummvm-rg350-dbafbf25693f13a9a3105379dd2b964095712fce.tar.gz
scummvm-rg350-dbafbf25693f13a9a3105379dd2b964095712fce.tar.bz2
scummvm-rg350-dbafbf25693f13a9a3105379dd2b964095712fce.zip
CLOUD: Fix getAccessToken()
KEY and SECRET should now load before getAccessToken() uses them, so it should work now.
Diffstat (limited to 'backends/cloud/dropbox/dropboxstorage.cpp')
-rw-r--r--backends/cloud/dropbox/dropboxstorage.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/backends/cloud/dropbox/dropboxstorage.cpp b/backends/cloud/dropbox/dropboxstorage.cpp
index b8851b05ec..bcafcf5264 100644
--- a/backends/cloud/dropbox/dropboxstorage.cpp
+++ b/backends/cloud/dropbox/dropboxstorage.cpp
@@ -36,8 +36,8 @@
namespace Cloud {
namespace Dropbox {
-char *DropboxStorage::KEY; //can't use ConfMan there yet, loading it on instance creation/auth
-char *DropboxStorage::SECRET; //TODO: hide these secrets somehow
+char *DropboxStorage::KEY = nullptr; //can't use ConfMan there yet, loading it on instance creation/auth
+char *DropboxStorage::SECRET = nullptr; //TODO: hide these secrets somehow
void DropboxStorage::loadKeyAndSecret() {
Common::String k = ConfMan.get("DROPBOX_KEY", "cloud");
@@ -59,7 +59,8 @@ DropboxStorage::DropboxStorage(Common::String code) {
DropboxStorage::~DropboxStorage() {}
-void DropboxStorage::getAccessToken(Common::String code) {
+void DropboxStorage::getAccessToken(Common::String code) {
+ if (!KEY || !SECRET) loadKeyAndSecret();
Networking::JsonCallback callback = new Common::Callback<DropboxStorage, Networking::JsonResponse>(this, &DropboxStorage::codeFlowComplete);
Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(callback, nullptr, "https://api.dropboxapi.com/1/oauth2/token");
request->addPostField("code=" + code);