Skip to content

fix: single-tap save proxy + suspend getString + preserve cancellation #578

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

Merged
rainxchzed merged 2 commits into from
May 12, 2026
+37 −19
Merged

fix: single-tap save proxy + suspend getString + preserve cancellation #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ae7b14
fix(tweaks): single-tap save proxy + suspend getString in coroutine
rainxchzed May 11, 2026
3765b48
fix(apps): preserve coroutine cancellation in update checks
rainxchzed May 11, 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
4 changes: 4 additions & 0 deletions ...re/apps/presentation/src/commonMain/kotlin/zed/rainxch/apps/presentation/AppsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,8 @@ class AppsViewModel(
_state.update {
it.copy(lastCheckedTimestamp = System.currentTimeMillis())
}
} catch (e: CancellationException) {
throw e
} catch (e: Exception) {
logger.error("Check all for updates failed: ${e.message}")
} finally {
Expand All @@ -220,6 +222,8 @@ class AppsViewModel(
val now = System.currentTimeMillis()
lastAutoCheckTimestamp = now
_state.update { it.copy(lastCheckedTimestamp = now) }
} catch (e: CancellationException) {
throw e
} catch (e: Exception) {
logger.error("Refresh failed: ${e.message}")
} finally {
Expand Down
27 changes: 15 additions & 12 deletions ...aks/presentation/src/commonMain/kotlin/zed/rainxch/tweaks/presentation/TweaksViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import zed.rainxch.tweaks.presentation.model.ProxyScopeFormState
import zed.rainxch.githubstore.core.presentation.res.Res
import zed.rainxch.githubstore.core.presentation.res.failed_to_save_proxy_settings
import zed.rainxch.githubstore.core.presentation.res.invalid_proxy_port
import zed.rainxch.githubstore.core.presentation.res.proxy_host_invalid
import zed.rainxch.githubstore.core.presentation.res.proxy_host_required
import zed.rainxch.githubstore.core.presentation.res.proxy_test_error_auth_required
import zed.rainxch.githubstore.core.presentation.res.proxy_test_error_dns
Expand Down Expand Up @@ -635,13 +636,14 @@ class TweaksViewModel(
val host =
form.host.trim().takeIf { isValidProxyHost(it) }
?: run {
val msg =
if (form.host.isBlank()) {
getString(Res.string.proxy_host_required)
} else {
getString(Res.string.proxy_host_invalid)
}
val isBlank = form.host.isBlank()
viewModelScope.launch {
val msg =
if (isBlank) {
getString(Res.string.proxy_host_required)
} else {
getString(Res.string.proxy_host_invalid)
}
_events.send(TweaksEvent.OnProxySaveError(msg))
}
return
Expand Down Expand Up @@ -1021,13 +1023,14 @@ class TweaksViewModel(
val host =
form.host.trim().takeIf { isValidProxyHost(it) }
?: run {
val msg =
if (form.host.isBlank()) {
getString(Res.string.proxy_host_required)
} else {
getString(Res.string.proxy_host_invalid)
}
val isBlank = form.host.isBlank()
viewModelScope.launch {
val msg =
if (isBlank) {
getString(Res.string.proxy_host_required)
} else {
getString(Res.string.proxy_host_invalid)
}
_events.send(TweaksEvent.OnProxyTestError(msg))
}
return null
Expand Down
25 changes: 18 additions & 7 deletions ...tion/src/commonMain/kotlin/zed/rainxch/tweaks/presentation/components/sections/Network.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.PasswordVisualTransformation
Expand Down Expand Up @@ -244,6 +245,7 @@ private fun ProxyDetailsFields(
onAction: (TweaksAction) -> Unit,
) {
val focusManager = LocalFocusManager.current
val keyboardController = LocalSoftwareKeyboardController.current
val portValue = form.port
val isPortInvalid =
portValue.isNotEmpty() &&
Expand Down Expand Up @@ -356,24 +358,33 @@ private fun ProxyDetailsFields(
) {
ProxyTestButton(
isInProgress = form.isTestInProgress,
enabled = isFormValid && !form.isTestInProgress,
// Keep enabled regardless of form validity so the user
// never taps a disabled button by accident on the first
// press (the previous `isFormValid` gate raced with
// the IME-composition-commit step on some Android
// keyboards and silently swallowed taps). VM still
// validates and surfaces a clear error event.
enabled = !form.isTestInProgress,
onClick = {
keyboardController?.hide()
focusManager.clearFocus()
onAction(TweaksAction.OnProxyTest(scope))
},
)

FilledTonalButton(
// `clearFocus()` first so the IME commits any pending
// keystroke before the save runs — without this the
// user sometimes has to tap Save twice on Android,
// because the first tap goes to focus dismissal and the
// second one actually fires the click.
onClick = {
// Hide IME first so any pending composition commits
// synchronously before the VM reads form state.
// `clearFocus()` alone isn't enough on Gboard /
// SwiftKey, which keep characters in a composition
// buffer until focus actually transfers — that's
// what made the user have to tap Save twice.
keyboardController?.hide()
focusManager.clearFocus()
onAction(TweaksAction.OnProxySave(scope))
},
enabled = isFormValid && !form.isTestInProgress,
enabled = !form.isTestInProgress,
) {
Icon(
imageVector = Icons.Default.Save,
Expand Down