Skip to content

fix(sync): notification can get stuck. #20363

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
david-allison merged 1 commit into from
Mar 26, 2026
Merged

fix(sync): notification can get stuck. #20363

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
9 changes: 6 additions & 3 deletions AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncMediaWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,20 +83,23 @@ class SyncMediaWorker(
monitorProgress(backend)
}
} catch (cancellationException: CancellationException) {
Timber.w(cancellationException)
Timber.w(cancellationException, "SyncMediaWorker cancelled (user tapped Cancel or WorkManager cancelled)")
notificationManager?.cancel(NotificationId.SYNC_MEDIA)
Timber.d("SyncMediaWorker: progress notification cancelled after worker cancellation")
cancelMediaSync(CollectionManager.getBackend())
throw cancellationException
} catch (throwable: Throwable) {
Timber.w(throwable)
Timber.w(throwable, "SyncMediaWorker failed")
notify {
setContentTitle(CollectionManager.TR.syncMediaFailed())
throwable.localizedMessage?.let { message ->
setContentText(message)
}
}
Timber.d("SyncMediaWorker: showing failure notification")
return Result.failure()
}
Timber.d("SyncMediaWorker: cancelling notification")
Timber.d("SyncMediaWorker: cancelling progress notification (sync completed)")
notificationManager?.cancel(NotificationId.SYNC_MEDIA)

Timber.d("SyncMediaWorker: success")
Expand Down
8 changes: 6 additions & 2 deletions AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,23 @@ class SyncWorker(
try {
syncCollection(auth, shouldSyncMedia)
} catch (cancellationException: CancellationException) {
Timber.w(cancellationException, "SyncWorker cancelled (user tapped Cancel or WorkManager cancelled)")
notificationManager?.cancel(NotificationId.SYNC)
Timber.d("SyncWorker: progress notification cancelled after worker cancellation")
cancelSync(CollectionManager.getBackend())
throw cancellationException
} catch (throwable: Throwable) {
Timber.w(throwable)
Timber.w(throwable, "SyncWorker failed")
notify {
setContentTitle(applicationContext.getString(R.string.sync_error))
throwable.localizedMessage?.let { message ->
setContentText(message)
}
}
Timber.d("SyncWorker: showing failure notification")
return Result.failure()
}
Timber.d("SyncWorker: cancelling notification")
Timber.d("SyncWorker: cancelling progress notification (sync completed)")
notificationManager?.cancel(NotificationId.SYNC)

Timber.d("SyncWorker: success")
Expand Down
Loading