Apply operations to text cache in memory (#480)

Author: rkkr

app/src/main/java/rkr/simplekeyboard/inputmethod/latin/LatinIME.java

@@ -22,7 +22,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.content.SharedPreferences;
 import android.inputmethodservice.InputMethodService;
 import android.media.AudioManager;
@@ -47,7 +46,6 @@
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
-import rkr.simplekeyboard.inputmethod.R;
 import rkr.simplekeyboard.inputmethod.compat.EditorInfoCompatUtils;
 import rkr.simplekeyboard.inputmethod.compat.PreferenceManagerCompat;
 import rkr.simplekeyboard.inputmethod.compat.ViewOutlineProviderCompatUtils;
@@ -872,14 +870,6 @@ public void launchSettings() {
         startActivity(intent);
     }
 
-    public void debugDumpStateAndCrashWithException(final String context) {
-        final SettingsValues settingsValues = mSettings.getCurrent();
-        final StringBuilder s = new StringBuilder(settingsValues.toString());
-        s.append("\nAttributes : ").append(settingsValues.mInputAttributes)
-                .append("\nContext : ").append(context);
-        throw new RuntimeException(s.toString());
-    }
-
     @Override
     protected void dump(final FileDescriptor fd, final PrintWriter fout, final String[] args) {
         super.dump(fd, fout, args);

app/src/main/java/rkr/simplekeyboard/inputmethod/latin/RichInputConnection.java

@@ -16,10 +16,7 @@
 
 package rkr.simplekeyboard.inputmethod.latin;
 
-import android.inputmethodservice.InputMethodService;
 import android.os.Build;
-import android.os.SystemClock;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.inputmethod.InputConnection;
@@ -269,6 +266,22 @@ public CharSequence getTextAfterCursor(final int n) {
     }
 
     public void replaceText(final int startPosition, final int endPosition, CharSequence text) {
+        if (mExpectedSelStart != mExpectedSelEnd) {
+            Log.e(TAG, "replaceText called with text range selected");
+            return;
+        }
+        if (mExpectedSelStart != startPosition) {
+            Log.e(TAG, "replaceText called with range not starting with current cursor position");
+            return;
+        }
+
+        final String textAfterCursor = mTextAfterCursor;
+        if (textAfterCursor.length() < endPosition - startPosition) {
+            Log.e(TAG, "replaceText called with range longer than current text");
+            return;
+        }
+        mTextAfterCursor = text + textAfterCursor.substring(endPosition - startPosition);
+
         RichInputMethodManager.getInstance().resetSubtypeCycleOrder();
         mIC.setComposingRegion(startPosition, endPosition);
         mIC.setComposingText(text, startPosition);
@@ -300,15 +313,19 @@ public void sendKeyEvent(final KeyEvent keyEvent) {
                 }
                 break;
             case KeyEvent.KEYCODE_DEL:
-                if (!mTextBeforeCursor.isEmpty()) {
-                    mTextBeforeCursor = mTextBeforeCursor.substring(0, mTextBeforeCursor.length() - 1);
-                }
-
-                if (mExpectedSelStart > 0 && mExpectedSelStart == mExpectedSelEnd) {
-                    // TODO: Handle surrogate pairs.
-                    mExpectedSelStart -= 1;
+                if (hasSelection()) {
+                    mTextSelection = "";
+                    mExpectedSelEnd = mExpectedSelStart;
+                } else {
+                    final int steps = getUnicodeSteps(-1, false);
+                    String textBeforeCursor = mTextBeforeCursor;
+                    if (!textBeforeCursor.isEmpty()) {
+                        mTextBeforeCursor = textBeforeCursor.substring(0, textBeforeCursor.length() + steps);
+                    }
+                    if (mExpectedSelStart > 0) {
+                        mExpectedSelStart += steps;
+                    }
                 }
-                mExpectedSelEnd = mExpectedSelStart;
                 break;
             case KeyEvent.KEYCODE_UNKNOWN:
                 if (null != keyEvent.getCharacters()) {
@@ -341,7 +358,6 @@ public void sendKeyEvent(final KeyEvent keyEvent) {
      *
      * @param start the character index where the selection should start.
      * @param end the character index where the selection should end.
-     * @return Returns true on success, false on failure: either the input connection is no longer
      * valid when setting the selection or when retrieving the text cache at that point, or
      * invalid arguments were passed.
      */
@@ -354,15 +370,17 @@ public void setSelection(int start, int end) {
         }
         RichInputMethodManager.getInstance().resetSubtypeCycleOrder();
 
+        final int textStart = mExpectedSelStart - mTextBeforeCursor.length();
+        final String textRange = mTextBeforeCursor + mTextSelection + mTextAfterCursor;
+        mTextBeforeCursor = textRange.substring(0, start - textStart);
+        mTextSelection = textRange.substring(start - textStart, end - textStart);
+        mTextAfterCursor = textRange.substring(end - textStart);
+
         mExpectedSelStart = start;
         mExpectedSelEnd = end;
         if (isConnected()) {
-            final boolean isIcValid = mIC.setSelection(start, end);
-            if (!isIcValid) {
-                return;
-            }
+            mIC.setSelection(start, end);
         }
-        reloadTextCache();
     }
 
     public int getExpectedSelectionStart() {
@@ -393,24 +411,26 @@ public int getUnicodeSteps(int chars, boolean rightSidePointer) {
             CharSequence charsBeforeCursor = rightSidePointer && hasSelection() ?
                     getSelectedText() :
                     getTextBeforeCursor(-chars * 2);
-            if (charsBeforeCursor != null) {
-                for (int i = charsBeforeCursor.length() - 1; i >= 0 && chars < 0; i--, chars++, steps--) {
-                    if (Character.isSurrogate(charsBeforeCursor.charAt(i))) {
-                        steps--;
-                        i--;
-                    }
+            if (charsBeforeCursor == null || charsBeforeCursor == "") {
+                return chars;
+            }
+            for (int i = charsBeforeCursor.length() - 1; i >= 0 && chars < 0; i--, chars++, steps--) {
+                if (Character.isSurrogate(charsBeforeCursor.charAt(i))) {
+                    steps--;
+                    i--;
                 }
             }
         } else if (chars > 0) {
             CharSequence charsAfterCursor = !rightSidePointer && hasSelection() ?
                     getSelectedText() :
                     getTextAfterCursor(chars * 2);
-            if (charsAfterCursor != null) {
-                for (int i = 0; i < charsAfterCursor.length() && chars > 0; i++, chars--, steps++) {
-                    if (Character.isSurrogate(charsAfterCursor.charAt(i))) {
-                        steps++;
-                        i++;
-                    }
+            if (charsAfterCursor == null || charsAfterCursor == "") {
+                return chars;
+            }
+            for (int i = 0; i < charsAfterCursor.length() && chars > 0; i++, chars--, steps++) {
+                if (Character.isSurrogate(charsAfterCursor.charAt(i))) {
+                    steps++;
+                    i++;
                 }
             }
         }

app/src/main/java/rkr/simplekeyboard/inputmethod/latin/RichInputMethodManager.java

@@ -172,18 +172,6 @@ public void notifySubtypeChanged() {
             }
         }
 
-        /**
-         * Get all of the enabled languages.
-         * @return the enabled languages.
-         */
-        public synchronized Set<Locale> getAllLocales() {
-            final Set<Locale> locales = new HashSet<>();
-            for (final Subtype subtype: mSubtypes) {
-                locales.add(subtype.getLocaleObject());
-            }
-            return locales;
-        }
-
         /**
          * Get all of the enabled subtypes for language.
          * @param locale filter by Locale.

app/src/main/java/rkr/simplekeyboard/inputmethod/latin/common/StringUtils.java

@@ -18,13 +18,10 @@
 
 import android.text.TextUtils;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Locale;
 
 public final class StringUtils {
-    private static final String EMPTY_STRING = "";
-
     private StringUtils() {
         // This utility class is not publicly instantiable.
     }

app/src/main/java/rkr/simplekeyboard/inputmethod/latin/common/UnicodeSurrogate.java

@@ -10,7 +10,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files