Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f4d5d5f authored by Yuichiro Hanada's avatar Yuichiro Hanada
Browse files

Fix getDictionaryFileHeader. 

Change-Id: I5186f41b0f38eb08f4154f7b3de7ffc2119fc44b
parent e9a10ff0

java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ public final class BinaryDictIOUtils { 
     * @param offset The offset in the file where to start reading the data.

     * @param length The length of the data file.

     */

    public static FileHeader getDictionaryFileHeader(

    private static FileHeader getDictionaryFileHeader(

            final File file, final long offset, final long length)

            throws FileNotFoundException, IOException, UnsupportedFormatException {

        final byte[] buffer = new byte[HEADER_READING_BUFFER_SIZE];
@@ -528,6 +528,7 @@ public final class BinaryDictIOUtils { 
                            throws FileNotFoundException, IOException {

                        final FileInputStream inStream = new FileInputStream(file);

                        try {

                            inStream.skip(offset);

                            inStream.read(buffer);

                            return new ByteArrayDictBuffer(buffer);

                        } finally {

java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java

+1 −7
Original line number Diff line number Diff line
@@ -281,13 +281,7 @@ public class DictionaryInfoUtils { 
    }



    public static FileHeader getDictionaryFileHeaderOrNull(final File file) {

        try {

            return BinaryDictIOUtils.getDictionaryFileHeader(file, 0, file.length());

        } catch (UnsupportedFormatException e) {

            return null;

        } catch (IOException e) {

            return null;

        }

        return BinaryDictIOUtils.getDictionaryFileHeaderOrNull(file, 0, file.length());

    }



    private static DictionaryInfo createDictionaryInfoFromFileAddress(