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

[android] Fix gzip handlung in HttpClient

Browse source 
Compression is handled automatically since API 10:
https://android-developers.googleblog.com/2011/09/androids-http-clients.html

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2021-06-10 12:28:45 +03:00
parent 6d0c6feba7
commit dff0818148
1 changed files with 1 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,7 +39,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
@ -47,8 +46,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.zip.GZIPInputStream;
import java.util.zip.InflaterInputStream;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLSocketFactory;
@ -187,7 +184,7 @@ public final class HttpClient
else
ostream = new ByteArrayOutputStream(STREAM_BUFFER_SIZE);
// TODO(AlexZ): Add HTTP resume support in the future for partially downloaded files
final BufferedInputStream istream = new BufferedInputStream(getInputStream(connection), STREAM_BUFFER_SIZE);
final BufferedInputStream istream = new BufferedInputStream(connection.getInputStream(), STREAM_BUFFER_SIZE);
final byte[] buffer = new byte[STREAM_BUFFER_SIZE];
// gzip encoding is transparently enabled and we can't use Content-Length for
// body reading if server has gzipped it.
@ -225,28 +222,6 @@ public final class HttpClient
}
}
@NonNull
private static InputStream getInputStream(@NonNull HttpURLConnection connection) throws IOException
{
InputStream in;
try
{
if ("gzip".equals(connection.getContentEncoding()))
in = new GZIPInputStream(connection.getInputStream());
else if ("deflate".equals(connection.getContentEncoding()))
in = new InflaterInputStream(connection.getInputStream());
else
in = connection.getInputStream();
}
catch (IOException e)
{
in = connection.getErrorStream();
if (in == null)
throw e;
}
return in;
}
private static class Params
{
public void setHeaders(@NonNull KeyValue[] array)