Skip to content

Fix Xiaomi TextInput crash: handling more manufacturers #30109

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

Closed
wants to merge 3 commits into from
Closed

Fix Xiaomi TextInput crash: handling more manufacturers #30109

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e0dd1e
Fix Xiaomi TextInput crash: handling more manufacturers
OlivierFreyssinet-old Oct 5, 2020
0dd9b42
Add(ReactEditText): missing import of Arrays
OlivierFreyssinet-old Oct 5, 2020
23d5ebb
Fix(ReactEditText.java): fix case for Xiaomi check
OlivierFreyssinet-old Oct 5, 2020
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
18 changes: 17 additions & 1 deletion ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import com.facebook.react.views.text.TextInlineImageSpan;
import com.facebook.react.views.view.ReactViewBackgroundManager;
import java.util.ArrayList;
import java.util.Arrays;

/**
* A wrapper around the EditText that lets us better control what happens when an EditText gets
Expand Down Expand Up @@ -393,9 +394,24 @@ public void setInputType(int type) {
// ScrollView, a prompt will be triggered but the system fail to locate it properly.
// Here is an example post discussing about this issue:
// https://github.com/facebook/react-native/issues/27204
String[] xiaomiManufacturers = new String[]{
"M2002J9G",
"M2002J9G",
"M2004J19C",
"M2007J20CG",
"Mi",
"MI",
"MIX",
"POCO",
"POCOPHONE",
"Redmi",
"Xiaomi"
};
boolean isXiaomi = Arrays.asList(xiaomiManufacturers).contains(Build.MANUFACTURER);

if (inputType == InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
&& Build.VERSION.SDK_INT == Build.VERSION_CODES.Q
&& Build.MANUFACTURER.startsWith("Xiaomi")) {
&& isXiaomi) {
inputType = InputType.TYPE_CLASS_TEXT;
}

Expand Down