[TextInputLayout] Fix IndexOutOfBoundsException when trying to change…

… end icon Resolves #1788 Resolves #1724 Resolves #1748 PiperOrigin-RevId: 345541684 (cherry picked from commit dd0e697)
material-components · Dec 15, 2020 · 963ad14 · 963ad14
1 parent 291486c
commit 963ad14
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/lib/java/com/google/android/material/textfield/ClearTextEndIconDelegate.java b/lib/java/com/google/android/material/textfield/ClearTextEndIconDelegate.java
@@ -84,10 +84,16 @@ public void onEditTextAttached(@NonNull TextInputLayout textInputLayout) {
       new OnEndIconChangedListener() {
         @Override
         public void onEndIconChanged(@NonNull TextInputLayout textInputLayout, int previousIcon) {
-          EditText editText = textInputLayout.getEditText();
+          final EditText editText = textInputLayout.getEditText();
           if (editText != null && previousIcon == TextInputLayout.END_ICON_CLEAR_TEXT) {
             // Remove any listeners set on the edit text.
-            editText.removeTextChangedListener(clearTextEndIconTextWatcher);
+            editText.post(
+                new Runnable() {
+                  @Override
+                  public void run() {
+                    editText.removeTextChangedListener(clearTextEndIconTextWatcher);
+                  }
+                });
             if (editText.getOnFocusChangeListener() == onFocusChangeListener) {
               editText.setOnFocusChangeListener(null);
             }

diff --git a/lib/java/com/google/android/material/textfield/DropdownMenuEndIconDelegate.java b/lib/java/com/google/android/material/textfield/DropdownMenuEndIconDelegate.java
@@ -160,16 +160,24 @@ public void onEditTextAttached(@NonNull TextInputLayout textInputLayout) {
           textInputLayout.setEndIconVisible(true);
         }
       };
+
   @SuppressLint("ClickableViewAccessibility") // There's an accessibility delegate that handles
   // interactions with the dropdown menu.
   private final OnEndIconChangedListener endIconChangedListener =
       new OnEndIconChangedListener() {
         @Override
         public void onEndIconChanged(@NonNull TextInputLayout textInputLayout, int previousIcon) {
-          AutoCompleteTextView editText = (AutoCompleteTextView) textInputLayout.getEditText();
+          final AutoCompleteTextView editText =
+              (AutoCompleteTextView) textInputLayout.getEditText();
           if (editText != null && previousIcon == TextInputLayout.END_ICON_DROPDOWN_MENU) {
             // Remove any listeners set on the edit text.
-            editText.removeTextChangedListener(exposedDropdownEndIconTextWatcher);
+            editText.post(
+                new Runnable() {
+                  @Override
+                  public void run() {
+                    editText.removeTextChangedListener(exposedDropdownEndIconTextWatcher);
+                  }
+                });
             if (editText.getOnFocusChangeListener() == onFocusChangeListener) {
               editText.setOnFocusChangeListener(null);
             }

diff --git a/lib/java/com/google/android/material/textfield/PasswordToggleEndIconDelegate.java b/lib/java/com/google/android/material/textfield/PasswordToggleEndIconDelegate.java
@@ -60,13 +60,19 @@ public void onEditTextAttached(@NonNull TextInputLayout textInputLayout) {
       new OnEndIconChangedListener() {
         @Override
         public void onEndIconChanged(@NonNull TextInputLayout textInputLayout, int previousIcon) {
-          EditText editText = textInputLayout.getEditText();
+          final EditText editText = textInputLayout.getEditText();
           if (editText != null && previousIcon == TextInputLayout.END_ICON_PASSWORD_TOGGLE) {
             // If the end icon was the password toggle add it back the PasswordTransformation
             // in case it might have been removed to make the password visible.
             editText.setTransformationMethod(PasswordTransformationMethod.getInstance());
             // Remove any listeners set on the edit text.
-            editText.removeTextChangedListener(textWatcher);
+            editText.post(
+                new Runnable() {
+                  @Override
+                  public void run() {
+                    editText.removeTextChangedListener(textWatcher);
+                  }
+                });
           }
         }
       };