mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Added streaming mode to http uploader to avoid huge memory consumtion

Browse source
This commit is contained in:
Александр Зацепин 2018-02-13 18:52:00 +03:00 • committed by Arsentiy Milchakov
parent 45a81516cf
commit 8011bf8aac
3 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/src/com/mapswithme/util/Constants.java
View file

@ -11,6 +11,9 @@ public final class Constants
public static final int MB = 1024 * 1024;
public static final int GB = 1024 * 1024 * 1024;
static final int CONNECTION_TIMEOUT_MS = 5000;
static final int READ_TIMEOUT_MS = 30000;
public static class Url
{
public static final String GE0_PREFIX = "ge0://";

2
android/src/com/mapswithme/util/HttpClient.java
View file

@ -269,7 +269,7 @@ public final class HttpClient
int httpResponseCode = -1;
boolean followRedirects = true;
boolean loadHeaders;
int timeoutMillisec = 30000;
int timeoutMillisec = Constants.READ_TIMEOUT_MS;
// Simple GET request constructor.
public Params(String url)

25
android/src/com/mapswithme/util/HttpUploader.java
View file

@ -1,5 +1,6 @@
package com.mapswithme.util;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
@ -71,10 +72,11 @@ public final class HttpUploader
{
URL url = new URL(mUrl);
connection = (HttpURLConnection) url.openConnection();
connection.setConnectTimeout(Constants.CONNECTION_TIMEOUT_MS);
connection.setReadTimeout(Constants.READ_TIMEOUT_MS);
connection.setUseCaches(false);
connection.setRequestMethod(mMethod);
connection.setDoOutput(mMethod.equals("POST"));
connection.setDoInput(true);
long fileSize = StorageUtils.getFileSize(mFilePath);
StringBuilder paramsBuilder = new StringBuilder();
@ -84,8 +86,9 @@ public final class HttpUploader
int endPartSize = LINE_FEED.length() + "--".length() + mBoundary.length()
+ "--".length() + LINE_FEED.length();
long bodyLength = paramsBuilder.toString().length() + fileSize + endPartSize;
setStreamingMode(connection, bodyLength);
setHeaders(connection, bodyLength);
long startTime = System.currentTimeMillis();
OutputStream outputStream = connection.getOutputStream();
writer = new PrintWriter(new OutputStreamWriter(outputStream, CHARSET));
writeParams(writer, paramsBuilder);
@ -95,7 +98,9 @@ public final class HttpUploader
LOGGER.d(TAG, "Upload bookmarks status code: " + status);
reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
message = readResponse(reader);
LOGGER.d(TAG, "Upload bookmarks response: " + message);
long duration = (System.currentTimeMillis() - startTime) / 1000;
LOGGER.d(TAG, "Upload bookmarks response: '" + message + "', " +
"duration = " + duration + " sec, body size = " + bodyLength + " bytes.");
}
catch (IOException e)
{
@ -119,6 +124,20 @@ public final class HttpUploader
return new Result(status, message);
}
private static void setStreamingMode(@NonNull HttpURLConnection connection, long bodyLength)
{
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
{
connection.setFixedLengthStreamingMode(bodyLength);
return;
}
if (bodyLength <= Integer.MAX_VALUE)
connection.setFixedLengthStreamingMode((int) bodyLength);
else
connection.setChunkedStreamingMode(BUFFER);
}
@NonNull
private String readResponse(@NonNull BufferedReader reader)
throws IOException