Reputation: 2336
I am uploading a file from android to my webserver using the DataOutputStream with the following code:
public class SnapshotUploadTask extends AsyncTask<Object, Integer, Void> {
private final File file;
private final ProgressDialog progressDialog;
private final Activity activity;
public SnapshotUploadTask(File file, ProgressDialog progressDialog, Activity activity) {
this.progressDialog = progressDialog;
this.file = file;
this.activity = activity;
}
@Override
protected void onPreExecute() {
progressDialog.setProgress(0);
}
@Override
protected Void doInBackground(Object... arg0) {
String lineEnd = "\r\n";
String twoHyphens = "--";
String boundary = "*****";
int bytesRead;
int bytesAvailable;
int bufferSize;
byte[] buffer;
int maxBufferSize = 1 * 512;
try {
FileInputStream fileInputStream = new FileInputStream(file);
URL url = new URL("http://bla.bla.bla/upload");
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setDoInput(true);
connection.setDoOutput(true);
connection.setUseCaches(false);
connection.setRequestMethod("POST");
connection.setRequestProperty("Connection", "Keep-Alive");
connection.setRequestProperty("ENCTYPE", "multipart/form-data");
connection.setRequestProperty("Content-Type", "multipart/form-data;boundary=" + boundary);
connection.setRequestProperty("uploaded_file", file.getName());
DataOutputStream dataOutputStream = new DataOutputStream(connection.getOutputStream());
dataOutputStream.writeBytes(twoHyphens + boundary + lineEnd);
dataOutputStream.writeBytes("Content-Disposition: form-data; name=\"uploaded_file\";filename=\"" + file.getName() + "\"" + lineEnd);
dataOutputStream.writeBytes(lineEnd);
bytesAvailable = fileInputStream.available();
final int hundredPercent = bytesAvailable;
progressDialog.setMax(hundredPercent);
bufferSize = Math.min(bytesAvailable, maxBufferSize);
buffer = new byte[bufferSize];
bytesRead = fileInputStream.read(buffer, 0, bufferSize);
while (bytesRead > 0) {
dataOutputStream.write(buffer, 0, bufferSize);
bytesAvailable = fileInputStream.available();
bufferSize = Math.min(bytesAvailable, maxBufferSize);
bytesRead = fileInputStream.read(buffer, 0, bufferSize);
final int restBytes = bytesAvailable;
final int uploadedBytes = hundredPercent - restBytes;
activity.runOnUiThread(new Runnable() {
@Override
public void run() {
progressDialog.setProgress((int) uploadedBytes);
if (restBytes <= 0) {
progressDialog.setMessage(activity.getString(R.string.camera_uploading_done));
}
}
});
}
dataOutputStream.writeBytes(lineEnd);
dataOutputStream.writeBytes(twoHyphens + boundary + twoHyphens + lineEnd);
int serverResponseCode = connection.getResponseCode();
String serverResponseMessage = connection.getResponseMessage();
if (serverResponseCode == 200) {
progressDialog.dismiss();
}
fileInputStream.close();
dataOutputStream.flush();
dataOutputStream.close();
} catch (Exception e) {
progressDialog.dismiss();
}
return null;
}
@Override
protected void onPostExecute(Void result) {
progressDialog.dismiss();
}
}
Now what happens is that i update my progressDialog as soon as i have written a certain amount of bytes into the OutputStream which leads to the progressDialog reaching 100% before the data is actually received by the server.
I only know when the transmission is complete when i get to connection.getResponseCode();
What i want instead is to update the progress when the data chunks are actually received by the server. Is there a way to do that?
Upvotes: 1
Views: 1589
Reputation: 310936
You need to be aware that HttpURLConnection
buffers all the output unless you set fixed-length or chunked transfer mode, which you should certainly do instead of implementing it yourself. It does that so it can set the Content-Length header accurately. If you use one of these transfer modes there is no buffering.
NB You're misusing available()
: see the Javadoc; and you're writing junk in most cases:
dataOutputStream.write(buffer, 0, bufferSize);
should be
dataOutputStream.write(buffer, 0, bytesRead);
You don't need all that fiddling around with available()
inside the read loop either. Something like this is sufficient:
long total = 0;
int maxBufferSize = 8192; // at least. 512 is far too small.
while ((bytesRead = fileInputStream.read(buffer, 0, bufferSize)) > 0) {
dataOutputStream.write(buffer, 0, bytesRead);
total += bytesRead;
final long uploadedBytes = total;
activity.runOnUiThread(new Runnable() {
@Override
public void run() {
progressDialog.setProgress(uploadedBytes);
}
});
}
}
// at this point we are at end of stream
activity.runOnUiThread(new Runnable() {
@Override
public void run() {
progressDialog.setMessage(activity.getString(R.string.camera_uploading_done));
}
}
E&OE
Upvotes: 1