diff --git a/app/src/main/java/org/koitharu/kotatsu/local/ui/ImportWorker.kt b/app/src/main/java/org/koitharu/kotatsu/local/ui/ImportWorker.kt index eee8038df..8aa05f52e 100644 --- a/app/src/main/java/org/koitharu/kotatsu/local/ui/ImportWorker.kt +++ b/app/src/main/java/org/koitharu/kotatsu/local/ui/ImportWorker.kt @@ -75,7 +75,7 @@ class ImportWorker @AssistedInject constructor( .setProgress(0, 0, true) .setSmallIcon(android.R.drawable.stat_sys_download) .setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE) - .setOngoing(true) + .setCategory(NotificationCompat.CATEGORY_PROGRESS) .build() return ForegroundInfo(FOREGROUND_NOTIFICATION_ID, notification) diff --git a/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt b/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt index 813208aa4..64d77f505 100644 --- a/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt +++ b/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt @@ -8,7 +8,18 @@ import androidx.annotation.FloatRange import androidx.core.app.NotificationCompat import androidx.core.content.ContextCompat import androidx.hilt.work.HiltWorker -import androidx.work.* +import androidx.work.BackoffPolicy +import androidx.work.Constraints +import androidx.work.CoroutineWorker +import androidx.work.ExistingPeriodicWorkPolicy +import androidx.work.ForegroundInfo +import androidx.work.NetworkType +import androidx.work.OneTimeWorkRequestBuilder +import androidx.work.OutOfQuotaPolicy +import androidx.work.PeriodicWorkRequestBuilder +import androidx.work.WorkManager +import androidx.work.WorkerParameters +import androidx.work.workDataOf import dagger.assisted.Assisted import dagger.assisted.AssistedInject import kotlinx.coroutines.Dispatchers @@ -66,13 +77,13 @@ class SuggestionsWorker @AssistedInject constructor( val notification = NotificationCompat.Builder(applicationContext, WORKER_CHANNEL_ID) .setContentTitle(title) .setPriority(NotificationCompat.PRIORITY_MIN) + .setCategory(NotificationCompat.CATEGORY_SERVICE) .setDefaults(0) .setColor(ContextCompat.getColor(applicationContext, R.color.blue_primary_dark)) .setSilent(true) .setProgress(0, 0, true) .setSmallIcon(android.R.drawable.stat_notify_sync) .setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_DEFERRED) - .setOngoing(true) .build() return ForegroundInfo(WORKER_NOTIFICATION_ID, notification) diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt index a47e8a53a..8f87fbfe0 100644 --- a/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt +++ b/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt @@ -75,6 +75,7 @@ class TrackWorker @AssistedInject constructor( } finally { withContext(NonCancellable) { logger.flush() + notificationManager.cancel(WORKER_NOTIFICATION_ID) } } } @@ -179,6 +180,7 @@ class TrackWorker @AssistedInject constructor( ), ) setAutoCancel(true) + setCategory(NotificationCompat.CATEGORY_PROMO) setVisibility(if (manga.isNsfw) VISIBILITY_SECRET else VISIBILITY_PUBLIC) color = colorPrimary setShortcutId(manga.id.toString()) @@ -216,13 +218,13 @@ class TrackWorker @AssistedInject constructor( val notification = NotificationCompat.Builder(applicationContext, WORKER_CHANNEL_ID) .setContentTitle(title) .setPriority(NotificationCompat.PRIORITY_MIN) + .setCategory(NotificationCompat.CATEGORY_SERVICE) .setDefaults(0) .setColor(ContextCompat.getColor(applicationContext, R.color.blue_primary_dark)) .setSilent(true) .setProgress(0, 0, true) .setSmallIcon(android.R.drawable.stat_notify_sync) .setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_DEFERRED) - .setOngoing(true) .build() return ForegroundInfo(WORKER_NOTIFICATION_ID, notification) }