luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-06-02 04:42:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

address some potential nullability issues in dictionary facilitator

Browse source
This commit is contained in:
Helium314 2023-09-15 10:55:47 +02:00
parent 41a24295ae
commit 3d0e590852
3 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

34
app/src/main/java/org/dslul/openboard/inputmethod/latin/DictionaryFacilitatorImpl.java
View file

@ -153,7 +153,7 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
/** /**
* The locale associated with the dictionary group. * The locale associated with the dictionary group.
*/ */
@Nullable public final Locale mLocale; @NonNull public final Locale mLocale;
/** /**
* The user account associated with the dictionary group. * The user account associated with the dictionary group.
@ -202,10 +202,10 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
new ConcurrentHashMap<>(); new ConcurrentHashMap<>();
public DictionaryGroup() { public DictionaryGroup() {
this(null /* locale */, null /* mainDict */, null /* account */, Collections.emptyMap() /* subDicts */); this(new Locale(""), null /* mainDict */, null /* account */, Collections.emptyMap() /* subDicts */);
} }
public DictionaryGroup(@Nullable final Locale locale, public DictionaryGroup(@NonNull final Locale locale,
@Nullable final Dictionary mainDict, @Nullable final Dictionary mainDict,
@Nullable final String account, @Nullable final String account,
@NonNull final Map<String, ExpandableBinaryDictionary> subDicts) { @NonNull final Map<String, ExpandableBinaryDictionary> subDicts) {
@ -288,7 +288,7 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
@Override @Override
public boolean isActive() { public boolean isActive() {
return mDictionaryGroups.get(0).mLocale != null; return !mDictionaryGroups.get(0).mLocale.getLanguage().isEmpty();
} }
// used in // used in
@ -340,12 +340,10 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
@Nullable @Nullable
static DictionaryGroup findDictionaryGroupWithLocale(final List<DictionaryGroup> dictionaryGroups, static DictionaryGroup findDictionaryGroupWithLocale(final List<DictionaryGroup> dictionaryGroups,
final Locale locale) { @NonNull final Locale locale) {
if (dictionaryGroups == null) return null; if (dictionaryGroups == null) return null;
for (DictionaryGroup dictionaryGroup : dictionaryGroups) { for (DictionaryGroup dictionaryGroup : dictionaryGroups) {
if (locale == null && dictionaryGroup.mLocale == null) if (locale.equals(dictionaryGroup.mLocale))
return dictionaryGroup;
if (locale != null && locale.equals(dictionaryGroup.mLocale))
return dictionaryGroup; return dictionaryGroup;
} }
return null; return null;
@ -354,7 +352,7 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
// original // original
public void resetDictionaries( public void resetDictionaries(
final Context context, final Context context,
final Locale newLocale, @NonNull final Locale newLocale,
final boolean useContactsDict, final boolean useContactsDict,
final boolean usePersonalizedDicts, final boolean usePersonalizedDicts,
final boolean forceReloadMainDictionary, final boolean forceReloadMainDictionary,
@ -399,10 +397,8 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
final ArrayList<DictionaryGroup> newDictionaryGroups = new ArrayList<>(allLocales.size()); final ArrayList<DictionaryGroup> newDictionaryGroups = new ArrayList<>(allLocales.size());
for (Locale locale : allLocales) { for (Locale locale : allLocales) {
// get existing dictionary group for new locale // get existing dictionary group for new locale
final DictionaryGroup oldDictionaryGroupForLocale = final DictionaryGroup oldDictionaryGroupForLocale = findDictionaryGroupWithLocale(mDictionaryGroups, locale);
findDictionaryGroupWithLocale(mDictionaryGroups, locale); final ArrayList<String> dictTypesToCleanupForLocale = existingDictionariesToCleanup.get(locale);
final ArrayList<String> dictTypesToCleanupForLocale =
existingDictionariesToCleanup.get(locale);
final boolean noExistingDictsForThisLocale = (null == oldDictionaryGroupForLocale); final boolean noExistingDictsForThisLocale = (null == oldDictionaryGroupForLocale);
// create new or re-use already loaded main dict // create new or re-use already loaded main dict
@ -542,13 +538,13 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
final File dictFile = dictionaryFiles.get(dictType); final File dictFile = dictionaryFiles.get(dictType);
final ExpandableBinaryDictionary dict = getSubDict( final ExpandableBinaryDictionary dict = getSubDict(
dictType, context, locale, dictFile, "" /* dictNamePrefix */, account); dictType, context, locale, dictFile, "" /* dictNamePrefix */, account);
if (dict == null) {
throw new RuntimeException("Unknown dictionary type: " + dictType);
}
if (additionalDictAttributes.containsKey(dictType)) { if (additionalDictAttributes.containsKey(dictType)) {
dict.clearAndFlushDictionaryWithAdditionalAttributes( dict.clearAndFlushDictionaryWithAdditionalAttributes(
additionalDictAttributes.get(dictType)); additionalDictAttributes.get(dictType));
} }
if (dict == null) {
throw new RuntimeException("Unknown dictionary type: " + dictType);
}
dict.reloadDictionaryIfRequired(); dict.reloadDictionaryIfRequired();
dict.waitAllTasksForTests(); dict.waitAllTasksForTests();
subDicts.put(dictType, dict); subDicts.put(dictType, dict);
@ -939,9 +935,6 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
if (TextUtils.isEmpty(word)) { if (TextUtils.isEmpty(word)) {
return false; return false;
} }
if (dictionaryGroup.mLocale == null) {
return false;
}
if (isBlacklisted(word)) return false; if (isBlacklisted(word)) return false;
for (final String dictType : dictionariesToCheck) { for (final String dictType : dictionariesToCheck) {
final Dictionary dictionary = dictionaryGroup.getDict(dictType); final Dictionary dictionary = dictionaryGroup.getDict(dictType);
@ -992,7 +985,8 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
} else isInContacts = false; } else isInContacts = false;
// add to blacklist if in main or contacts dictionaries // add to blacklist if in main or contacts dictionaries
if ((isInContacts || group.getDict(Dictionary.TYPE_MAIN).isValidWord(word)) && group.blacklist.add(word)) { if ((isInContacts || (group.hasDict(Dictionary.TYPE_MAIN, null) && group.getDict(Dictionary.TYPE_MAIN).isValidWord(word)))
&& group.blacklist.add(word)) {
// write to file if word wasn't already in blacklist // write to file if word wasn't already in blacklist
ExecutorUtils.getBackgroundExecutor(ExecutorUtils.KEYBOARD).execute(() -> { ExecutorUtils.getBackgroundExecutor(ExecutorUtils.KEYBOARD).execute(() -> {
try { try {

2
app/src/main/java/org/dslul/openboard/inputmethod/latin/LatinIME.java
View file

@ -741,7 +741,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
* @param locale the locale * @param locale the locale
*/ */
// TODO: make sure the current settings always have the right locales, and read from them. // TODO: make sure the current settings always have the right locales, and read from them.
private void resetDictionaryFacilitator(final Locale locale) { private void resetDictionaryFacilitator(@NonNull final Locale locale) {
final SettingsValues settingsValues = mSettings.getCurrent(); final SettingsValues settingsValues = mSettings.getCurrent();
mDictionaryFacilitator.resetDictionaries(this /* context */, locale, mDictionaryFacilitator.resetDictionaries(this /* context */, locale,
settingsValues.mUseContactsDictionary, settingsValues.mUsePersonalizedDicts, settingsValues.mUseContactsDictionary, settingsValues.mUsePersonalizedDicts,

1
app/src/main/java/org/dslul/openboard/inputmethod/latin/SuggestedWords.java
View file

@ -269,7 +269,6 @@ public class SuggestedWords {
public final int mScore; public final int mScore;
public final int mKindAndFlags; public final int mKindAndFlags;
public final int mCodePointCount; public final int mCodePointCount;
@Deprecated
public final Dictionary mSourceDict; public final Dictionary mSourceDict;
// For auto-commit. This keeps track of the index inside the touch coordinates array // For auto-commit. This keeps track of the index inside the touch coordinates array
// passed to native code to get suggestions for a gesture that corresponds to the first // passed to native code to get suggestions for a gesture that corresponds to the first