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

diff --git a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
index a7faf53..f8899b4 100644
--- a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
+++ b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
@@ -20,12 +20,11 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Base64;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.Button;
 
 import com.hughes.util.StringUtil;
@@ -33,15 +32,16 @@ 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 ActionBarActivity {
+public final class HtmlDisplayActivity extends AppCompatActivity {
 
-    static final String LOG = "QuickDic";
+    private static final String LOG = "QuickDic";
 
-    static final String HTML_RES = "html_res";
-    static final String HTML = "html";
-    static final String TEXT_TO_HIGHLIGHT = "textToHighlight";
-    static final String SHOW_OK_BUTTON = "showOKButton";
+    private static final String HTML_RES = "html_res";
+    private static final String HTML = "html";
+    private static final String TEXT_TO_HIGHLIGHT = "textToHighlight";
+    private static final String SHOW_OK_BUTTON = "showOKButton";
 
     public static Intent getHelpLaunchIntent(Context c) {
         final Intent intent = new Intent(c, HtmlDisplayActivity.class);
@@ -87,7 +87,7 @@ public final class HtmlDisplayActivity extends ActionBarActivity {
             html = StringUtil.readToString(res);
             try {
                 res.close();
-            } catch (IOException e) {
+            } catch (IOException ignored) {
             }
         } else {
             html = getIntent().getStringExtra(HTML);
@@ -102,12 +102,8 @@ public final class HtmlDisplayActivity extends ActionBarActivity {
             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;