Skip to content

Update RichInputConnection.java #2492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
julmez wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update RichInputConnection.java #2492

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions app/src/main/java/helium314/keyboard/latin/RichInputConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,14 @@ public void endBatchEdit() {
if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug();
}


public void restartBatchEdit() {
if (mNestLevel == 1) {
endBatchEdit();
beginBatchEdit();
}
}

/**
* Reset the cached text and retrieve it again from the editor.
* <p>
Expand Down Expand Up @@ -475,19 +483,6 @@ public int getCharBeforeBeforeCursor() {
final long startTime = SystemClock.uptimeMillis();
final CharSequence result = mIC.getTextBeforeCursor(n, flags);
detectLaggyConnection(operation, timeout, startTime);

// only do the consistency check if we actually have text (i.e. we're not coming from some reload / reset)
if ((mCommittedTextBeforeComposingText.length() > 0 || mComposingText.length() > 0)
&& result != null && !checkTextBeforeCursorConsistency(result)) {
// inconsistent state can occur for (at least) two reasons
// 1. the app actively changes text field content, e.g. joplin when deleting list markers like "2."
// 2. the app has outdated contents in the text field, e.g. com.farmerbb.notepad returns the
// just deleted char right after deletion, instead of the correct one
// todo: understand where this inconsistent state comes from, is it really the other app's fault, or is it HeliBoard?
Log.w(TAG, "cached text out of sync, reloading");
reloadCursorPosition();
reloadTextCache();
}
return result;
}

Expand Down Expand Up @@ -859,6 +854,10 @@ public NgramContext getNgramContextFromNthPreviousWord(
if (!isConnected()) {
return null;
}
// In some editors, due to batch edit, we will receive stale information after having
// just performed an action (e.g. deleted text). Restarting batch edit will force
// the editor to process actions so far.
restartBatchEdit();
CharSequence before = getTextBeforeCursorAndDetectLaggyConnection(
OPERATION_GET_WORD_RANGE_AT_CURSOR,
SLOW_INPUT_CONNECTION_ON_PARTIAL_RELOAD_MS,
Expand Down