diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c23e06649..6cddfd30dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ ## Fixed - #2091 show an error on the "open device assistant" action when no device assistant is installed. +- #2107 clarify the crashed accessibility service dialog text and keep only Cancel/Restart actions. ## [4.0.5](https://github.com/sds100/KeyMapper/releases/tag/v4.0.5) diff --git a/base/src/main/java/io/github/sds100/keymapper/base/onboarding/SetupAccessibilityServiceDialog.kt b/base/src/main/java/io/github/sds100/keymapper/base/onboarding/SetupAccessibilityServiceDialog.kt index 272d514f0f..a893facaeb 100644 --- a/base/src/main/java/io/github/sds100/keymapper/base/onboarding/SetupAccessibilityServiceDialog.kt +++ b/base/src/main/java/io/github/sds100/keymapper/base/onboarding/SetupAccessibilityServiceDialog.kt @@ -1,10 +1,8 @@ package io.github.sds100.keymapper.base.onboarding import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.width import androidx.compose.material3.AlertDialog import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -41,15 +39,10 @@ fun HandleAccessibilityServiceDialogs(delegate: SetupAccessibilityServiceDelegat } is AccessibilityServiceDialog.RestartService -> { - val dontKillMyAppUrl = stringResource(R.string.url_dont_kill_my_app) RestartAccessibilityServiceDialog( modifier = Modifier, onDismissRequest = delegate::onCancelClick, onRestartClick = delegate::onRestartServiceClick, - onDontKillMyAppClick = { - uriHandler.openUriSafe(context, dontKillMyAppUrl) - }, - onIgnoreClick = delegate::onIgnoreCrashedClick, ) } @@ -113,8 +106,6 @@ private fun RestartAccessibilityServiceDialog( modifier: Modifier = Modifier, onDismissRequest: () -> Unit, onRestartClick: () -> Unit, - onDontKillMyAppClick: () -> Unit, - onIgnoreClick: () -> Unit, ) { AlertDialog( modifier = modifier, @@ -129,19 +120,13 @@ private fun RestartAccessibilityServiceDialog( ) }, confirmButton = { - Row { - TextButton(onClick = onRestartClick) { - Text(stringResource(R.string.pos_restart)) - } - Spacer(modifier = Modifier.width(8.dp)) - TextButton(onClick = onDontKillMyAppClick) { - Text(stringResource(R.string.dialog_button_read_dont_kill_my_app_yes)) - } + TextButton(onClick = onRestartClick) { + Text(stringResource(R.string.pos_restart)) } }, dismissButton = { - TextButton(onClick = onIgnoreClick) { - Text(stringResource(R.string.dialog_button_read_dont_kill_my_app_no)) + TextButton(onClick = onDismissRequest) { + Text(stringResource(R.string.neg_cancel)) } }, ) @@ -238,8 +223,6 @@ private fun RestartAccessibilityServiceDialogPreview() { RestartAccessibilityServiceDialog( onDismissRequest = {}, onRestartClick = {}, - onDontKillMyAppClick = {}, - onIgnoreClick = {}, ) } } diff --git a/base/src/main/res/values/strings.xml b/base/src/main/res/values/strings.xml index 9d6bb9862b..2781a4164d 100644 --- a/base/src/main/res/values/strings.xml +++ b/base/src/main/res/values/strings.xml @@ -460,8 +460,8 @@ Restart the accessibility service by turning it off and on. - Key Mapper was interrupted - Key Mapper tried to run in the background but was stopped by the system.\nThis can happen if you have battery or memory optimization turned on.\n\nTo fix this, you can try following an online guide. You should also restart the service when you\'re done. + Accessibility service needs restarting + Key Mapper\'s accessibility service was stopped by the system.\n\nTo fix this, restart it by turning the accessibility service off and then on again. Proceed Ignore