luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-05-25 19:29:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix spellchecker crash when keyboard has never been initialized, fixes #684

Browse source
This commit is contained in:
Helium314 2024-04-15 22:59:33 +02:00
parent 87f1092eac
commit 382bdb6ff6
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/helium314/keyboard/latin/InputAttributes.java
View file

@ -100,6 +100,7 @@ public final class InputAttributes {
final boolean noMicrophone = mIsPasswordField final boolean noMicrophone = mIsPasswordField
|| InputTypeUtils.isEmailVariation(variation) || InputTypeUtils.isEmailVariation(variation)
|| hasNoMicrophoneKeyOption() || hasNoMicrophoneKeyOption()
|| !RichInputMethodManager.isInitialized() // avoid crash when only using spell checker
|| !RichInputMethodManager.getInstance().hasShortcutIme(); || !RichInputMethodManager.getInstance().hasShortcutIme();
mShouldShowVoiceInputKey = !noMicrophone; mShouldShowVoiceInputKey = !noMicrophone;

13
app/src/main/java/helium314/keyboard/latin/RichInputMethodManager.java
View file

@ -69,24 +69,27 @@ public class RichInputMethodManager {
sInstance.initInternal(context); sInstance.initInternal(context);
} }
private boolean isInitialized() { private boolean isInitializedInternal() {
return mImm != null; return mImm != null;
} }
public static boolean isInitialized() {
return sInstance.isInitializedInternal();
}
private void checkInitialized() { private void checkInitialized() {
if (!isInitialized()) { if (!isInitializedInternal()) {
throw new RuntimeException(TAG + " is used before initialization"); throw new RuntimeException(TAG + " is used before initialization");
} }
} }
private void initInternal(final Context context) { private void initInternal(final Context context) {
if (isInitialized()) { if (isInitializedInternal()) {
return; return;
} }
mImm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE); mImm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
mContext = context; mContext = context;
mInputMethodInfoCache = new InputMethodInfoCache( mInputMethodInfoCache = new InputMethodInfoCache(mImm, context.getPackageName());
mImm, context.getPackageName());
// Initialize subtype utils. // Initialize subtype utils.
SubtypeLocaleUtils.init(context); SubtypeLocaleUtils.init(context);