From 57b1785cd02c84e10fefaab67f06b9f7ea22c678 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Thu, 28 Jan 2016 16:10:46 -0800 Subject: [PATCH] fixes #1461 oknet chokes on binary charsets --- .../oknet/src/org/domokit/oknet/UrlLoaderImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sky/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java b/sky/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java index 833bfa402f9..8a594c13210 100644 --- 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.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); } }