[core] Remove Response::Error::Reason::Canceled

There is no such thing as a cancelled response, only cancelled requests. A request that is cancelled does not have its callback called with a Response.
This commit is contained in:
John Firebaugh
2016-02-04 10:59:36 -08:00
parent 19aa090bdc
commit 4d29c7d5ce
4 changed files with 5 additions and 6 deletions

View File

@@ -172,6 +172,7 @@ void HTTPAndroidRequest::cancel() {
void HTTPAndroidRequest::finish() {
if (!cancelled) {
assert(response);
notify(*response);
}
@@ -234,7 +235,7 @@ void HTTPAndroidRequest::onFailure(JNIEnv* env, int type, jstring message) {
response->error = std::make_unique<Error>(Error::Reason::Server, messageStr);
break;
case canceledError:
response->error = std::make_unique<Error>(Error::Reason::Canceled, "Request was cancelled");
response.reset();
break;
default:
response->error = std::make_unique<Error>(Error::Reason::Other, messageStr);