DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixes #1461 oknet chokes on binary charsets

Browse Source
This commit is contained in:
Collin Jackson 2016-01-28 16:10:46 -08:00
parent 8d7a4bb3f8
commit 57b1785cd0
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sky/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java
View File

@ -37,6 +37,7 @@ import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.WritableByteChannel;
import java.nio.charset.Charset;
import java.nio.charset.UnsupportedCharsetException;
import java.util.concurrent.Executor;
import okio.BufferedSource;
@ -248,9 +249,13 @@ public class UrlLoaderImpl implements UrlLoader {
MediaType mediaType = body.contentType();
if (mediaType != null) {
urlResponse.mimeType = mediaType.type() + "/" + mediaType.subtype();
Charset charset = mediaType.charset();
if (charset != null) {
urlResponse.charset = charset.displayName();
try {
Charset charset = mediaType.charset();
if (charset != null) {
urlResponse.charset = charset.displayName();
}
} catch (UnsupportedCharsetException e) {
Log.e(TAG, "Unsupported charset", e);
}
}