openboard-team#484 send KeyEvents to IME instead of extras for each KeyEvent property

Author: sds100

app/src/main/java/io/github/sds100/keymapper/inputmethod/latin/LatinIME.java

@@ -16,7 +16,6 @@
 
 package io.github.sds100.keymapper.inputmethod.latin;
 
-import android.Manifest.permission;
 import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -138,10 +137,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
     private static final String KEY_MAPPER_INPUT_METHOD_ACTION_INPUT_UP = "io.github.sds100.keymapper.inputmethod.ACTION_INPUT_UP";
     private static final String KEY_MAPPER_INPUT_METHOD_ACTION_TEXT = "io.github.sds100.keymapper.inputmethod.ACTION_INPUT_TEXT";
 
-    private static final String KEY_MAPPER_INPUT_METHOD_EXTRA_KEYCODE = "io.github.sds100.keymapper.inputmethod.EXTRA_KEYCODE";
-    private static final String KEY_MAPPER_INPUT_METHOD_EXTRA_METASTATE = "io.github.sds100.keymapper.inputmethod.EXTRA_METASTATE";
     private static final String KEY_MAPPER_INPUT_METHOD_EXTRA_TEXT = "io.github.sds100.keymapper.inputmethod.EXTRA_TEXT";
-    private static final String KEY_MAPPER_INPUT_METHOD_EXTRA_DEVICE_ID = "io.github.sds100.keymapper.inputmethod.EXTRA_DEVICE_ID";
+    private static final String KEY_MAPPER_INPUT_METHOD_EXTRA_KEY_EVENT = "io.github.sds100.keymapper.inputmethod.EXTRA_KEY_EVENT";
 
     /**
      * The name of the scheme used by the Package Manager to warn of a new package installation,
@@ -216,22 +213,15 @@ public void onReceive(Context context, Intent intent) {
 
             switch (action) {
                 case LatinIME.KEY_MAPPER_INPUT_METHOD_ACTION_INPUT_DOWN_UP: {
-                    int keyCode = getKeyCode(intent);
-                    if (keyCode == -1) return;
-
-                    long eventTime = SystemClock.uptimeMillis();
-
-                    KeyEvent downEvent = new KeyEvent(eventTime, eventTime,
-                            KeyEvent.ACTION_DOWN, keyCode, 0, getMetaState(intent), getDeviceId(intent), 0);
+                    KeyEvent downEvent = intent.getParcelableExtra(KEY_MAPPER_INPUT_METHOD_EXTRA_KEY_EVENT);
 
                     InputConnection ic = mIms.getCurrentInputConnection();
 
                     if (ic != null) {
                         ic.sendKeyEvent(downEvent);
                     }
 
-                    KeyEvent upEvent = new KeyEvent(eventTime, SystemClock.uptimeMillis(),
-                            KeyEvent.ACTION_UP, keyCode, 0, getMetaState(intent), getDeviceId(intent), 0);
+                    KeyEvent upEvent = KeyEvent.changeAction(downEvent, KeyEvent.ACTION_UP);
 
                     if (ic != null) {
                         ic.sendKeyEvent(upEvent);
@@ -241,13 +231,9 @@ public void onReceive(Context context, Intent intent) {
                 }
 
                 case LatinIME.KEY_MAPPER_INPUT_METHOD_ACTION_INPUT_DOWN: {
-                    int keyCode = getKeyCode(intent);
-                    if (keyCode == -1) return;
-
-                    long eventTime = SystemClock.uptimeMillis();
+                    KeyEvent downEvent = intent.getParcelableExtra(KEY_MAPPER_INPUT_METHOD_EXTRA_KEY_EVENT);
 
-                    KeyEvent downEvent = new KeyEvent(eventTime, eventTime,
-                            KeyEvent.ACTION_DOWN, keyCode, 0, getMetaState(intent), getDeviceId(intent), 0);
+                    downEvent = KeyEvent.changeAction(downEvent, KeyEvent.ACTION_DOWN);
 
                     InputConnection ic = mIms.getCurrentInputConnection();
 
@@ -259,13 +245,9 @@ public void onReceive(Context context, Intent intent) {
                 }
 
                 case LatinIME.KEY_MAPPER_INPUT_METHOD_ACTION_INPUT_UP: {
-                    int keyCode = getKeyCode(intent);
-                    if (keyCode == -1) return;
+                    KeyEvent upEvent = intent.getParcelableExtra(KEY_MAPPER_INPUT_METHOD_EXTRA_KEY_EVENT);
 
-                    long eventTime = SystemClock.uptimeMillis();
-
-                    KeyEvent upEvent = new KeyEvent(eventTime, SystemClock.uptimeMillis(),
-                            KeyEvent.ACTION_UP, keyCode, 0, getMetaState(intent), getDeviceId(intent), 0);
+                    upEvent = KeyEvent.changeAction(upEvent, KeyEvent.ACTION_UP);
 
                     InputConnection ic = mIms.getCurrentInputConnection();
 
@@ -291,18 +273,6 @@ public void onReceive(Context context, Intent intent) {
                 }
             }
         }
-
-        private int getKeyCode(Intent intent) {
-            return intent.getIntExtra(KEY_MAPPER_INPUT_METHOD_EXTRA_KEYCODE, -1);
-        }
-
-        private int getMetaState(Intent intent) {
-            return intent.getIntExtra(KEY_MAPPER_INPUT_METHOD_EXTRA_METASTATE, 0);
-        }
-
-        private int getDeviceId(Intent intent){
-            return intent.getIntExtra(KEY_MAPPER_INPUT_METHOD_EXTRA_DEVICE_ID, 0);
-        }
     }
 
     final KeyMapperBroadcastReceiver mKeyMapperBroadcastReceiver = new KeyMapperBroadcastReceiver(this);
@@ -1479,8 +1449,7 @@ public void onMovePointer(int steps) {
         if (steps < 0) {
             int availableCharacters = mInputLogic.mConnection.getTextBeforeCursor(64, 0).length();
             steps = availableCharacters < -steps ? -availableCharacters : steps;
-        }
-        else if (steps > 0) {
+        } else if (steps > 0) {
             int availableCharacters = mInputLogic.mConnection.getTextAfterCursor(64, 0).length();
             steps = Math.min(availableCharacters, steps);
         } else