Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[6_1_X][TIMOB-24809] Android: HTTPClient - "onload" not dispatched. #9140

Merged
merged 7 commits into from
Jun 14, 2017
Merged

[6_1_X][TIMOB-24809] Android: HTTPClient - "onload" not dispatched. #9140

Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dedf38b
[TIMOB-24809] Android: HTTPClient - "onload" not dispatched.
ypbnv Jun 12, 2017
124e373
Clear only after the parts and pairs have been used.
ypbnv Jun 12, 2017
5db2c81
Guard for making a request while another is pending.
ypbnv Jun 13, 2017
d226e31
Fix a comment.
ypbnv Jun 13, 2017
3ae51b0
Merge branch '6_1_X' into TIMOB-24809-6_1_X
ssjsamir Jun 13, 2017
157342b
Fix warning log messages.
ypbnv Jun 14, 2017
7f2e1a8
Merge branch '6_1_X' into TIMOB-24809-6_1_X
ssjsamir Jun 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 18 additions & 3 deletions android/modules/network/src/java/ti/modules/titanium/network/TiHTTPClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@

import android.util.Base64;
import org.appcelerator.kroll.KrollDict;
import org.appcelerator.kroll.KrollProxy;
import org.appcelerator.kroll.common.Log;
import org.appcelerator.titanium.TiApplication;
import org.appcelerator.titanium.TiBlob;
Expand Down Expand Up @@ -155,6 +154,8 @@ public class TiHTTPClient
private String username;
private String password;

private boolean requestPending = false;

private void handleResponse(HttpURLConnection connection) throws IOException {
connected = true;

Expand Down Expand Up @@ -730,6 +731,11 @@ public String getResponseHeader(String getHeaderName)

public void open(String method, String url)
{
if (requestPending) {
Log.w(TAG, "open cancelled, a request is already pending for response.");
return;
}

Log.d(TAG, "open request method=" + method + " url=" + url, Log.DEBUG_MODE);

if (url == null)
Expand Down Expand Up @@ -1009,6 +1015,12 @@ private Object titaniumFileAsPutData(Object value)

public void send(Object userData) throws UnsupportedEncodingException
{

if (requestPending) {
Log.w(TAG, "send cancelled, a request is already pending for response.");
return;
}
requestPending = true;
aborted = false;

// TODO consider using task manager
Expand Down Expand Up @@ -1143,6 +1155,8 @@ public void run()
} catch (UnsupportedEncodingException e) {
Log.e(TAG, "Unsupported encoding: ", e);
}
//clear nvPairs after form entity is created
nvPairs.clear();
}

// calculate content length
Expand Down Expand Up @@ -1196,7 +1210,8 @@ public void progress(int progress) {
+ parts.get(name).getContentLength(), Log.DEBUG_MODE);
addFilePart(name, parts.get(name));
}

//clear parts after they have been used
parts.clear();
if (form != null) {
try {
ByteArrayOutputStream bos = new ByteArrayOutputStream((int) form.getContentLength());
Expand Down Expand Up @@ -1298,7 +1313,7 @@ public void progress(int progress) {

client = null;
clientThread = null;

requestPending = false;
// Fire the disposehandle event if the request is finished successfully or the errors occur.
// And it will dispose the handle of the httpclient in the JS.
proxy.fireEvent(TiC.EVENT_DISPOSE_HANDLE, null);
Expand Down