diff options
| author | Alexander Tkachev | 2016-07-26 12:29:52 +0600 |
|---|---|---|
| committer | Alexander Tkachev | 2016-08-24 16:07:55 +0600 |
| commit | 6dd10f3a683ab787b751a84958502f7eda1da84c (patch) | |
| tree | 053ceac4936ebd24c9e76df0614587ac26c15a68 /backends/cloud/box | |
| parent | b9bba9bd4bec1bf00a61c347f411a8ecf9ea69e8 (diff) | |
| download | scummvm-rg350-6dd10f3a683ab787b751a84958502f7eda1da84c.tar.gz scummvm-rg350-6dd10f3a683ab787b751a84958502f7eda1da84c.tar.bz2 scummvm-rg350-6dd10f3a683ab787b751a84958502f7eda1da84c.zip | |
CLOUD: Add KEY/SECRET override code
The following constants must be defined if ENABLE_RELEASE is:
* RELEASE_DROPBOX_KEY,
* RELEASE_DROPBOX_SECRET,
* RELEASE_ONEDRIVE_KEY,
* RELEASE_ONEDRIVE_SECRET,
* RELEASE_GOOGLE_DRIVE_KEY,
* RELEASE_GOOGLE_DRIVE_SECRET,
* RELEASE_BOX_KEY,
* RELEASE_BOX_SECRET.
Diffstat (limited to 'backends/cloud/box')
| -rw-r--r-- | backends/cloud/box/boxstorage.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/backends/cloud/box/boxstorage.cpp b/backends/cloud/box/boxstorage.cpp index c2c4c6278e..58a2541a74 100644 --- a/backends/cloud/box/boxstorage.cpp +++ b/backends/cloud/box/boxstorage.cpp @@ -29,10 +29,14 @@ #include "backends/networking/curl/connectionmanager.h" #include "backends/networking/curl/curljsonrequest.h" #include "backends/networking/curl/networkreadstream.h" +#include "common/config-manager.h" #include "common/debug.h" #include "common/json.h" #include <curl/curl.h> -#include "common/config-manager.h" + +#ifdef ENABLE_RELEASE +#include "dists/clouds/cloud_keys.h" +#endif namespace Cloud { namespace Box { @@ -46,6 +50,10 @@ char *BoxStorage::KEY = nullptr; //can't use CloudConfig there yet, loading it o char *BoxStorage::SECRET = nullptr; //TODO: hide these secrets somehow void BoxStorage::loadKeyAndSecret() { +#ifdef ENABLE_RELEASE + KEY = RELEASE_BOX_KEY; + SECRET = RELEASE_BOX_SECRET; +#else Common::String k = ConfMan.get("BOX_KEY", ConfMan.kCloudDomain); KEY = new char[k.size() + 1]; memcpy(KEY, k.c_str(), k.size()); @@ -55,6 +63,7 @@ void BoxStorage::loadKeyAndSecret() { SECRET = new char[k.size() + 1]; memcpy(SECRET, k.c_str(), k.size()); SECRET[k.size()] = 0; +#endif } BoxStorage::BoxStorage(Common::String accessToken, Common::String refreshToken): |