Merge pull request flutter#2314 from collinjackson/chokes

fixes flutter#1461 oknet chokes on binary charsets
mnordine · Jan 29, 2016 · e49d611 · e49d611
2 parents 7e7df7f + 57b1785
commit e49d611
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/sky/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java b/sky/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java
@@ -37,6 +37,7 @@
 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 void onResponse(Response response) {
                     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);
                         }
                     }