X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FHtmlDisplayActivity.java;h=f6a37e93e5cbdd4ec1063a3153da1872bd84de33;hp=c2f4a8398bc8326b36213d145b27b938ab207fe0;hb=c76660b2772122109529d3616289980a7084eeeb;hpb=83d9dc7cd871082a82c2dd0dbb7a0ceabd7c83a0 diff --git a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java index c2f4a83..f6a37e9 100644 --- a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java +++ b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java @@ -18,7 +18,7 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; -import android.preference.PreferenceManager; +import android.support.v7.preference.PreferenceManager; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.util.Base64; @@ -86,7 +86,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); @@ -103,6 +103,7 @@ public final class HtmlDisplayActivity extends AppCompatActivity { webView.getSettings().setDefaultFontSize(fontSizeSp); try { // No way to get pure UTF-8 data into WebView + // Cannot use StandardCharsets due to older Android. html = Base64.encodeToString(html.getBytes("UTF-8"), Base64.DEFAULT); } catch (UnsupportedEncodingException e) { throw new RuntimeException("Missing UTF-8 support?!", e);