Restore Android 10 API compatibility.

[Dictionary.git] / src / com / hughes / android / dictionary / engine / HtmlEntry.java

diff --git a/src/com/hughes/android/dictionary/engine/HtmlEntry.java b/src/com/hughes/android/dictionary/engine/HtmlEntry.java
index 1b191a93ac4b80000672876b4f453cfe5c1c097e..7aa43d5340d41d2f8153b8b479957e59a04ffe04 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/HtmlEntry.java
+++ b/src/com/hughes/android/dictionary/engine/HtmlEntry.java
@@ -6,8 +6,6 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.lang.ref.SoftReference;
-import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -121,7 +119,7 @@ public class HtmlEntry extends AbstractEntry implements Comparable<HtmlEntry> {
     static final class DataDeserializer implements RAFListSerializer<DataInputBuffer> {
         @Override
         public DataInputBuffer read(DataInput raf, final int index) throws IOException {
-            return HtmlEntry.readData(raf);
+            return readData(raf);
         }
 
         @Override
@@ -215,7 +213,11 @@ public class HtmlEntry extends AbstractEntry implements Comparable<HtmlEntry> {
     public static String formatQuickdicUrl(final String indexShortName, final String text) {
         assert !indexShortName.contains(":");
         assert text.length() > 0;
-        return String.format("q://d?%s&%s", indexShortName, StringUtil.encodeForUrl(text));
+        StringBuilder s = new StringBuilder("q://d?");
+        s.append(indexShortName);
+        s.append("&");
+        s.append(StringUtil.encodeForUrl(text));
+        return s.toString();
     }
 
     public static boolean isQuickdicUrl(String url) {
@@ -265,7 +267,8 @@ public class HtmlEntry extends AbstractEntry implements Comparable<HtmlEntry> {
             buf.readFully(zipBytes);
             try {
                 final byte[] bytes = StringUtil.unzipFully(zipBytes, numBytes);
-                html = new String(bytes, StandardCharsets.UTF_8);
+                // Cannot use StandardCharsets due to older Android.
+                html = new String(bytes, "UTF-8");
             } catch (IOException e) {
                 throw new RuntimeException("Dictionary HTML data corrupted", e);
             }