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

Commit afe889a8 authored by Jean Chalard's avatar Jean Chalard Committed by Android (Google) Code Review
Browse files

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

parents a1008f7c 8192b4a6

java/res/values/donottranslate.xml

+1 −0
Original line number Diff line number Diff line
@@ -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>

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

+12 −1
Original line number Diff line number Diff line
@@ -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);

        }