#661 refactor shell adapters to return a ShellResult class and tweak the ShellCommandActionScreen

Author: sds100

base/src/main/java/io/github/sds100/keymapper/base/actions/ActionData.kt

@@ -937,13 +937,13 @@ sealed class ActionData : Comparable<ActionData> {
         val description: String,
         val command: String,
         val useRoot: Boolean,
-        val timeoutMs: Int = 10000, // milliseconds (default 10 seconds)
+        val timeoutMillis: Int = 10000, // milliseconds (default 10 seconds)
     ) : ActionData() {
         override val id: ActionId = ActionId.SHELL_COMMAND
 
         override fun toString(): String {
             // Do not leak sensitive command info to logs.
-            return "ShellCommand(description=$description, useRoot=$useRoot, timeoutMs=$timeoutMs)"
+            return "ShellCommand(description=$description, useRoot=$useRoot, timeoutMs=$timeoutMillis)"
         }
     }
 

base/src/main/java/io/github/sds100/keymapper/base/actions/ActionDataEntityMapper.kt

@@ -674,7 +674,7 @@ object ActionDataEntityMapper {
                     description = description,
                     command = command,
                     useRoot = useRoot,
-                    timeoutMs = timeoutMs,
+                    timeoutMillis = timeoutMs,
                 )
             }
 
@@ -1026,7 +1026,7 @@ object ActionDataEntityMapper {
 
         is ActionData.ShellCommand -> listOf(
             EntityExtra(ActionEntity.EXTRA_SHELL_COMMAND_DESCRIPTION, data.description),
-            EntityExtra(ActionEntity.EXTRA_SHELL_COMMAND_TIMEOUT, data.timeoutMs.toString()),
+            EntityExtra(ActionEntity.EXTRA_SHELL_COMMAND_TIMEOUT, data.timeoutMillis.toString()),
         )
 
         else -> emptyList()

base/src/main/java/io/github/sds100/keymapper/base/actions/ConfigShellCommandViewModel.kt

@@ -32,7 +32,7 @@ class ConfigShellCommandViewModel @Inject constructor(
             description = action.description,
             command = action.command,
             useRoot = action.useRoot,
-            timeoutSeconds = action.timeoutMs / 1000,
+            timeoutSeconds = action.timeoutMillis / 1000,
         )
     }
 
@@ -53,7 +53,6 @@ class ConfigShellCommandViewModel @Inject constructor(
     }
 
     fun onTestClick() {
-        // Cancel any existing test
         testJob?.cancel()
 
         state = state.copy(
@@ -102,7 +101,7 @@ class ConfigShellCommandViewModel @Inject constructor(
             description = state.description,
             command = state.command,
             useRoot = state.useRoot,
-            timeoutMs = state.timeoutSeconds * 1000,
+            timeoutMillis = state.timeoutSeconds * 1000,
         )
 
         viewModelScope.launch {

base/src/main/java/io/github/sds100/keymapper/base/actions/ExecuteShellCommandUseCase.kt

@@ -4,6 +4,7 @@ import io.github.sds100.keymapper.common.utils.KMError
 import io.github.sds100.keymapper.common.utils.KMResult
 import io.github.sds100.keymapper.system.root.SuAdapter
 import io.github.sds100.keymapper.system.shell.ShellAdapter
+import io.github.sds100.keymapper.system.shell.ShellResult
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.withTimeout
@@ -16,25 +17,25 @@ class ExecuteShellCommandUseCase @Inject constructor(
     suspend fun execute(
         command: String,
         useRoot: Boolean,
-        timeoutMs: Long,
+        timeoutMillis: Long,
     ): KMResult<Unit> {
         return try {
-            withTimeout(timeoutMs) {
+            withTimeout(timeoutMillis) {
                 if (useRoot) {
                     suAdapter.execute(command)
                 } else {
                     shellAdapter.execute(command)
                 }
             }
         } catch (e: TimeoutCancellationException) {
-            KMError.ShellCommandTimeout(timeoutMs.toInt())
+            KMError.ShellCommandTimeout(timeoutMillis.toInt())
         }
     }
 
     fun executeWithStreamingOutput(
         command: String,
         useRoot: Boolean,
-    ): Flow<KMResult<String>> {
+    ): Flow<KMResult<ShellResult>> {
         return if (useRoot) {
             suAdapter.executeWithStreamingOutput(command)
         } else {

base/src/main/java/io/github/sds100/keymapper/base/actions/PerformActionsUseCase.kt

@@ -911,7 +911,7 @@ class PerformActionsUseCaseImpl @AssistedInject constructor(
                 result = executeShellCommandUseCase.execute(
                     command = action.command,
                     useRoot = action.useRoot,
-                    timeoutMs = action.timeoutMs.toLong(),
+                    timeoutMillis = action.timeoutMillis.toLong(),
                 )
             }