Create object for work constraint

2024-11-16 02:05:06 +08:00 · 2019-07-09 17:14:30 +02:00 · 2019-07-09 17:14:30 +02:00 · 4281b5967a
commit 4281b5967a
parent aa743d8469
6 changed files with 22 additions and 33 deletions
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GroupSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GroupSummaryUpdater.kt
@ -17,9 +17,7 @@
 package im.vector.matrix.android.internal.session.group

 import android.content.Context
-import androidx.work.Constraints
 import androidx.work.ExistingWorkPolicy
-import androidx.work.NetworkType
 import androidx.work.WorkManager
 import com.zhuinden.monarchy.Monarchy
 import im.vector.matrix.android.api.auth.data.Credentials
@ -27,6 +25,7 @@ import im.vector.matrix.android.internal.database.RealmLiveEntityObserver
 import im.vector.matrix.android.internal.database.model.GroupEntity
 import im.vector.matrix.android.internal.database.query.where
 import im.vector.matrix.android.internal.di.SessionDatabase
+import im.vector.matrix.android.internal.worker.WorkManagerUtil
 import im.vector.matrix.android.internal.worker.WorkManagerUtil.matrixOneTimeWorkRequestBuilder
 import im.vector.matrix.android.internal.worker.WorkerParamsFactory
 import io.realm.RealmConfiguration
@ -41,10 +40,6 @@ internal class GroupSummaryUpdater @Inject constructor(private val context: Cont

    override val query = Monarchy.Query<GroupEntity> { GroupEntity.where(it) }

-    private val workConstraints = Constraints.Builder()
-            .setRequiredNetworkType(NetworkType.CONNECTED)
-            .build()
-
    override fun processChanges(inserted: List<GroupEntity>, updated: List<GroupEntity>, deleted: List<GroupEntity>) {
        val newGroupIds = inserted.map { it.groupId }
        val getGroupDataWorkerParams = GetGroupDataWorker.Params(credentials.userId, newGroupIds)
@ -52,7 +47,7 @@ internal class GroupSummaryUpdater @Inject constructor(private val context: Cont

        val sendWork = matrixOneTimeWorkRequestBuilder<GetGroupDataWorker>()
                .setInputData(workData)
-                .setConstraints(workConstraints)
+                .setConstraints(WorkManagerUtil.workConstraints)
                .build()

        WorkManager.getInstance(context)
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/DefaultPusherService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/DefaultPusherService.kt
@ -18,8 +18,6 @@ package im.vector.matrix.android.internal.session.pushers
 import android.content.Context
 import androidx.lifecycle.LiveData
 import androidx.work.BackoffPolicy
-import androidx.work.Constraints
-import androidx.work.NetworkType
 import androidx.work.WorkManager
 import com.zhuinden.monarchy.Monarchy
 import im.vector.matrix.android.api.MatrixCallback
@ -31,6 +29,7 @@ import im.vector.matrix.android.internal.database.model.PusherEntity
 import im.vector.matrix.android.internal.database.query.where
 import im.vector.matrix.android.internal.task.TaskExecutor
 import im.vector.matrix.android.internal.task.configureWith
+import im.vector.matrix.android.internal.worker.WorkManagerUtil
 import im.vector.matrix.android.internal.worker.WorkManagerUtil.matrixOneTimeWorkRequestBuilder
 import im.vector.matrix.android.internal.worker.WorkerParamsFactory
 import java.util.*
@ -73,10 +72,8 @@ internal class DefaultPusherService @Inject constructor(

        val params = AddHttpPusherWorker.Params(pusher, sessionParam.credentials.userId)

-        val constraints = Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build()
-
        val request = matrixOneTimeWorkRequestBuilder<AddHttpPusherWorker>()
-                .setConstraints(constraints)
+                .setConstraints(WorkManagerUtil.workConstraints)
                .setInputData(WorkerParamsFactory.toData(params))
                .setBackoffCriteria(BackoffPolicy.LINEAR, 10_000L, TimeUnit.MILLISECONDS)
                .build()
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/DefaultSendService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/DefaultSendService.kt
@ -17,7 +17,10 @@
 package im.vector.matrix.android.internal.session.room.send

 import android.content.Context
-import androidx.work.*
+import androidx.work.BackoffPolicy
+import androidx.work.ExistingWorkPolicy
+import androidx.work.OneTimeWorkRequest
+import androidx.work.WorkManager
 import com.zhuinden.monarchy.Monarchy
 import im.vector.matrix.android.api.auth.data.Credentials
 import im.vector.matrix.android.api.session.content.ContentAttachmentData
@ -29,6 +32,7 @@ import im.vector.matrix.android.api.util.CancelableBag
 import im.vector.matrix.android.internal.session.content.UploadContentWorker
 import im.vector.matrix.android.internal.session.room.timeline.TimelineSendEventWorkCommon
 import im.vector.matrix.android.internal.util.CancelableWork
+import im.vector.matrix.android.internal.worker.WorkManagerUtil
 import im.vector.matrix.android.internal.worker.WorkManagerUtil.matrixOneTimeWorkRequestBuilder
 import im.vector.matrix.android.internal.worker.WorkerParamsFactory
 import timber.log.Timber
@ -38,10 +42,6 @@ import javax.inject.Inject
 private const val UPLOAD_WORK = "UPLOAD_WORK"
 private const val BACKOFF_DELAY = 10_000L

-private val WORK_CONSTRAINTS = Constraints.Builder()
-        .setRequiredNetworkType(NetworkType.CONNECTED)
-        .build()
-
 internal class DefaultSendService @Inject constructor(private val context: Context,
                                                      private val credentials: Credentials,
                                                      private val roomId: String,
@ -137,7 +137,7 @@ internal class DefaultSendService @Inject constructor(private val context: Conte
        val sendWorkData = WorkerParamsFactory.toData(params)

        return matrixOneTimeWorkRequestBuilder<EncryptEventWorker>()
-                .setConstraints(WORK_CONSTRAINTS)
+                .setConstraints(WorkManagerUtil.workConstraints)
                .setInputData(sendWorkData)
                .setBackoffCriteria(BackoffPolicy.LINEAR, BACKOFF_DELAY, TimeUnit.MILLISECONDS)
                .build()
@ -164,7 +164,7 @@ internal class DefaultSendService @Inject constructor(private val context: Conte
        val uploadWorkData = WorkerParamsFactory.toData(uploadMediaWorkerParams)

        return matrixOneTimeWorkRequestBuilder<UploadContentWorker>()
-                .setConstraints(WORK_CONSTRAINTS)
+                .setConstraints(WorkManagerUtil.workConstraints)
                .setInputData(uploadWorkData)
                .setBackoffCriteria(BackoffPolicy.LINEAR, BACKOFF_DELAY, TimeUnit.MILLISECONDS)
                .build()
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TimelineSendEventWorkCommon.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TimelineSendEventWorkCommon.kt
@ -17,6 +17,7 @@ package im.vector.matrix.android.internal.session.room.timeline

 import android.content.Context
 import androidx.work.*
+import im.vector.matrix.android.internal.worker.WorkManagerUtil
 import im.vector.matrix.android.internal.worker.WorkManagerUtil.matrixOneTimeWorkRequestBuilder
 import java.util.concurrent.TimeUnit

@ -24,10 +25,6 @@ import java.util.concurrent.TimeUnit
 private const val SEND_WORK = "SEND_WORK"
 private const val BACKOFF_DELAY = 10_000L

-private val WORK_CONSTRAINTS = Constraints.Builder()
-        .setRequiredNetworkType(NetworkType.CONNECTED)
-        .build()
-
 /**
 * Helper class for sending event related works.
 * All send event from a room are using the same workchain, in order to ensure order.
@ -62,7 +59,7 @@ internal object TimelineSendEventWorkCommon {

    inline fun <reified W : ListenableWorker> createWork(data: Data): OneTimeWorkRequest {
        return matrixOneTimeWorkRequestBuilder<W>()
-                .setConstraints(WORK_CONSTRAINTS)
+                .setConstraints(WorkManagerUtil.workConstraints)
                .setInputData(data)
                .setBackoffCriteria(BackoffPolicy.LINEAR, BACKOFF_DELAY, TimeUnit.MILLISECONDS)
                .build()
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncWorker.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncWorker.kt
@ -24,6 +24,7 @@ import im.vector.matrix.android.internal.session.sync.SyncTask
 import im.vector.matrix.android.internal.task.TaskExecutor
 import im.vector.matrix.android.internal.task.TaskThread
 import im.vector.matrix.android.internal.task.configureWith
+import im.vector.matrix.android.internal.worker.WorkManagerUtil
 import im.vector.matrix.android.internal.worker.WorkManagerUtil.matrixOneTimeWorkRequestBuilder
 import im.vector.matrix.android.internal.worker.WorkerParamsFactory
 import im.vector.matrix.android.internal.worker.getSessionComponent
@ -89,9 +90,7 @@ internal class SyncWorker(context: Context,
            val data = WorkerParamsFactory.toData(Params(userId, serverTimeout, false))
            val workRequest = matrixOneTimeWorkRequestBuilder<SyncWorker>()
                    .setInputData(data)
-                    .setConstraints(Constraints.Builder()
-                            .setRequiredNetworkType(NetworkType.CONNECTED)
-                            .build())
+                    .setConstraints(WorkManagerUtil.workConstraints)
                    .setBackoffCriteria(BackoffPolicy.LINEAR, 1_000, TimeUnit.MILLISECONDS)
                    .build()
            WorkManager.getInstance(context).enqueueUniqueWork("BG_SYNCP", ExistingWorkPolicy.REPLACE, workRequest)
@ -101,9 +100,7 @@ internal class SyncWorker(context: Context,
            val data = WorkerParamsFactory.toData(Params(userId, serverTimeout, true))
            val workRequest = matrixOneTimeWorkRequestBuilder<SyncWorker>()
                    .setInputData(data)
-                    .setConstraints(Constraints.Builder()
-                            .setRequiredNetworkType(NetworkType.CONNECTED)
-                            .build())
+                    .setConstraints(WorkManagerUtil.workConstraints)
                    .setBackoffCriteria(BackoffPolicy.LINEAR, delay, TimeUnit.MILLISECONDS)
                    .build()
            WorkManager.getInstance(context).enqueueUniqueWork("BG_SYNCP", ExistingWorkPolicy.REPLACE, workRequest)
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/WorkManagerUtil.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/WorkManagerUtil.kt
@ -17,13 +17,16 @@
 package im.vector.matrix.android.internal.worker

 import android.content.Context
-import androidx.work.ListenableWorker
-import androidx.work.OneTimeWorkRequestBuilder
-import androidx.work.WorkManager
+import androidx.work.*

 internal object WorkManagerUtil {
    private const val MATRIX_SDK_TAG = "MatrixSDK"

+    // Default constraints: network
+    val workConstraints = Constraints.Builder()
+            .setRequiredNetworkType(NetworkType.CONNECTED)
+            .build()
+
    inline fun <reified W : ListenableWorker> matrixOneTimeWorkRequestBuilder() =
            OneTimeWorkRequestBuilder<W>()
                    .addTag(MATRIX_SDK_TAG)