Merge branch 'develop' into copilot/modify-system-settings-permission

Author: sds100

app/version.properties

@@ -1,3 +1,3 @@
-VERSION_NAME=4.0.0-beta.2
-VERSION_CODE=187
+VERSION_NAME=4.0.0-beta.3
+VERSION_CODE=189
 VERSION_NUM=01

base/src/main/java/io/github/sds100/keymapper/base/backup/BackupManager.kt

@@ -780,6 +780,7 @@ class BackupManagerImpl @Inject constructor(
     private fun getSoundUidsToBackup(keyMapList: List<KeyMapEntity>): Set<String> {
         val soundActions = keyMapList
             .flatMap { it.actionList }
+            .filterNotNull()
             .filter { it.type == ActionEntity.Type.SOUND }
 
         return soundActions

base/src/main/java/io/github/sds100/keymapper/base/input/InputEventHub.kt

@@ -343,7 +343,7 @@ class InputEventHubImpl @Inject constructor(
             val androidKeyEvent = event.toAndroidKeyEvent(flags = KeyEvent.FLAG_FROM_SYSTEM)
 
             if (logInputEventsEnabled.value) {
-                Timber.d("Injecting key event $androidKeyEvent with system bridge")
+                Timber.d("Injecting key event with system bridge $androidKeyEvent")
             }
 
             return withContext(Dispatchers.IO) {

base/src/main/java/io/github/sds100/keymapper/base/keymaps/KeyMap.kt

@@ -112,7 +112,9 @@ object KeyMapEntityMapper {
         entity: KeyMapEntity,
         floatingButtons: List<FloatingButtonEntityWithLayout>,
     ): KeyMap {
-        val actionList = entity.actionList.mapNotNull { ActionEntityMapper.fromEntity(it) }
+        val actionList = entity.actionList
+            .filterNotNull()
+            .mapNotNull { ActionEntityMapper.fromEntity(it) }
 
         val constraintList =
             entity.constraintList.map { ConstraintEntityMapper.fromEntity(it) }.toSet()

data/src/main/java/io/github/sds100/keymapper/data/db/typeconverter/ActionListTypeConverter.kt

@@ -5,16 +5,15 @@ import com.github.salomonbrys.kotson.fromJson
 import com.github.salomonbrys.kotson.registerTypeAdapter
 import com.google.gson.GsonBuilder
 import io.github.sds100.keymapper.data.entities.ActionEntity
-import io.github.sds100.keymapper.data.entities.ConstraintEntity
 
 class ActionListTypeConverter {
-    private val gson = GsonBuilder().registerTypeAdapter(ConstraintEntity.DESERIALIZER).create()
+    private val gson = GsonBuilder().registerTypeAdapter(ActionEntity.DESERIALIZER).create()
 
     @TypeConverter
-    fun toActionList(json: String): List<ActionEntity> {
-        return gson.fromJson<MutableList<ActionEntity>>(json)
+    fun toActionList(json: String): List<ActionEntity?> {
+        return gson.fromJson<MutableList<ActionEntity?>>(json)
     }
 
     @TypeConverter
-    fun toJsonString(actionList: List<ActionEntity>): String = gson.toJson(actionList)!!
+    fun toJsonString(actionList: List<ActionEntity?>): String = gson.toJson(actionList)!!
 }

data/src/main/java/io/github/sds100/keymapper/data/entities/ActionEntity.kt

@@ -144,8 +144,18 @@ data class ActionEntity(
         const val EXTRA_SETTING_TYPE = "extra_setting_type"
 
         val DESERIALIZER = jsonDeserializer {
-            val typeString by it.json.byString(NAME_ACTION_TYPE)
-            val type = Type.valueOf(typeString)
+            val typeString by it.json.byNullableString(NAME_ACTION_TYPE)
+            // If it is an unknown type then do not deserialize
+            if (typeString == null) {
+                return@jsonDeserializer null
+            }
+
+            val type: Type = try {
+                Type.valueOf(typeString!!)
+            } catch (e: IllegalArgumentException) {
+                // If it is an unknown type then do not deserialize
+                return@jsonDeserializer null
+            }
 
             val data by it.json.byString(NAME_DATA)
 

data/src/main/java/io/github/sds100/keymapper/data/entities/FingerprintMapEntity.kt

@@ -17,9 +17,12 @@ data class FingerprintMapEntity(
     @PrimaryKey
     val id: Int = ID_UNKNOWN,
 
+    /**
+     * The action can be null if it wasn't deserialized successfully.
+     */
     @SerializedName(NAME_ACTION_LIST)
     @ColumnInfo(name = FingerprintMapDao.KEY_ACTION_LIST)
-    val actionList: List<ActionEntity> = listOf(),
+    val actionList: List<ActionEntity?> = listOf(),
 
     @SerializedName(NAME_CONSTRAINTS)
     @ColumnInfo(name = FingerprintMapDao.KEY_CONSTRAINT_LIST)
@@ -63,7 +66,7 @@ data class FingerprintMapEntity(
             val id by it.json.byNullableInt(NAME_ID)
 
             val actionListJson by it.json.byArray(NAME_ACTION_LIST)
-            val actionList = it.context.deserialize<List<ActionEntity>>(actionListJson)
+            val actionList = it.context.deserialize<List<ActionEntity?>>(actionListJson)
 
             val extrasJson by it.json.byArray(NAME_EXTRAS)
             val extras = it.context.deserialize<List<EntityExtra>>(extrasJson)

data/src/main/java/io/github/sds100/keymapper/data/entities/KeyMapEntity.kt

@@ -41,9 +41,12 @@ data class KeyMapEntity(
     @ColumnInfo(name = KeyMapDao.KEY_TRIGGER)
     val trigger: TriggerEntity = TriggerEntity(),
 
+    /**
+     * The action can be null if it wasn't deserialized successfully.
+     */
     @SerializedName(NAME_ACTION_LIST)
     @ColumnInfo(name = KeyMapDao.KEY_ACTION_LIST)
-    val actionList: List<ActionEntity> = listOf(),
+    val actionList: List<ActionEntity?> = listOf(),
 
     @SerializedName(NAME_CONSTRAINT_LIST)
     @ColumnInfo(name = KeyMapDao.KEY_CONSTRAINT_LIST)
@@ -87,7 +90,7 @@ data class KeyMapEntity(
 
         val DESERIALIZER = jsonDeserializer {
             val actionListJsonArray by it.json.byArray(NAME_ACTION_LIST)
-            val actionList = it.context.deserialize<List<ActionEntity>>(actionListJsonArray)
+            val actionList = it.context.deserialize<List<ActionEntity?>>(actionListJsonArray)
 
             val triggerJsonObject by it.json.byObject(NAME_TRIGGER)
             val trigger = it.context.deserialize<TriggerEntity>(triggerJsonObject)