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

do a sanity check when setting composing text on text fields that have suggestions disabled

Browse source 
fixes #225
could cause unnecessary text / suggestion reloads or performance regressions, though not found in testing
This commit is contained in:
Helium314 2024-06-12 20:24:16 +02:00
parent 0e992dd8b9
commit 5b1f40f0f6
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/helium314/keyboard/latin/RichInputConnection.java
View file

@ -18,6 +18,7 @@ import android.text.TextUtils;
import android.text.style.CharacterStyle;
import helium314.keyboard.keyboard.KeyboardSwitcher;
import helium314.keyboard.latin.settings.Settings;
import helium314.keyboard.latin.utils.Log;
import android.view.KeyEvent;
import android.view.inputmethod.CompletionInfo;
@ -651,7 +652,9 @@ public final class RichInputConnection implements PrivateCommandPerformer {
}
}
public void setComposingText(final CharSequence text, final int newCursorPosition) {
// return whether the text was (probably) set correctly
// unfortunately this is necessary in some cases
public boolean setComposingText(final CharSequence text, final int newCursorPosition) {
if (DEBUG_BATCH_NESTING) checkBatchEdit();
if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug();
mExpectedSelStart += text.length() - mComposingText.length();
@ -662,8 +665,20 @@ public final class RichInputConnection implements PrivateCommandPerformer {
// newCursorPosition != 1.
if (isConnected()) {
mIC.setComposingText(text, newCursorPosition);
if (!Settings.getInstance().getCurrent().mInputAttributes.mShouldShowSuggestions && text.length() > 0) {
// We have a field that disables suggestions, but still committed text is set.
// This might lead to weird bugs (e.g. https://github.com/Helium314/HeliBoard/issues/225), so better do
// a sanity check whether the wanted text has been set.
// Note that the check may also fail because the text field is not yet updated, so we don't want to check everything!
final CharSequence lastChar = mIC.getTextBeforeCursor(1, 0);
if (lastChar == null || lastChar.length() == 0 || text.charAt(text.length() - 1) != lastChar.charAt(0)) {
Log.w(TAG, "did set " + text + ", but got " + mIC.getTextBeforeCursor(text.length(), 0) + " as last character");
return false;
}
}
}
if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug();
return true;
}
/**

4
app/src/main/java/helium314/keyboard/latin/inputlogic/InputLogic.java
View file

@ -2451,7 +2451,9 @@ public final class InputLogic {
spannable.setSpan(backgroundColorSpan, 0, spanLength, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_COMPOSING);
composingTextToBeSet = spannable;
}
mConnection.setComposingText(composingTextToBeSet, newCursorPosition);
if (!mConnection.setComposingText(composingTextToBeSet, newCursorPosition))
// inconsistency in set and found composing text, better cancel composing (should be restarted automatically)
mWordComposer.reset();
}
/**