[[ Bug 18395 ]] Handle return correctly in fileds on Android

montegoulding · montegoulding · commit 9c388a56a4a0 · 2018-08-01T14:18:31.000+10:00
This patch ensures that all key events are routed through `handleKey` in order
to ensure that special key events like return are translated correctly and we
only have one code path to send a key event to the engine.
diff --git a/docs/notes/bugfix-18395.md b/docs/notes/bugfix-18395.md
@@ -0,0 +1 @@
+# Fix return key event handling in fields on Android
diff --git a/engine/src/java/com/runrev/android/Engine.java b/engine/src/java/com/runrev/android/Engine.java
@@ -502,12 +502,12 @@ else if (key.getAction() == KeyEvent.ACTION_MULTIPLE)
 					// IM-2013-02-21: [[ BZ 10684 ]]
 					// allow BaseInputConnection to do the handling of commitText(), etc
 					// and instead catch the raw key events that are generated.
-					if (key.getKeyCode() == KeyEvent.KEYCODE_UNKNOWN)
+					if (t_key_code == KeyEvent.KEYCODE_UNKNOWN)
 					{
 						// handle string of chars
 						CharSequence t_chars = key.getCharacters();
 						for (int i = 0; i < t_chars.length(); i++)
-							doKeyPress(0, t_chars.charAt(i), 0);
+							handleKey(t_key_code, t_chars.charAt(i));
 					}
 					else
 					{
@@ -548,10 +548,10 @@ void updateComposingText(CharSequence p_new)
 				
 				// send backspaces
 				for (int i = 0; i < t_current_length - t_match_length; i++)
-					doKeyPress(0, 0, 0xff08);
+					handleKey(KeyEvent.KEYCODE_DEL, 0);
 				// send new text
 				for (int i = t_match_length; i < t_new_length; i++)
-					doKeyPress(0, p_new.charAt(i), 0);
+					handleKey(KeyEvent.KEYCODE_UNKNOWN, p_new.charAt(i));
 				
 				m_composing_text = p_new;
 				

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix return key event handling in fields on Android`