nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Allow using a format version 2 word list in LatinIME"

Browse source
This commit is contained in:
Jean Chalard 2012-04-20 03:04:47 -07:00 committed by Android (Google) Code Review
commit a4b846ac73
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java
View file

@ -49,7 +49,10 @@ public class BinaryDictionaryFileDumper {
*/ */
private static final int FILE_READ_BUFFER_SIZE = 1024; private static final int FILE_READ_BUFFER_SIZE = 1024;
// TODO: make the following data common with the native code // TODO: make the following data common with the native code
private static final byte[] MAGIC_NUMBER = new byte[] { 0x78, (byte)0xB1 }; private static final byte[] MAGIC_NUMBER_VERSION_1 =
new byte[] { (byte)0x78, (byte)0xB1, (byte)0x00, (byte)0x00 };
private static final byte[] MAGIC_NUMBER_VERSION_2 =
new byte[] { (byte)0x9B, (byte)0xC1, (byte)0x3A, (byte)0xFE };
private static final String DICTIONARY_PROJECTION[] = { "id" }; private static final String DICTIONARY_PROJECTION[] = { "id" };
@ -268,15 +271,18 @@ public class BinaryDictionaryFileDumper {
private static void checkMagicAndCopyFileTo(final BufferedInputStream input, private static void checkMagicAndCopyFileTo(final BufferedInputStream input,
final FileOutputStream output) throws FileNotFoundException, IOException { final FileOutputStream output) throws FileNotFoundException, IOException {
// Check the magic number // Check the magic number
final byte[] magicNumberBuffer = new byte[MAGIC_NUMBER.length]; final int length = MAGIC_NUMBER_VERSION_2.length;
final int readMagicNumberSize = input.read(magicNumberBuffer, 0, MAGIC_NUMBER.length); final byte[] magicNumberBuffer = new byte[length];
if (readMagicNumberSize < MAGIC_NUMBER.length) { final int readMagicNumberSize = input.read(magicNumberBuffer, 0, length);
if (readMagicNumberSize < length) {
throw new IOException("Less bytes to read than the magic number length"); throw new IOException("Less bytes to read than the magic number length");
} }
if (!Arrays.equals(MAGIC_NUMBER, magicNumberBuffer)) { if (!Arrays.equals(MAGIC_NUMBER_VERSION_2, magicNumberBuffer)) {
if (!Arrays.equals(MAGIC_NUMBER_VERSION_1, magicNumberBuffer)) {
throw new IOException("Wrong magic number for downloaded file"); throw new IOException("Wrong magic number for downloaded file");
} }
output.write(MAGIC_NUMBER); }
output.write(magicNumberBuffer);
// Actually copy the file // Actually copy the file
final byte[] buffer = new byte[FILE_READ_BUFFER_SIZE]; final byte[] buffer = new byte[FILE_READ_BUFFER_SIZE];