Переглянути джерело

Merge pull request #75991 from jasonwinterpixel/bugfix/null-characters-android

Fix potential null in android text entry system.
Rémi Verschelde 2 роки тому
батько
коміт
3e37f23ef2

+ 6 - 5
platform/android/java/lib/src/org/godotengine/godot/input/GodotTextInputWrapper.java

@@ -124,11 +124,12 @@ public class GodotTextInputWrapper implements TextWatcher, OnEditorActionListene
 	public boolean onEditorAction(final TextView pTextView, final int pActionID, final KeyEvent pKeyEvent) {
 		if (mEdit == pTextView && isFullScreenEdit() && pKeyEvent != null) {
 			final String characters = pKeyEvent.getCharacters();
-
-			for (int i = 0; i < characters.length(); i++) {
-				final int character = characters.codePointAt(i);
-				GodotLib.key(0, character, 0, true);
-				GodotLib.key(0, character, 0, false);
+			if (characters != null) {
+				for (int i = 0; i < characters.length(); i++) {
+					final int character = characters.codePointAt(i);
+					GodotLib.key(0, character, 0, true);
+					GodotLib.key(0, character, 0, false);
+				}
 			}
 		}