diff options
author | Alexander Tkachev | 2016-05-27 19:32:35 +0600 |
---|---|---|
committer | Alexander Tkachev | 2016-08-24 16:07:55 +0600 |
commit | 6c01edc57a221e5c376d23f12bb2f090c73c4ffd (patch) | |
tree | 5b7d07e0ca56733ec7fe87d5aa39e47fbf0c678b /backends/cloud/onedrive/onedrivetokenrefresher.h | |
parent | dcbaeb57c4cbe58d17fd46b52fd23ae154458398 (diff) | |
download | scummvm-rg350-6c01edc57a221e5c376d23f12bb2f090c73c4ffd.tar.gz scummvm-rg350-6c01edc57a221e5c376d23f12bb2f090c73c4ffd.tar.bz2 scummvm-rg350-6c01edc57a221e5c376d23f12bb2f090c73c4ffd.zip |
CLOUD: Simplify OneDriveTokenRefresher
It now just extends CurlJsonRequest, not wraps one.
Diffstat (limited to 'backends/cloud/onedrive/onedrivetokenrefresher.h')
-rw-r--r-- | backends/cloud/onedrive/onedrivetokenrefresher.h | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/backends/cloud/onedrive/onedrivetokenrefresher.h b/backends/cloud/onedrive/onedrivetokenrefresher.h index c09879feed..08212bf6f5 100644 --- a/backends/cloud/onedrive/onedrivetokenrefresher.h +++ b/backends/cloud/onedrive/onedrivetokenrefresher.h @@ -24,7 +24,6 @@ #define BACKENDS_CLOUD_ONEDRIVE_ONEDRIVETOKENREFRESHER_H #include "backends/cloud/storage.h" -#include "common/callback.h" #include "backends/networking/curl/curljsonrequest.h" namespace Cloud { @@ -34,13 +33,8 @@ class OneDriveStorage; class OneDriveTokenRefresher: public Networking::CurlJsonRequest { OneDriveStorage *_parentStorage; - Common::Array<Common::String> _headers; - CurlJsonRequest *_innerRequest; - Networking::JsonCallback _jsonCallback; - Request *_retryRequest; - bool _started; - - void innerRequestCallback(Networking::JsonResponse pair); + Common::Array<Common::String> _headers; + void tokenRefreshed(Storage::BoolResponse pair); virtual void finishJson(Common::JSONValue *json); @@ -48,14 +42,12 @@ public: OneDriveTokenRefresher(OneDriveStorage *parent, Networking::JsonCallback callback, const char *url); virtual ~OneDriveTokenRefresher(); - virtual void handle(); - virtual void restart(); - virtual void finish(); + virtual void setHeaders(Common::Array<Common::String> &headers); - virtual void setHeaders(Common::Array<Common::String> &headers) { _headers = headers; } - virtual void addHeader(Common::String header) { _headers.push_back(header); } - virtual void addPostField(Common::String field) { _innerRequest->addPostField(field); } - virtual Networking::NetworkReadStreamResponse execute(); + virtual void addHeader(Common::String header) { + _headers.push_back(header); + CurlJsonRequest::addHeader(header); + } }; } //end of namespace OneDrive |