Fix secure TextInput same-text updates on Android

Author: sorinc03

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt

@@ -22,6 +22,7 @@ import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.text.Spanned
 import android.text.TextPaint
+import android.text.TextUtils
 import android.text.TextWatcher
 import android.text.method.KeyListener
 import android.text.method.QwertyKeyListener
@@ -648,7 +649,7 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
   public fun canUpdateWithEventCount(eventCounter: Int): Boolean = eventCounter >= nativeEventCount
 
   private fun maybeSetText(reactTextUpdate: ReactTextUpdate) {
-    if (isSecureText && (text == reactTextUpdate.text)) {
+    if (isSecureText && TextUtils.equals(text, reactTextUpdate.text)) {
       return
     }
 

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt

@@ -17,6 +17,8 @@ import android.text.InputFilter
 import android.text.InputFilter.AllCaps
 import android.text.InputType
 import android.text.Layout
+import android.text.SpannableString
+import android.text.Spanned
 import android.util.DisplayMetrics
 import android.view.Gravity
 import android.view.View
@@ -32,6 +34,7 @@ import com.facebook.react.uimanager.DisplayMetricsHolder
 import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.views.text.DefaultStyleValuesUtil.getDefaultTextColorHint
+import com.facebook.react.views.text.ReactTextUpdate
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Test
@@ -481,7 +484,34 @@ class ReactTextInputPropertyTest {
     assertThat(view.filters).isEqualTo(filters)
   }
 
+  @Test
+  fun testSecureTextDoesNotReplaceSameTextFromJS() {
+    val markerSpan = MarkerSpan()
+    val textUpdate =
+        SpannableString("secret").apply {
+          setSpan(markerSpan, 0, length, Spanned.SPAN_INCLUSIVE_INCLUSIVE)
+        }
+
+    manager.updateProperties(view, buildStyles("secureTextEntry", true))
+    view.setText("secret")
+
+    view.maybeSetTextFromJS(
+        ReactTextUpdate(
+            textUpdate,
+            0,
+            view.gravity and Gravity.HORIZONTAL_GRAVITY_MASK,
+            Layout.BREAK_STRATEGY_HIGH_QUALITY,
+            0,
+        )
+    )
+
+    assertThat(checkNotNull(view.text).getSpans(0, view.length(), MarkerSpan::class.java))
+        .isEmpty()
+  }
+
   private fun buildStyles(vararg keysAndValues: Any?): ReactStylesDiffMap {
     return ReactStylesDiffMap(JavaOnlyMap.of(*keysAndValues))
   }
+
+  private class MarkerSpan
 }