archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Throttle WorkManager calls to 200/min

Browse Source
pull/1061/head
Alex Baker 4 years ago
parent 1659afb34e
commit 640412314c
10 changed files with 104 additions and 84 deletions
Show Stats Download Patch File Download Diff File

5
app/src/main/java/org/tasks/db/DbUtils.kt
Unescape Escape View File

@ -4,9 +4,4 @@ object DbUtils {
const val MAX_SQLITE_ARGS = 990
fun <T> Iterable<T>.dbchunk(): List<List<T>> = chunked(MAX_SQLITE_ARGS)
fun <T> Iterable<T>.eachChunk(action: (List<T>) -> Unit) = dbchunk().forEach(action)
fun <T, R> Iterable<T>.chunkedMap(transform: (List<T>) -> Iterable<R>): List<R> =
dbchunk().flatMap(transform)
}

6
app/src/main/java/org/tasks/db/SuspendDbUtils.kt
Unescape Escape View File

@ -1,10 +1,14 @@
package org.tasks.db
import org.tasks.db.DbUtils.MAX_SQLITE_ARGS
import org.tasks.db.DbUtils.dbchunk
object SuspendDbUtils {
suspend fun <T> Iterable<T>.eachChunk(action: suspend (List<T>) -> Unit) =
dbchunk().forEach { action.invoke(it) }
eachChunk(MAX_SQLITE_ARGS, action)
suspend fun <T> Iterable<T>.eachChunk(size: Int, action: suspend (List<T>) -> Unit) =
chunked(size).forEach { action.invoke(it) }
suspend fun <T, R> Iterable<T>.chunkedMap(transform: suspend (List<T>) -> Iterable<R>): List<R> =
dbchunk().flatMap { transform.invoke(it) }

2
app/src/main/java/org/tasks/jobs/BackupWork.kt
Unescape Escape View File

@ -30,7 +30,7 @@ class BackupWork @WorkerInject constructor(
return Result.success()
}
override fun scheduleNext() = workManager.scheduleBackup()
override suspend fun scheduleNext() = workManager.scheduleBackup()
private suspend fun startBackup(context: Context?) {
try {

2
app/src/main/java/org/tasks/jobs/MidnightRefreshWork.kt
Unescape Escape View File

@ -19,5 +19,5 @@ class MidnightRefreshWork @WorkerInject constructor(
return Result.success()
}
override fun scheduleNext() = workManager.scheduleMidnightRefresh()
override suspend fun scheduleNext() = workManager.scheduleMidnightRefresh()
}

2
app/src/main/java/org/tasks/jobs/RefreshWork.kt
Unescape Escape View File

@ -20,5 +20,5 @@ class RefreshWork @WorkerInject constructor(
return Result.success()
}
override fun scheduleNext() = refreshScheduler.scheduleNext()
override suspend fun scheduleNext() = refreshScheduler.scheduleNext()
}

2
app/src/main/java/org/tasks/jobs/RepeatingWorker.kt
Unescape Escape View File

@ -16,5 +16,5 @@ abstract class RepeatingWorker internal constructor(
return result
}
protected abstract fun scheduleNext()
protected abstract suspend fun scheduleNext()
}

20
app/src/main/java/org/tasks/jobs/WorkManager.kt
Unescape Escape View File

@ -7,32 +7,32 @@ import org.tasks.data.Place
interface WorkManager {
fun afterComplete(current: Task, original: Task?)
suspend fun afterComplete(task: Task)
fun cleanup(ids: Iterable<Long>)
suspend fun cleanup(ids: Iterable<Long>)
fun sync(immediate: Boolean)
suspend fun sync(immediate: Boolean)
fun reverseGeocode(place: Place)
suspend fun reverseGeocode(place: Place)
fun updateBackgroundSync()
suspend fun updateBackgroundSync()
suspend fun updateBackgroundSync(
forceAccountPresent: Boolean?,
forceBackgroundEnabled: Boolean?,
forceOnlyOnUnmetered: Boolean?)
fun scheduleRefresh(time: Long)
suspend fun scheduleRefresh(time: Long)
fun scheduleMidnightRefresh()
suspend fun scheduleMidnightRefresh()
fun scheduleNotification(scheduledTime: Long)
fun scheduleBackup()
suspend fun scheduleBackup()
fun scheduleConfigRefresh()
suspend fun scheduleConfigRefresh()
fun scheduleDriveUpload(uri: Uri, purge: Boolean)
suspend fun scheduleDriveUpload(uri: Uri, purge: Boolean)
fun cancelNotifications()

77
app/src/main/java/org/tasks/jobs/WorkManagerImpl.kt
Unescape Escape View File

@ -15,9 +15,9 @@ import org.tasks.R
import org.tasks.data.CaldavDao
import org.tasks.data.GoogleTaskListDao
import org.tasks.data.Place
import org.tasks.data.runBlocking
import org.tasks.date.DateTimeUtils.midnight
import org.tasks.date.DateTimeUtils.newDateTime
import org.tasks.db.SuspendDbUtils.eachChunk
import org.tasks.jobs.WorkManager.Companion.MAX_CLEANUP_LENGTH
import org.tasks.jobs.WorkManager.Companion.REMOTE_CONFIG_INTERVAL_HOURS
import org.tasks.jobs.WorkManager.Companion.TAG_BACKGROUND_SYNC
@ -26,6 +26,7 @@ import org.tasks.jobs.WorkManager.Companion.TAG_MIDNIGHT_REFRESH
import org.tasks.jobs.WorkManager.Companion.TAG_REFRESH
import org.tasks.jobs.WorkManager.Companion.TAG_REMOTE_CONFIG
import org.tasks.jobs.WorkManager.Companion.TAG_SYNC
import org.tasks.notifications.Throttle
import org.tasks.preferences.Preferences
import org.tasks.time.DateTimeUtils
import timber.log.Timber
@ -38,32 +39,42 @@ class WorkManagerImpl constructor(
private val preferences: Preferences,
private val googleTaskListDao: GoogleTaskListDao,
private val caldavDao: CaldavDao): WorkManager {
private val throttle = Throttle(200, 60000, "WORK")
private val alarmManager: AlarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
private val workManager = androidx.work.WorkManager.getInstance(context)
override fun afterComplete(current: Task, original: Task?) {
workManager.enqueue(
private suspend fun enqueue(builder: WorkRequest.Builder<*, *>) {
throttle.run {
workManager.enqueue(builder.build())
}
}
private suspend fun enqueue(continuation: WorkContinuation) {
throttle.run {
continuation.enqueue()
}
}
override suspend fun afterComplete(task: Task) {
enqueue(
OneTimeWorkRequest.Builder(AfterSaveWork::class.java)
.setInputData(Data.Builder()
.putLong(AfterSaveWork.EXTRA_ID, current.id)
.build())
.build())
.putLong(AfterSaveWork.EXTRA_ID, task.id)
.build()))
}
override fun cleanup(ids: Iterable<Long>) {
ids.chunked(MAX_CLEANUP_LENGTH) {
workManager.enqueue(
override suspend fun cleanup(ids: Iterable<Long>) {
ids.eachChunk(MAX_CLEANUP_LENGTH) {
enqueue(
OneTimeWorkRequest.Builder(CleanupWork::class.java)
.setInputData(
Data.Builder()
.putLongArray(CleanupWork.EXTRA_TASK_IDS, it.toLongArray())
.build())
.build())
.build()))
}
}
override fun sync(immediate: Boolean) {
override suspend fun sync(immediate: Boolean) {
val constraints = Constraints.Builder()
.setRequiredNetworkType(
if (!immediate && preferences.getBoolean(R.string.p_background_sync_unmetered_only, false)) {
@ -78,24 +89,26 @@ class WorkManagerImpl constructor(
if (!immediate) {
builder.setInitialDelay(1, TimeUnit.MINUTES)
}
val request = builder.build()
workManager.beginUniqueWork(TAG_SYNC, ExistingWorkPolicy.REPLACE, request).enqueue()
throttle.run {
workManager
.beginUniqueWork(TAG_SYNC, ExistingWorkPolicy.REPLACE, builder.build())
.enqueue()
}
}
override fun reverseGeocode(place: Place) {
override suspend fun reverseGeocode(place: Place) {
if (BuildConfig.DEBUG && place.id == 0L) {
throw RuntimeException("Missing id")
}
workManager.enqueue(
enqueue(
OneTimeWorkRequest.Builder(ReverseGeocodeWork::class.java)
.setInputData(Data.Builder().putLong(ReverseGeocodeWork.PLACE_ID, place.id).build())
.setBackoffCriteria(BackoffPolicy.EXPONENTIAL, 1, TimeUnit.MINUTES)
.setConstraints(
Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build())
.build())
Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build()))
}
override fun updateBackgroundSync() = runBlocking {
override suspend fun updateBackgroundSync() {
updateBackgroundSync(null, null, null)
}
@ -114,8 +127,9 @@ class WorkManagerImpl constructor(
scheduleBackgroundSync(backgroundEnabled && accountsPresent, onlyOnWifi)
}
private fun scheduleBackgroundSync(enabled: Boolean, onlyOnUnmetered: Boolean) {
private suspend fun scheduleBackgroundSync(enabled: Boolean, onlyOnUnmetered: Boolean) {
Timber.d("background sync enabled: %s, onlyOnUnmetered: %s", enabled, onlyOnUnmetered)
throttle.run {
if (enabled) {
workManager.enqueueUniquePeriodicWork(
TAG_BACKGROUND_SYNC,
@ -128,10 +142,11 @@ class WorkManagerImpl constructor(
workManager.cancelUniqueWork(TAG_BACKGROUND_SYNC)
}
}
}
override fun scheduleRefresh(time: Long) = enqueueUnique(TAG_REFRESH, RefreshWork::class.java, time)
override suspend fun scheduleRefresh(time: Long) = enqueueUnique(TAG_REFRESH, RefreshWork::class.java, time)
override fun scheduleMidnightRefresh() =
override suspend fun scheduleMidnightRefresh() =
enqueueUnique(TAG_MIDNIGHT_REFRESH, MidnightRefreshWork::class.java, midnight())
override fun scheduleNotification(scheduledTime: Long) {
@ -149,7 +164,7 @@ class WorkManagerImpl constructor(
}
}
override fun scheduleBackup() {
override suspend fun scheduleBackup() =
enqueueUnique(
TAG_BACKUP,
BackupWork::class.java,
@ -157,9 +172,9 @@ class WorkManagerImpl constructor(
.plusDays(1)
.millis
.coerceAtMost(midnight()))
}
override fun scheduleConfigRefresh() {
override suspend fun scheduleConfigRefresh() {
throttle.run {
workManager.enqueueUniquePeriodicWork(
TAG_REMOTE_CONFIG,
ExistingPeriodicWorkPolicy.KEEP,
@ -170,8 +185,9 @@ class WorkManagerImpl constructor(
Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build())
.build())
}
}
override fun scheduleDriveUpload(uri: Uri, purge: Boolean) {
override suspend fun scheduleDriveUpload(uri: Uri, purge: Boolean) {
if (!preferences.getBoolean(R.string.p_google_drive_backup, false)) {
return
}
@ -181,7 +197,7 @@ class WorkManagerImpl constructor(
if (purge) {
builder.setInitialDelay(Random().nextInt(3600).toLong(), TimeUnit.SECONDS)
}
workManager.enqueue(builder.build())
enqueue(builder)
}
private val networkConstraints: Constraints
@ -193,14 +209,15 @@ class WorkManagerImpl constructor(
.setRequiredNetworkType(if (unmeteredOnly) NetworkType.UNMETERED else NetworkType.CONNECTED)
.build()
private fun enqueueUnique(key: String, c: Class<out CoroutineWorker?>, time: Long) {
@SuppressLint("EnqueueWork")
private suspend fun enqueueUnique(key: String, c: Class<out CoroutineWorker?>, time: Long) {
val delay = time - DateUtilities.now()
val builder = OneTimeWorkRequest.Builder(c)
if (delay > 0) {
builder.setInitialDelay(delay, TimeUnit.MILLISECONDS)
}
Timber.d("$key: ${DateTimeUtils.printTimestamp(time)} (${DateTimeUtils.printDuration(delay)})")
workManager.beginUniqueWork(key, ExistingWorkPolicy.REPLACE, builder.build()).enqueue()
enqueue(workManager.beginUniqueWork(key, ExistingWorkPolicy.REPLACE, builder.build()))
}
override fun cancelNotifications() {

4
app/src/main/java/org/tasks/preferences/fragments/Synchronization.kt
Unescape Escape View File

@ -94,13 +94,17 @@ class Synchronization : InjectingPreferenceFragment() {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
if (requestCode == REQUEST_CALDAV_SETTINGS) {
if (resultCode == Activity.RESULT_OK) {
lifecycleScope.launch(NonCancellable) {
workManager.sync(true)
workManager.updateBackgroundSync()
}
}
} else if (requestCode == REQUEST_GOOGLE_TASKS) {
if (resultCode == Activity.RESULT_OK) {
lifecycleScope.launch(NonCancellable) {
workManager.sync(true)
workManager.updateBackgroundSync()
}
} else if (data != null) {
toaster.longToast(data.getStringExtra(GtasksLoginActivity.EXTRA_ERROR))
}

6
app/src/main/java/org/tasks/scheduling/RefreshScheduler.kt
Unescape Escape View File

@ -28,7 +28,7 @@ class RefreshScheduler @Inject internal constructor(
}
@Synchronized
fun scheduleRefresh(task: Task) {
suspend fun scheduleRefresh(task: Task) {
if (task.isCompleted
&& preferences.getBoolean(R.string.p_temporarily_show_completed_tasks, false)) {
scheduleRefresh(task.completionDate + DateUtilities.ONE_MINUTE)
@ -41,7 +41,7 @@ class RefreshScheduler @Inject internal constructor(
}
@Synchronized
fun scheduleNext() {
suspend fun scheduleNext() {
val lapsed = jobs.headSet(DateTimeUtils.currentTimeMillis() + 1).toImmutableList()
jobs.removeAll(lapsed)
if (!jobs.isEmpty()) {
@ -49,7 +49,7 @@ class RefreshScheduler @Inject internal constructor(
}
}
private fun scheduleRefresh(timestamp: Long) {
private suspend fun scheduleRefresh(timestamp: Long) {
val now = DateTimeUtils.currentTimeMillis()
if (now < timestamp) {
val upcoming = jobs.tailSet(now)

Write Preview
Loading…
Cancel
Save