X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FHtmlDisplayActivity.java;h=f8899b4cbdaadf0398e5bfaf237a2408e864eb45;hb=e79165503392ed6a7cb7a8eadc15eaae0cda9443;hp=c2f4a8398bc8326b36213d145b27b938ab207fe0;hpb=83d9dc7cd871082a82c2dd0dbb7a0ceabd7c83a0;p=Dictionary.git

diff --git a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
index c2f4a83..f8899b4 100644
--- a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
+++ b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
@@ -32,6 +32,7 @@ import com.hughes.util.StringUtil;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 
 public final class HtmlDisplayActivity extends AppCompatActivity {
 
@@ -86,7 +87,7 @@ public final class HtmlDisplayActivity extends AppCompatActivity {
             html = StringUtil.readToString(res);
             try {
                 res.close();
-            } catch (IOException e) {
+            } catch (IOException ignored) {
             }
         } else {
             html = getIntent().getStringExtra(HTML);
@@ -101,12 +102,8 @@ public final class HtmlDisplayActivity extends AppCompatActivity {
             fontSizeSp = 14;
         }
         webView.getSettings().setDefaultFontSize(fontSizeSp);
-        try {
-            // No way to get pure UTF-8 data into WebView
-            html = Base64.encodeToString(html.getBytes("UTF-8"), Base64.DEFAULT);
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException("Missing UTF-8 support?!", e);
-        }
+        // No way to get pure UTF-8 data into WebView
+        html = Base64.encodeToString(html.getBytes(StandardCharsets.UTF_8), Base64.DEFAULT);
         // Use loadURL to allow specifying a charset
         webView.loadUrl("data:text/html;charset=utf-8;base64," + html);
         webView.activity = this;