Skip to content

fix(settings): Fix Android 14 Settings crash and complete English localization #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bluscream wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix(settings): Fix Android 14 Settings crash and complete English localization #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6bcb8d
fix(settings): Fix SecurityException crash on Android 14 and enhance …
Bluscream Sep 1, 2026
2a23c8f
feat(i18n): Complete English translation and fix positional format sp…
Bluscream Sep 1, 2026
f9ac9c8
feat(i18n): Localize agent actions, prompts, error handling and 401 s…
Bluscream Sep 1, 2026
ca86e9e
fix(ui): Re-check Shizuku state onResume, enable start button with pr…
Bluscream Sep 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/src/main/java/com/kevinluo/autoglm/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,15 @@ class MainActivity : BaseActivity() {
override fun onResume() {
super.onResume()
checkOverlayPermission()
checkShizukuState()
}

private fun checkShizukuState() {
if (Shizuku.pingBinder()) {
checkShizukuPermission()
} else {
viewModel.updateShizukuStatus(ShizukuStatus.NOT_RUNNING)
}
}

override fun onDestroy() {
Expand Down
89 changes: 50 additions & 39 deletions app/src/main/java/com/kevinluo/autoglm/action/ActionHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ class ActionHandler(
floatingWindowProvider?.invoke()?.show()
}

private var currentLanguage: String = "cn"
private val isEn: Boolean
get() = currentLanguage.lowercase().let { it == "en" || it == "english" }

/**
* Executes an agent action on the device.
*
Expand All @@ -105,10 +109,16 @@ class ActionHandler(
* @param action The action to execute
* @param screenWidth Current screen width in pixels
* @param screenHeight Current screen height in pixels
* @param language Language code: "cn" for Chinese, "en" for English
* @return The result of the action execution
*
*/
suspend fun execute(action: AgentAction, screenWidth: Int, screenHeight: Int): ActionResult {
suspend fun execute(
action: AgentAction,
screenWidth: Int,
screenHeight: Int,
language: String = "cn",
): ActionResult {
this.currentLanguage = language
Logger.logAction(action::class.simpleName ?: "Unknown", "Executing on ${screenWidth}x$screenHeight")

return try {
Expand Down Expand Up @@ -160,7 +170,7 @@ class ActionHandler(
if (action.message != null) {
val confirmed = confirmationCallback?.onConfirmationRequired(action.message) ?: true
if (!confirmed) {
return ActionResult(true, false, "点击已被用户取消")
return ActionResult(true, false, if (isEn) "Tap cancelled by user" else "点击已被用户取消")
}
}

Expand All @@ -179,9 +189,9 @@ class ActionHandler(
val result = deviceExecutor.tap(absX, absY)
if (isDeviceExecutorError(result)) {
Logger.w(TAG, "Tap command failed: $result")
ActionResult(false, false, "点击失败: $result")
ActionResult(false, false, if (isEn) "Tap failed: $result" else "点击失败: $result")
} else {
ActionResult(true, false, "点击 ($absX, $absY)")
ActionResult(true, false, if (isEn) "Tap ($absX, $absY)" else "点击 ($absX, $absY)")
}
} finally {
// Always show floating window after tap, even if tap fails
Expand Down Expand Up @@ -243,9 +253,9 @@ class ActionHandler(

if (isDeviceExecutorError(result)) {
Logger.w(TAG, "Swipe command failed: $result")
ActionResult(false, false, "滑动失败: $result")
ActionResult(false, false, if (isEn) "Swipe failed: $result" else "滑动失败: $result")
} else {
ActionResult(true, false, "滑动 从($startAbsX, $startAbsY) 到($endAbsX, $endAbsY)")
ActionResult(true, false, if (isEn) "Swipe from ($startAbsX, $startAbsY) to ($endAbsX, $endAbsY)" else "滑动 从($startAbsX, $startAbsY) 到($endAbsX, $endAbsY)")
}
} finally {
// Always show floating window after swipe, even if swipe fails
Expand Down Expand Up @@ -292,7 +302,7 @@ class ActionHandler(
delay(200)

val result = textInputManager.typeText(action.text)
ActionResult(result.success, false, "输入名称: ${action.text}")
return ActionResult(result.success, false, if (isEn) "Type Name: ${action.text}" else "输入名称: ${action.text}")
} finally {
// Always show floating window after typing, even if typing fails
showFloatingWindow()
Expand Down Expand Up @@ -322,20 +332,20 @@ class ActionHandler(

return if (packageName != null) {
Logger.i(TAG, "Launching package: $packageName")
val launchResult = deviceExecutor.launchApp(packageName)
val startResult = deviceExecutor.launchApp(packageName)

if (isDeviceExecutorError(launchResult)) {
Logger.w(TAG, "Launch failed for $packageName: $launchResult")
// Launch failed - instruct model to find app icon on screen
if (isDeviceExecutorError(startResult)) {
Logger.w(TAG, "Failed to start app '$packageName': $startResult, instructing model to find icon on screen")
// Press Home first to go to home screen
deviceExecutor.pressKey(DeviceExecutor.KEYCODE_HOME)
ActionResult(
// Operation itself succeeded, just app not found
success = true,
shouldFinish = false,
message = "启动应用'$packageName'失败，已返回主屏幕。请在主屏幕或应用列表中查找并点击'${action.app}'应用图标来启动它。",
message = if (isEn) "Failed to launch app '$packageName', returned to home screen. Please find and tap the '${action.app}' app icon on the home screen or app list to launch it." else "启动应用'$packageName'失败，已返回主屏幕。请在主屏幕或应用列表中查找并点击'${action.app}'应用图标来启动它。",
)
} else {
ActionResult(true, false, "启动应用: $packageName")
ActionResult(true, false, if (isEn) "Launch: $packageName" else "启动应用: $packageName")
}
} else {
// Package not found - instruct model to find app icon on screen
Expand All @@ -345,7 +355,7 @@ class ActionHandler(
ActionResult(
success = true,
shouldFinish = false,
message = "找不到应用包名'${action.app}'，已返回主屏幕。请在主屏幕或应用列表中查找并点击'${action.app}'应用图标来启动它。如果主屏幕没有，请上滑打开应用列表查找。",
message = if (isEn) "Cannot find app package for '${action.app}', returned to home screen. Please find and tap the '${action.app}' app icon on the home screen or app list to launch it. If not on home screen, swipe up to open app drawer." else "找不到应用包名'${action.app}'，已返回主屏幕。请在主屏幕或应用列表中查找并点击'${action.app}'应用图标来启动它。如果主屏幕没有，请上滑打开应用列表查找。",
)
}
}
Expand All @@ -360,17 +370,17 @@ class ActionHandler(
val apps = appResolver.getAllLaunchableApps()

if (apps.isEmpty()) {
return ActionResult(true, false, "未找到已安装的应用")
return ActionResult(true, false, if (isEn) "No installed apps found" else "未找到已安装的应用")
}

// Format app list for display
val appListStr =
buildString {
appendLine("已安装的应用列表 (共${apps.size}个):")
appendLine(if (isEn) "Installed apps (${apps.size} total):" else "已安装的应用列表 (共${apps.size}个):")
appendLine()
apps.sortedBy { it.displayName.lowercase() }.forEach { app ->
appendLine("• ${app.displayName}")
appendLine(" 包名: ${app.packageName}")
appendLine(if (isEn) " Package: ${app.packageName}" else " 包名: ${app.packageName}")
}
}

Expand All @@ -393,9 +403,9 @@ class ActionHandler(
val result = deviceExecutor.pressKey(DeviceExecutor.KEYCODE_BACK)
return if (isDeviceExecutorError(result)) {
Logger.w(TAG, "Back key press failed: $result")
ActionResult(false, false, "返回键失败: $result")
ActionResult(false, false, if (isEn) "Back key failed: $result" else "返回键失败: $result")
} else {
ActionResult(true, false, "返回")
ActionResult(true, false, if (isEn) "Back" else "返回")
}
}

Expand All @@ -406,9 +416,9 @@ class ActionHandler(
val result = deviceExecutor.pressKey(DeviceExecutor.KEYCODE_HOME)
return if (isDeviceExecutorError(result)) {
Logger.w(TAG, "Home key press failed: $result")
ActionResult(false, false, "主页键失败: $result")
ActionResult(false, false, if (isEn) "Home key failed: $result" else "主页键失败: $result")
} else {
ActionResult(true, false, "主页")
ActionResult(true, false, if (isEn) "Home" else "主页")
}
}

Expand All @@ -419,9 +429,9 @@ class ActionHandler(
val result = deviceExecutor.pressKey(DeviceExecutor.KEYCODE_VOLUME_UP)
return if (isDeviceExecutorError(result)) {
Logger.w(TAG, "Volume up key press failed: $result")
ActionResult(false, false, "音量+键失败: $result")
ActionResult(false, false, if (isEn) "Volume+ key failed: $result" else "音量+键失败: $result")
} else {
ActionResult(true, false, "音量+")
ActionResult(true, false, if (isEn) "Volume+" else "音量+")
}
}

Expand All @@ -432,9 +442,9 @@ class ActionHandler(
val result = deviceExecutor.pressKey(DeviceExecutor.KEYCODE_VOLUME_DOWN)
return if (isDeviceExecutorError(result)) {
Logger.w(TAG, "Volume down key press failed: $result")
ActionResult(false, false, "音量-键失败: $result")
ActionResult(false, false, if (isEn) "Volume- key failed: $result" else "音量-键失败: $result")
} else {
ActionResult(true, false, "音量-")
ActionResult(true, false, if (isEn) "Volume-" else "音量-")
}
}

Expand All @@ -445,9 +455,9 @@ class ActionHandler(
val result = deviceExecutor.pressKey(DeviceExecutor.KEYCODE_POWER)
return if (isDeviceExecutorError(result)) {
Logger.w(TAG, "Power key press failed: $result")
ActionResult(false, false, "电源键失败: $result")
ActionResult(false, false, if (isEn) "Power key failed: $result" else "电源键失败: $result")
} else {
ActionResult(true, false, "电源键")
ActionResult(true, false, if (isEn) "Power" else "电源键")
}
}

Expand Down Expand Up @@ -481,9 +491,9 @@ class ActionHandler(

if (isDeviceExecutorError(result)) {
Logger.w(TAG, "Long press command failed: $result")
ActionResult(false, false, "长按失败: $result")
ActionResult(false, false, if (isEn) "Long press failed: $result" else "长按失败: $result")
} else {
ActionResult(true, false, "长按 ($absX, $absY) ${action.durationMs}毫秒")
ActionResult(true, false, if (isEn) "Long press ($absX, $absY) ${action.durationMs}ms" else "长按 ($absX, $absY) ${action.durationMs}毫秒")
}
} finally {
// Always show floating window after long press, even if it fails
Expand Down Expand Up @@ -516,9 +526,9 @@ class ActionHandler(
val result = deviceExecutor.doubleTap(absX, absY)
if (isDeviceExecutorError(result)) {
Logger.w(TAG, "Double tap command failed: $result")
ActionResult(false, false, "双击失败: $result")
ActionResult(false, false, if (isEn) "Double tap failed: $result" else "双击失败: $result")
} else {
ActionResult(true, false, "双击 ($absX, $absY)")
ActionResult(true, false, if (isEn) "Double tap ($absX, $absY)" else "双击 ($absX, $absY)")
}
} finally {
// Always show floating window after double tap, even if it fails
Expand All @@ -532,15 +542,15 @@ class ActionHandler(
private suspend fun executeWait(action: AgentAction.Wait): ActionResult {
val durationMs = (action.durationSeconds * 1000).toLong()
delay(durationMs)
return ActionResult(true, false, "等待 ${action.durationSeconds}秒")
return ActionResult(true, false, if (isEn) "Wait ${action.durationSeconds}s" else "等待 ${action.durationSeconds}秒")
}

/**
* Executes a TakeOver action.
*/
private suspend fun executeTakeOver(action: AgentAction.TakeOver): ActionResult {
confirmationCallback?.onTakeOverRequested(action.message)
return ActionResult(true, false, "请求手动接管: ${action.message}")
return ActionResult(true, false, if (isEn) "Request manual takeover: ${action.message}" else "请求手动接管: ${action.message}")
}

/**
Expand All @@ -549,10 +559,11 @@ class ActionHandler(
private suspend fun executeInteract(action: AgentAction.Interact): ActionResult {
val selectedIndex = confirmationCallback?.onInteractionRequired(action.options) ?: -1
return if (selectedIndex >= 0) {
val selectedOption = action.options?.getOrNull(selectedIndex) ?: "选项 $selectedIndex"
ActionResult(true, false, "用户选择: $selectedOption")
val defaultOptionName = if (isEn) "Option $selectedIndex" else "选项 $selectedIndex"
val selectedOption = action.options?.getOrNull(selectedIndex) ?: defaultOptionName
ActionResult(true, false, if (isEn) "User selected: $selectedOption" else "用户选择: $selectedOption")
} else {
ActionResult(true, false, "交互已取消")
ActionResult(true, false, if (isEn) "Interaction cancelled" else "交互已取消")
}
}

Expand All @@ -561,15 +572,15 @@ class ActionHandler(
*/
private suspend fun executeNote(action: AgentAction.Note): ActionResult {
// Note action just records the message, no device operation needed
return ActionResult(true, false, "备注: ${action.message}")
return ActionResult(true, false, if (isEn) "Note: ${action.message}" else "备注: ${action.message}")
}

/**
* Executes a CallApi action.
*/
private suspend fun executeCallApi(action: AgentAction.CallApi): ActionResult {
// CallApi action is handled by the agent layer, not device operations
return ActionResult(true, false, "API调用: ${action.instruction}")
return ActionResult(true, false, if (isEn) "API Call: ${action.instruction}" else "API调用: ${action.instruction}")
}

/**
Expand Down
46 changes: 25 additions & 21 deletions app/src/main/java/com/kevinluo/autoglm/action/AgentAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,29 +158,33 @@ sealed class AgentAction {
/**
* Formats the action for display in UI.
*
* @param language Language code: "cn" for Chinese, "en" for English
* @return Human-readable description of the action
*/
fun formatForDisplay(): String = when (this) {
is Tap -> "点击 ($x, $y)"
is Swipe -> "滑动 从($startX, $startY) 到($endX, $endY)"
is Type -> "输入: \"${text.take(30)}${if (text.length > 30) "..." else ""}\""
is TypeName -> "输入名称: \"$text\""
is Launch -> "启动: $app"
is ListApps -> "列出已安装应用"
is Back -> "返回"
is Home -> "主页"
is VolumeUp -> "音量+"
is VolumeDown -> "音量-"
is Power -> "电源键"
is LongPress -> "长按 ($x, $y)"
is DoubleTap -> "双击 ($x, $y)"
is Wait -> "等待 ${durationSeconds}秒"
is TakeOver -> "手动接管"
is Interact -> "用户交互"
is Note -> "备注: ${message.take(30)}${if (message.length > 30) "..." else ""}"
is CallApi -> "API调用"
is Finish -> "完成: ${message.take(30)}${if (message.length > 30) "..." else ""}"
is Batch -> "批量操作: ${steps.size}步 (间隔${delayMs}ms)"
fun formatForDisplay(language: String = "cn"): String {
val isEn = language.lowercase().let { it == "en" || it == "english" }
return when (this) {
is Tap -> if (isEn) "Tap ($x, $y)" else "点击 ($x, $y)"
is Swipe -> if (isEn) "Swipe from ($startX, $startY) to ($endX, $endY)" else "滑动 从($startX, $startY) 到($endX, $endY)"
is Type -> if (isEn) "Type: \"${text.take(30)}${if (text.length > 30) "..." else ""}\"" else "输入: \"${text.take(30)}${if (text.length > 30) "..." else ""}\""
is TypeName -> if (isEn) "Type Name: \"$text\"" else "输入名称: \"$text\""
is Launch -> if (isEn) "Launch: $app" else "启动: $app"
is ListApps -> if (isEn) "List installed apps" else "列出已安装应用"
is Back -> if (isEn) "Back" else "返回"
is Home -> if (isEn) "Home" else "主页"
is VolumeUp -> if (isEn) "Volume Up" else "音量+"
is VolumeDown -> if (isEn) "Volume Down" else "音量-"
is Power -> if (isEn) "Power" else "电源键"
is LongPress -> if (isEn) "Long press ($x, $y)" else "长按 ($x, $y)"
is DoubleTap -> if (isEn) "Double tap ($x, $y)" else "双击 ($x, $y)"
is Wait -> if (isEn) "Wait ${durationSeconds}s" else "等待 ${durationSeconds}秒"
is TakeOver -> if (isEn) "Manual takeover" else "手动接管"
is Interact -> if (isEn) "User interaction" else "用户交互"
is Note -> if (isEn) "Note: ${message.take(30)}${if (message.length > 30) "..." else ""}" else "备注: ${message.take(30)}${if (message.length > 30) "..." else ""}"
is CallApi -> if (isEn) "Call API" else "API调用"
is Finish -> if (isEn) "Finish: ${message.take(30)}${if (message.length > 30) "..." else ""}" else "完成: ${message.take(30)}${if (message.length > 30) "..." else ""}"
is Batch -> if (isEn) "Batch: ${steps.size} steps (${delayMs}ms)" else "批量操作: ${steps.size}步 (间隔${delayMs}ms)"
}
}
}

Expand Down
Loading