n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-28 14:54:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mitigate crash in getSubtypeDisplayNameInSystemLocale

Browse Source
This commit is contained in:
Aleksandras Kostarevas 2024-07-24 23:57:02 +03:00
parent 139ec62461
commit bdfa736e1f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/org/futo/inputmethod/latin/utils/SubtypeLocaleUtils.java
View File

@ -28,6 +28,7 @@ import android.view.inputmethod.InputMethodSubtype;
import org.futo.inputmethod.latin.R; import org.futo.inputmethod.latin.R;
import org.futo.inputmethod.latin.Subtypes; import org.futo.inputmethod.latin.Subtypes;
import org.futo.inputmethod.latin.SubtypesKt;
import org.futo.inputmethod.latin.common.LocaleUtils; import org.futo.inputmethod.latin.common.LocaleUtils;
import org.futo.inputmethod.latin.common.StringUtils; import org.futo.inputmethod.latin.common.StringUtils;
@ -269,6 +270,9 @@ public final class SubtypeLocaleUtils {
@Nonnull @Nonnull
public static String getSubtypeDisplayNameInSystemLocale( public static String getSubtypeDisplayNameInSystemLocale(
@Nonnull final InputMethodSubtype subtype) { @Nonnull final InputMethodSubtype subtype) {
if(sResources == null) {
return Subtypes.INSTANCE.getLocale(subtype).getDisplayName();
}
final Locale displayLocale = sResources.getConfiguration().locale; final Locale displayLocale = sResources.getConfiguration().locale;
return getSubtypeDisplayNameInternal(subtype, displayLocale); return getSubtypeDisplayNameInternal(subtype, displayLocale);
} }