Skip to content

fix(sync-dialogue): prevent cancellation via outside touch #20420

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
criticalAY merged 1 commit into from
Mar 10, 2026
Merged

fix(sync-dialogue): prevent cancellation via outside touch #20420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions AnkiDroid/src/main/java/com/ichi2/anki/CoroutineHelpers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ suspend fun <T> withProgressDialog(
setCancelable(onCancel != null)
if (manualCancelButton != null) {
setCancelable(false)
setCanceledOnTouchOutside(false)
setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(manualCancelButton)) { _, _ ->
Timber.i("Progress dialog cancelled via cancel button")
onCancel?.let { it() }
Expand Down
2 changes: 2 additions & 0 deletions AnkiDroid/src/main/java/com/ichi2/anki/Sync.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ private suspend fun handleDownload(
deckPicker.withProgress(
extractProgress = fullDownloadProgress(TR.syncDownloadingFromAnkiweb()),
onCancel = ::cancelSync,
manualCancelButton = R.string.dialog_cancel,
) {
withCol {
try {
Expand Down Expand Up @@ -264,6 +265,7 @@ private suspend fun handleUpload(
deckPicker.withProgress(
extractProgress = fullDownloadProgress(TR.syncUploadingToAnkiweb()),
onCancel = ::cancelSync,
manualCancelButton = R.string.dialog_cancel,
) {
withCol {
close(downgrade = false, forFullSync = true)
Expand Down
Loading