#1461 fix: crash on startup due to getting MotionEvent device

Author: sds100

app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/detection/DpadMotionEventTracker.kt

@@ -1,6 +1,7 @@
 package io.github.sds100.keymapper.mappings.keymaps.detection
 
 import android.view.KeyEvent
+import io.github.sds100.keymapper.system.devices.InputDeviceInfo
 import io.github.sds100.keymapper.system.inputevents.InputEventUtils
 import io.github.sds100.keymapper.system.inputevents.MyKeyEvent
 import io.github.sds100.keymapper.system.inputevents.MyMotionEvent
@@ -62,11 +63,11 @@ class DpadMotionEventTracker {
      * @return An array of key events. Empty if no DPAD buttons changed.
      */
     fun convertMotionEvent(event: MyMotionEvent): List<MyKeyEvent> {
-        val oldState = dpadState[event.device.descriptor] ?: 0
+        val oldState = dpadState[event.device.getDescriptor()] ?: 0
         val newState = eventToDpadState(event)
         val diff = oldState xor newState
 
-        dpadState[event.device.descriptor] = newState
+        dpadState[event.device.getDescriptor()] = newState
 
         // If no dpad keys changed then return null
         if (diff == 0) {
@@ -114,6 +115,10 @@ class DpadMotionEventTracker {
         dpadState.clear()
     }
 
+    private fun InputDeviceInfo?.getDescriptor(): String {
+        return this?.descriptor ?: ""
+    }
+
     private fun eventToDpadState(event: MyMotionEvent): Int {
         var state = 0
 

app/src/main/java/io/github/sds100/keymapper/system/accessibility/MyAccessibilityService.kt

@@ -111,11 +111,7 @@ class MyAccessibilityService :
             override fun onKeyEvent(event: KeyEvent?): Boolean {
                 event ?: return false
 
-                val device = if (event.device == null) {
-                    null
-                } else {
-                    InputDeviceUtils.createInputDeviceInfo(event.device)
-                }
+                val device = event.device?.let { InputDeviceUtils.createInputDeviceInfo(it) }
 
                 if (controller != null) {
                     return controller!!.onKeyEventFromIme(

app/src/main/java/io/github/sds100/keymapper/system/inputevents/MyMotionEvent.kt

@@ -10,7 +10,7 @@ import io.github.sds100.keymapper.system.devices.InputDeviceUtils
  */
 data class MyMotionEvent(
     val metaState: Int,
-    val device: InputDeviceInfo,
+    val device: InputDeviceInfo?,
     val axisHatX: Float,
     val axisHatY: Float,
     val isDpad: Boolean,
@@ -19,7 +19,7 @@ data class MyMotionEvent(
         fun fromMotionEvent(event: MotionEvent): MyMotionEvent {
             return MyMotionEvent(
                 metaState = event.metaState,
-                device = InputDeviceUtils.createInputDeviceInfo(event.device),
+                device = event.device?.let { InputDeviceUtils.createInputDeviceInfo(it) },
                 axisHatX = event.getAxisValue(MotionEvent.AXIS_HAT_X),
                 axisHatY = event.getAxisValue(MotionEvent.AXIS_HAT_Y),
                 isDpad = InputEventUtils.isDpadDevice(event),