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

am afe889a8: Merge "[B9] Pass the client id parameter for dict info requests" 

# Via Android (Google) Code Review (1) and Jean Chalard (1)
* commit 'afe889a83d43afe23d22d28a443b051bb115f023':
  [B9] Pass the client id parameter for dict info requests
main
Jean Chalard 2013-02-05 20:40:38 -08:00 committed by Android Git Automerger
parent bed6d9e67c afe889a83d
commit 22133221a1
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/res/values/donottranslate.xml
View File

@ -213,5 +213,6 @@
<!-- dictionary pack package name /settings activity (for shared prefs and settings) -->
<string name="dictionary_pack_package_name">com.google.android.inputmethod.latin.dictionarypack</string>
<string name="dictionary_pack_settings_activity">com.google.android.inputmethod.latin.dictionarypack.DictionarySettingsActivity</string>
<string name="dictionary_pack_client_id">com.android.inputmethod.latin</string>
<string name="settings_warning_researcher_mode">Attention! You are using the special keyboard for research purposes.</string>
</resources>

13
java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java
View File

@ -62,6 +62,13 @@ public final class BinaryDictionaryFileDumper {
private static final String QUERY_PARAMETER_SUCCESS = "success";
private static final String QUERY_PARAMETER_FAILURE = "failure";
// Using protocol version 2 to communicate with the dictionary pack
private static final String QUERY_PARAMETER_PROTOCOL = "protocol";
private static final String QUERY_PARAMETER_PROTOCOL_VALUE = "2";
// The path fragment to append after the client ID for dictionary info requests.
private static final String QUERY_PATH_DICT_INFO = "dict";
// Prevents this class to be accidentally instantiated.
private BinaryDictionaryFileDumper() {
}
@ -85,7 +92,11 @@ public final class BinaryDictionaryFileDumper {
private static List<WordListInfo> getWordListWordListInfos(final Locale locale,
final Context context, final boolean hasDefaultWordList) {
final ContentResolver resolver = context.getContentResolver();
final Uri.Builder builder = getProviderUriBuilder(locale.toString());
final String clientId = context.getString(R.string.dictionary_pack_client_id);
final Uri.Builder builder = getProviderUriBuilder(clientId);
builder.appendPath(QUERY_PATH_DICT_INFO);
builder.appendPath(locale.toString());
builder.appendQueryParameter(QUERY_PARAMETER_PROTOCOL, QUERY_PARAMETER_PROTOCOL_VALUE);
if (!hasDefaultWordList) {
builder.appendQueryParameter(QUERY_PARAMETER_MAY_PROMPT_USER, QUERY_PARAMETER_TRUE);
}