[B14] Implement sending the dictionary list. (3623ad23) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java

+17 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@ import android.net.Uri;
		import android.text.TextUtils;
		import android.util.Log;

		import com.android.inputmethod.latin.DictionaryInfoUtils.DictionaryInfo;

		import java.io.BufferedInputStream;
		import java.io.BufferedOutputStream;
		import java.io.File;
		@@ -33,6 +35,7 @@ import java.io.FileOutputStream;
		import java.io.IOException;
		import java.io.InputStream;
		import java.util.Arrays;
		import java.util.ArrayList;
		import java.util.Collections;
		import java.util.List;
		import java.util.Locale;
		@@ -359,6 +362,19 @@ public final class BinaryDictionaryFileDumper {
		metadataValues.put(INSERT_METADATA_CLIENT_ID_COLUMN, clientId);
		metadataValues.put(INSERT_METADATA_METADATA_URI_COLUMN, metadataFileUri);
		resolver.insert(metadataContentUri, metadataValues);
		// TODO: Update the versions of the dictionaries

		// Update the dictionary list.
		final Uri dictionaryContentUriBase = getProviderUriBuilder(clientId)
		.appendPath(QUERY_PATH_DICT_INFO)
		.appendQueryParameter(QUERY_PARAMETER_PROTOCOL, QUERY_PARAMETER_PROTOCOL_VALUE)
		.build();
		final ArrayList<DictionaryInfo> dictionaryList =
		DictionaryInfoUtils.getCurrentDictionaryFileNameAndVersionInfo(context);
		final int length = dictionaryList.size();
		for (int i = 0; i < length; ++i) {
		final DictionaryInfo info = dictionaryList.get(i);
		resolver.insert(Uri.withAppendedPath(dictionaryContentUriBase, info.mId),
		info.toContentValues());
		}
		}
		}

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

+40 −15

Original line number	Diff line number	Diff line
		@@ -16,9 +16,11 @@

		package com.android.inputmethod.latin;

		import android.content.ContentValues;
		import android.content.Context;
		import android.content.res.AssetManager;
		import android.content.res.Resources;
		import android.text.format.DateUtils;
		import android.util.Log;

		import com.android.inputmethod.latin.makedict.BinaryDictIOUtils;
		@@ -39,19 +41,40 @@ public class DictionaryInfoUtils {
		private static final String RESOURCE_PACKAGE_NAME =
		DictionaryInfoUtils.class.getPackage().getName();
		private static final String DEFAULT_MAIN_DICT = "main";
		private static final String ID_CATEGORY_SEPARATOR =
		BinaryDictionaryGetter.ID_CATEGORY_SEPARATOR;
		private static final String MAIN_DICT_PREFIX = "main_";
		// 6 digits - unicode is limited to 21 bits
		private static final int MAX_HEX_DIGITS_FOR_CODEPOINT = 6;

		public static class DictionaryInfo {
		private static final String LOCALE_COLUMN = "locale";
		private static final String WORDLISTID_COLUMN = "id";
		private static final String LOCAL_FILENAME_COLUMN = "filename";
		private static final String DATE_COLUMN = "date";
		private static final String FILESIZE_COLUMN = "filesize";
		private static final String VERSION_COLUMN = "version";
		public final Locale mLocale;
		public final AssetFileAddress mFileAddress;
		public final int mVersion;
		public final String mId;
		public DictionaryInfo(final Locale locale, final AssetFileAddress fileAddress,
		final int version) {
		mLocale = locale;
		mFileAddress = fileAddress;
		mVersion = version;
		mId = DEFAULT_MAIN_DICT + ID_CATEGORY_SEPARATOR + mLocale;
		}
		public ContentValues toContentValues() {
		final ContentValues values = new ContentValues();
		values.put(WORDLISTID_COLUMN, mId);
		values.put(LOCALE_COLUMN, mLocale.toString());
		values.put(LOCAL_FILENAME_COLUMN, mFileAddress.mFilename);
		values.put(DATE_COLUMN,
		new File(mFileAddress.mFilename).lastModified() / DateUtils.SECOND_IN_MILLIS);
		values.put(FILESIZE_COLUMN, mFileAddress.mLength);
		values.put(VERSION_COLUMN, mVersion);
		return values;
		}
		}

		@@ -284,6 +307,7 @@ public class DictionaryInfoUtils {

		// Retrieve downloaded dictionaries
		final File[] directoryList = getCachedDirectoryList(context);
		if (null != directoryList) {
		for (final File directory : directoryList) {
		final String localeString = getWordListIdFromFileName(directory.getName());
		File[] dicts = BinaryDictionaryGetter.getCachedWordLists(localeString, context);
		@@ -301,6 +325,7 @@ public class DictionaryInfoUtils {
		addOrUpdateDictInfo(dictList, dictionaryInfo);
		}
		}
		}

		// Retrieve files from assets
		final Resources resources = context.getResources();