Skip to content
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

More correct usage of expedited workers #566

Merged
merged 11 commits into from
Feb 22, 2024
Merged

More correct usage of expedited workers #566

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6ce1715
Add foreground notification type to expedited workers (required for A…
rfc2822 Feb 13, 2024
8f798fa
Make SyncWorker a long-running worker
rfc2822 Feb 13, 2024
c90de75
Don't use expedited SyncWorker for everything; handle foreground serv…
rfc2822 Feb 13, 2024
cc9b829
AddressBookSyncer: only request expedited for sub-jobs when parent jo…
rfc2822 Feb 13, 2024
20d008b
RefreshCollectionsWorker is not long-running -> no foreground service…
rfc2822 Feb 13, 2024
141305d
Fix tests
rfc2822 Feb 13, 2024
35eaadb
Merge branch 'dev-ose' into long-running-workers-need-a-foreground-se…
rfc2822 Feb 15, 2024
7a66a56
Don't use foreground service type in ForegroundInfo
rfc2822 Feb 15, 2024
c0908a1
Merge branch 'dev-ose' into long-running-workers-need-a-foreground-se…
rfc2822 Feb 15, 2024
6f38dfa
Merge branch 'dev-ose' into long-running-workers-need-a-foreground-se…
rfc2822 Feb 21, 2024
04ed557
Make SyncWorker not long-running
rfc2822 Feb 21, 2024
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
Prev Previous commit
Next Next commit
RefreshCollectionsWorker is not long-running -> no foreground service… 
… type needed
  • Loading branch information
@rfc2822
rfc2822 committed Feb 13, 2024
commit 20d008bfb374edf01cad9f5015532194eaad2763
7 changes: 1 addition & 6 deletions app/src/main/kotlin/at/bitfire/davdroid/servicedetection/RefreshCollectionsWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ import android.accounts.Account
import android.app.PendingIntent
import android.content.Context
import android.content.Intent
import android.content.pm.ServiceInfo
import android.os.Build
import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat
import androidx.hilt.work.HiltWorker
Expand Down Expand Up @@ -254,10 +252,7 @@ class RefreshCollectionsWorker @AssistedInject constructor(
.setOngoing(true)
.setPriority(NotificationCompat.PRIORITY_LOW)
.build()
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
ForegroundInfo(NotificationUtils.NOTIFY_SYNC_EXPEDITED, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
else
ForegroundInfo(NotificationUtils.NOTIFY_SYNC_EXPEDITED, notification)
return ForegroundInfo(NotificationUtils.NOTIFY_SYNC_EXPEDITED, notification)
}

private fun notifyRefreshError(contentText: String, contentIntent: Intent) {
Expand Down
Loading