diff options
author | Alexander Tkachev | 2016-07-26 15:54:48 +0600 |
---|---|---|
committer | Alexander Tkachev | 2016-08-24 16:07:55 +0600 |
commit | 37859a92039fe6df705024f45f84e1fbc4df806d (patch) | |
tree | 18297ac52972617b9fdb0942444328989bdf956c /backends/cloud | |
parent | bb529e6fd0bcbd69f804c599c9d685181560a337 (diff) | |
download | scummvm-rg350-37859a92039fe6df705024f45f84e1fbc4df806d.tar.gz scummvm-rg350-37859a92039fe6df705024f45f84e1fbc4df806d.tar.bz2 scummvm-rg350-37859a92039fe6df705024f45f84e1fbc4df806d.zip |
CLOUD: Fix Requests
Remove unnecessary JSON warnings, fix a few places.
Diffstat (limited to 'backends/cloud')
-rw-r--r-- | backends/cloud/box/boxuploadrequest.cpp | 2 | ||||
-rw-r--r-- | backends/cloud/googledrive/googledrivetokenrefresher.cpp | 2 | ||||
-rw-r--r-- | backends/cloud/onedrive/onedrivetokenrefresher.cpp | 2 | ||||
-rw-r--r-- | backends/cloud/savessyncrequest.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/backends/cloud/box/boxuploadrequest.cpp b/backends/cloud/box/boxuploadrequest.cpp index 929c9ceb75..5084aa5652 100644 --- a/backends/cloud/box/boxuploadrequest.cpp +++ b/backends/cloud/box/boxuploadrequest.cpp @@ -165,7 +165,7 @@ void BoxUploadRequest::uploadedCallback(Networking::JsonResponse response) { Common::JSONArray entries = object.getVal("entries")->asArray(); if (entries.size() == 0) { warning("BoxUploadRequest: 'entries' found, but it's empty"); - } else if (Networking::CurlJsonRequest::jsonIsObject(entries[0], "BoxUploadRequest")) { + } else if (!Networking::CurlJsonRequest::jsonIsObject(entries[0], "BoxUploadRequest")) { warning("BoxUploadRequest: 'entries' first item is not an object"); } else { Common::JSONObject item = entries[0]->asObject(); diff --git a/backends/cloud/googledrive/googledrivetokenrefresher.cpp b/backends/cloud/googledrive/googledrivetokenrefresher.cpp index 7d68510655..8cc492d6b4 100644 --- a/backends/cloud/googledrive/googledrivetokenrefresher.cpp +++ b/backends/cloud/googledrive/googledrivetokenrefresher.cpp @@ -66,7 +66,7 @@ void GoogleDriveTokenRefresher::finishJson(Common::JSONValue *json) { if (jsonIsObject(json, "GoogleDriveTokenRefresher")) { Common::JSONObject result = json->asObject(); long httpResponseCode = -1; - if (jsonContainsAttribute(result, "error", "GoogleDriveTokenRefresher") && jsonIsObject(result.getVal("error"), "GoogleDriveTokenRefresher")) { + if (result.contains("error") && jsonIsObject(result.getVal("error"), "GoogleDriveTokenRefresher")) { //new token needed => request token & then retry original request if (_stream) { httpResponseCode = _stream->httpResponseCode(); diff --git a/backends/cloud/onedrive/onedrivetokenrefresher.cpp b/backends/cloud/onedrive/onedrivetokenrefresher.cpp index 5ee2772ba7..ce7895f41c 100644 --- a/backends/cloud/onedrive/onedrivetokenrefresher.cpp +++ b/backends/cloud/onedrive/onedrivetokenrefresher.cpp @@ -66,7 +66,7 @@ void OneDriveTokenRefresher::finishJson(Common::JSONValue *json) { if (jsonIsObject(json, "OneDriveTokenRefresher")) { Common::JSONObject result = json->asObject(); long httpResponseCode = -1; - if (jsonContainsAttribute(result, "error", "OneDriveTokenRefresher") && jsonIsObject(result.getVal("error"), "OneDriveTokenRefresher")) { + if (result.contains("error") && jsonIsObject(result.getVal("error"), "OneDriveTokenRefresher")) { //new token needed => request token & then retry original request if (_stream) { httpResponseCode = _stream->httpResponseCode(); diff --git a/backends/cloud/savessyncrequest.cpp b/backends/cloud/savessyncrequest.cpp index 9c487bb987..fff46c3a83 100644 --- a/backends/cloud/savessyncrequest.cpp +++ b/backends/cloud/savessyncrequest.cpp @@ -153,7 +153,7 @@ void SavesSyncRequest::directoryListedErrorCallback(Networking::ErrorResponse er Common::JSONObject object = value->asObject(); //Dropbox-related error: - if (Networking::CurlJsonRequest::jsonContainsString(object, "error_summary", "SavesSyncRequest", true)) { + if (object.contains("error_summary") && object.getVal("error_summary")->isString()) { Common::String summary = object.getVal("error_summary")->asString(); if (summary.contains("not_found")) { irrecoverable = false; @@ -161,7 +161,7 @@ void SavesSyncRequest::directoryListedErrorCallback(Networking::ErrorResponse er } //OneDrive-related error: - if (Networking::CurlJsonRequest::jsonContainsObject(object, "error", "SavesSyncRequest", true)) { + if (object.contains("error") && object.getVal("error")->isObject()) { Common::JSONObject errorNode = object.getVal("error")->asObject(); if (Networking::CurlJsonRequest::jsonContainsString(errorNode, "code", "SavesSyncRequest")) { Common::String code = errorNode.getVal("code")->asString(); |