github/cordova-plugin-advanced-http
4
0
Fork 0
mirror of https://github.com/silkimen/cordova-plugin-advanced-http.git synced 2026-04-24 00:00:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: bug fix #54 causes a bug on Android (success and failure handler are called both)

Browse Source
This commit is contained in:
Sefa Ilkimen
2018-01-04 01:23:49 +01:00
parent a9c3be124e
commit 73097b9db9
1 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/advanced-http.js
+36 -14
View File
@@ -66,7 +66,7 @@ function mergeHeaders(globalHeaders, localHeaders) {
return localHeaders;
}
function checkHeaders(headers, onFail) {
function checkHeaders(headers) {
var keys = Object.keys(headers);
var key;
@@ -74,13 +74,19 @@ function checkHeaders(headers, onFail) {
key = keys[i];
if (typeof headers[key] !== 'string') {
return onFail({
status: 0,
error: HEADER_VALUE_MUST_BE_STRING,
headers: {}
});
return false;
}
}
return true;
}
function onInvalidHeader(handler) {
handler({
status: 0,
error: HEADER_VALUE_MUST_BE_STRING,
headers: {}
});
}
function checkSerializer(serializer) {
@@ -234,7 +240,9 @@ var http = {
data = data || {};
headers = getMergedHeaders(url, headers, this.headers);
checkHeaders(headers, failure);
if (!checkHeaders(headers)) {
return onInvalidHeader(failure);
}
var onSuccess = injectCookieHandler(url, success);
var onFail = injectCookieHandler(url, failure);
@@ -247,7 +255,9 @@ var http = {
params = params || {};
headers = getMergedHeaders(url, headers, this.headers);
checkHeaders(headers, failure);
if (!checkHeaders(headers)) {
return onInvalidHeader(failure);
}
var onSuccess = injectCookieHandler(url, success);
var onFail = injectCookieHandler(url, failure);
@@ -260,7 +270,9 @@ var http = {
data = data || {};
headers = getMergedHeaders(url, headers, this.headers);
checkHeaders(headers, failure);
if (!checkHeaders(headers)) {
return onInvalidHeader(failure);
}
var onSuccess = injectCookieHandler(url, success);
var onFail = injectCookieHandler(url, failure);
@@ -274,7 +286,9 @@ var http = {
data = data || {};
headers = getMergedHeaders(url, headers, this.headers);
checkHeaders(headers, failure);
if (!checkHeaders(headers)) {
return onInvalidHeader(failure);
}
var onSuccess = injectCookieHandler(url, success);
var onFail = injectCookieHandler(url, failure);
@@ -288,7 +302,9 @@ var http = {
params = params || {};
headers = getMergedHeaders(url, headers, this.headers);
checkHeaders(headers, failure);
if (!checkHeaders(headers)) {
return onInvalidHeader(failure);
}
var onSuccess = injectCookieHandler(url, success);
var onFail = injectCookieHandler(url, failure);
@@ -301,7 +317,9 @@ var http = {
params = params || {};
headers = getMergedHeaders(url, headers, this.headers);
checkHeaders(headers, failure);
if (!checkHeaders(headers)) {
return onInvalidHeader(failure);
}
var onSuccess = injectCookieHandler(url, success);
var onFail = injectCookieHandler(url, failure);
@@ -314,7 +332,9 @@ var http = {
params = params || {};
headers = getMergedHeaders(url, headers, this.headers);
checkHeaders(headers, failure);
if (!checkHeaders(headers)) {
return onInvalidHeader(failure);
}
var onSuccess = injectCookieHandler(url, success);
var onFail = injectCookieHandler(url, failure);
@@ -327,7 +347,9 @@ var http = {
params = params || {};
headers = getMergedHeaders(url, headers, this.headers);
checkHeaders(headers, failure);
if (!checkHeaders(headers)) {
return onInvalidHeader(failure);
}
var onSuccess = injectCookieHandler(url, injectFileEntryHandler(success));
var onFail = injectCookieHandler(url, failure);