fix(input): preserve sTimerProxy and sListener across trimMemory and revert input logic regressions

Author: LeanBitLab

app/src/main/java/helium314/keyboard/keyboard/PointerTracker.java

@@ -88,24 +88,22 @@ public PointerTrackerParams(final TypedArray mainKeyboardViewAttr) {
     public static void clearOldViewData() {
         sProxyMap.clear();
         sDrawingProxy = null;
-        sTimerProxy = TimerProxy.NULL;
-        sListener = KeyboardActionListener.EMPTY_LISTENER;
+        // Don't clear sTimerProxy or sListener here.
+        // The MainKeyboardView (and its TimerHandler + ActionListener)
+        // survives trimMemory(). These are only properly re-initialized
+        // by init() and setKeyboardActionListener() during onCreateInputView().
     }
 
     public static void switchTo(DrawingProxy drawingProxy) {
         if (drawingProxy == null) return;
         sDrawingProxy = drawingProxy;
         final Object[] thatArray = sProxyMap.get(drawingProxy);
-        if (thatArray == null) {
-            sTimerProxy = TimerProxy.NULL;
-            return;
-        }
+        if (thatArray == null) return;
         sParams = (PointerTrackerParams) thatArray[0];
         sGestureStrokeRecognitionParams = (GestureStrokeRecognitionParams) thatArray[1];
         sGestureStrokeDrawingParams = (GestureStrokeDrawingParams) thatArray[2];
         sTypingTimeRecorder = (TypingTimeRecorder) thatArray[3];
-        final TimerProxy timerProxy = (TimerProxy) thatArray[4];
-        sTimerProxy = timerProxy != null ? timerProxy : TimerProxy.NULL;
+        sTimerProxy = (TimerProxy) thatArray[4];
         // noinspection unchecked
         sTrackers = (ArrayList<PointerTracker>) thatArray[5];
     }

app/src/main/java/helium314/keyboard/latin/RichInputConnection.java

@@ -173,11 +173,6 @@ public boolean hasSlowInputConnection() {
 
     public void onStartInput() {
         mLastSlowInputConnectionTime = -SLOW_INPUTCONNECTION_PERSIST_MS;
-        mIC = mParent.getCurrentInputConnection();
-    }
-
-    public void onFinishInput() {
-        mIC = null;
     }
 
     private void checkConsistencyForDebug() {
@@ -379,11 +374,13 @@ public void commitText(final CharSequence text, final int newCursorPosition) {
         if (DebugFlags.DEBUG_ENABLED)
             Log.d(TAG, "committing " + text.length() + " characters");
         mCommittedTextBeforeComposingText.append(text);
-        if (mExpectedSelStart == INVALID_CURSOR_POSITION) {
-            mExpectedSelStart = text.length();
-        } else {
-            mExpectedSelStart += text.length() - mComposingText.length();
-        }
+        // TODO: the following is exceedingly error-prone. Right now when the cursor is
+        // in the
+        // middle of the composing word mComposingText only holds the part of the
+        // composing text
+        // that is before the cursor, so this actually works, but it's terribly
+        // confusing. Fix this.
+        mExpectedSelStart += text.length() - mComposingText.length();
         mExpectedSelEnd = mExpectedSelStart;
         mComposingText.setLength(0);
         if (isConnected()) {
@@ -395,6 +392,10 @@ public void commitText(final CharSequence text, final int newCursorPosition) {
                 final int spanStart = mTempObjectForCommitText.getSpanStart(span);
                 final int spanEnd = mTempObjectForCommitText.getSpanEnd(span);
                 final int spanFlags = mTempObjectForCommitText.getSpanFlags(span);
+                // We have to adjust the end of the span to include an additional character.
+                // This is to avoid splitting a unicode surrogate pair.
+                // See helium314.keyboard.latin.common.Constants.UnicodeSurrogate
+                // See https://b.corp.google.com/issues/19255233
                 if (0 < spanEnd && spanEnd < mTempObjectForCommitText.length()) {
                     final char spanEndChar = mTempObjectForCommitText.charAt(spanEnd - 1);
                     final char nextChar = mTempObjectForCommitText.charAt(spanEnd);
@@ -404,8 +405,7 @@ public void commitText(final CharSequence text, final int newCursorPosition) {
                     }
                 }
             }
-            final CharSequence textToCommit = spans.length > 0 ? mTempObjectForCommitText : text.toString();
-            mIC.commitText(textToCommit, newCursorPosition);
+            mIC.commitText(mTempObjectForCommitText, newCursorPosition);
         }
     }
 
@@ -867,11 +867,7 @@ public boolean setComposingText(final CharSequence text, final int newCursorPosi
             checkBatchEdit();
         if (DEBUG_PREVIOUS_TEXT)
             checkConsistencyForDebug();
-        if (mExpectedSelStart == INVALID_CURSOR_POSITION) {
-            mExpectedSelStart = text.length();
-        } else {
-            mExpectedSelStart += text.length() - mComposingText.length();
-        }
+        mExpectedSelStart += text.length() - mComposingText.length();
         mExpectedSelEnd = mExpectedSelStart;
         mComposingText.setLength(0);
         mComposingText.append(text);

app/src/main/java/helium314/keyboard/latin/inputlogic/InputLogic.java

@@ -252,7 +252,6 @@ public void finishInput() {
         resetComposingState(true);
         mInputLogicHandler.reset();
         mSpaceState = SpaceState.NONE;
-        mConnection.onFinishInput();
     }
 
     /**