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

Commit eed02dd2 authored by Jean Chalard's avatar Jean Chalard
Browse files

Fix a bug with adding a word 

It was possible to insert a word without a shortcut while the same
word used to be present with a shortcut. This change fixes that.

Bug: 6026080
Change-Id: I3be98bf450aad8e2eb38336e8f77aedab39d5797
parent 27154387

src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java

+33 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings.inputmethod; 
import android.app.Activity;

import android.content.ContentResolver;

import android.content.Context;

import android.database.Cursor;

import android.os.Bundle;

import android.provider.UserDictionary;

import android.text.TextUtils;
@@ -118,6 +119,12 @@ public class UserDictionaryAddWordContents { 
            // If the word is somehow empty, don't insert it.

            return;

        }

        // If there is no shortcut, and the word already exists in the database, then we

        // should not insert, because either A. the word exists with no shortcut, in which

        // case the exact same thing we want to insert is already there, or B. the word

        // exists with at least one shortcut, in which case it has priority on our word.

        if (hasWord(newWord, context)) return;



        // Disallow duplicates. If the same word with no shortcut is defined, remove it; if

        // the same word with the same shortcut is defined, remove it; but we don't mind if

        // there is the same word with a different, non-empty shortcut.
@@ -134,6 +141,32 @@ public class UserDictionaryAddWordContents { 
                TextUtils.isEmpty(mLocale) ? null : Utils.createLocaleFromString(mLocale));

    }



    private static final String[] HAS_WORD_PROJECTION = { UserDictionary.Words.WORD };

    private static final String HAS_WORD_SELECTION_ONE_LOCALE = UserDictionary.Words.WORD

            + "=? AND " + UserDictionary.Words.LOCALE + "=?";

    private static final String HAS_WORD_SELECTION_ALL_LOCALES = UserDictionary.Words.WORD

            + "=? AND " + UserDictionary.Words.LOCALE + " is null";

    private boolean hasWord(final String word, final Context context) {

        final Cursor cursor;

        // mLocale == "" indicates this is an entry for all languages. Here, mLocale can't

        // be null at all (it's ensured by the updateLocale method).

        if ("".equals(mLocale)) {

            cursor = context.getContentResolver().query(UserDictionary.Words.CONTENT_URI,

                      HAS_WORD_PROJECTION, HAS_WORD_SELECTION_ALL_LOCALES,

                      new String[] { word }, null /* sort order */);

        } else {

            cursor = context.getContentResolver().query(UserDictionary.Words.CONTENT_URI,

                      HAS_WORD_PROJECTION, HAS_WORD_SELECTION_ONE_LOCALE,

                      new String[] { word, mLocale }, null /* sort order */);

        }

        try {

            if (null == cursor) return false;

            return cursor.getCount() > 0;

        } finally {

            if (null != cursor) cursor.close();

        }

    }



    public static class LocaleRenderer {

        private final String mLocaleString;

        private final String mDescription;