Remove NetworkType.CONNECTED constraint on all the Worker.

Should use the Retry strategy now, I have checked all the worker. Will do more test locally.

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt

@@ -106,7 +106,7 @@ internal class WorkManagerProvider @Inject constructor(
          * Default constraints: connected network.
          */
         val workConstraints = Constraints.Builder()
-                .setRequiredNetworkType(NetworkType.CONNECTED)
+                // .setRequiredNetworkType(NetworkType.CONNECTED)
                 .build()
 
         // Use min value, smaller value will be ignored

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt

@@ -47,7 +47,6 @@ import org.matrix.android.sdk.internal.session.pushers.PushersModule
 import org.matrix.android.sdk.internal.session.room.RoomModule
 import org.matrix.android.sdk.internal.session.room.aggregation.livelocation.DeactivateLiveLocationShareWorker
 import org.matrix.android.sdk.internal.session.room.send.MultipleEventSendingDispatcherWorker
-import org.matrix.android.sdk.internal.session.room.send.RedactEventWorker
 import org.matrix.android.sdk.internal.session.room.send.SendEventWorker
 import org.matrix.android.sdk.internal.session.search.SearchModule
 import org.matrix.android.sdk.internal.session.signout.SignOutModule
@@ -119,8 +118,6 @@ internal interface SessionComponent {
 
     fun inject(worker: MultipleEventSendingDispatcherWorker)
 
-    fun inject(worker: RedactEventWorker)
-
     fun inject(worker: UploadContentWorker)
 
     fun inject(worker: SyncWorker)

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt

@@ -23,6 +23,7 @@ import androidx.core.net.toUri
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.listeners.ProgressListener
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import org.matrix.android.sdk.api.session.crypto.model.EncryptedFileInfo
@@ -365,6 +366,8 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
     }
 
     private fun handleFailure(params: Params, failure: Throwable): Result {
+        if (failure is Failure.NetworkConnection) return Result.retry()
+
         notifyTracker(params) { contentUploadStateTracker.setFailure(it, failure) }
 
         return Result.success(

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt

@@ -1,95 +0,0 @@
-/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.matrix.android.sdk.internal.session.room.send
-
-import android.content.Context
-import androidx.work.WorkerParameters
-import com.squareup.moshi.JsonClass
-import org.matrix.android.sdk.api.failure.Failure
-import org.matrix.android.sdk.internal.SessionManager
-import org.matrix.android.sdk.internal.crypto.tasks.RedactEventTask
-import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
-import org.matrix.android.sdk.internal.session.SessionComponent
-import org.matrix.android.sdk.internal.session.room.RoomAPI
-import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
-import org.matrix.android.sdk.internal.worker.SessionWorkerParams
-import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
-import javax.inject.Inject
-
-/**
- * Possible previous worker: None.
- * Possible next worker    : None.
- */
-internal class RedactEventWorker(context: Context, params: WorkerParameters, sessionManager: SessionManager) :
-        SessionSafeCoroutineWorker<RedactEventWorker.Params>(context, params, sessionManager, Params::class.java) {
-
-    @JsonClass(generateAdapter = true)
-    internal data class Params(
-            override val sessionId: String,
-            val txID: String,
-            val roomId: String,
-            val eventId: String,
-            val reason: String?,
-            val withRelations: List<String>? = null,
-            override val lastFailureMessage: String? = null
-    ) : SessionWorkerParams
-
-    @Inject lateinit var roomAPI: RoomAPI
-    @Inject lateinit var globalErrorReceiver: GlobalErrorReceiver
-    @Inject lateinit var redactEventTask: RedactEventTask
-
-    override fun injectWith(injector: SessionComponent) {
-        injector.inject(this)
-    }
-
-    override suspend fun doSafeWork(params: Params): Result {
-        return runCatching {
-            redactEventTask.execute(
-                    RedactEventTask.Params(
-                            txID = params.txID,
-                            roomId = params.roomId,
-                            eventId = params.eventId,
-                            reason = params.reason,
-                            withRelations = params.withRelations,
-                    )
-            )
-        }.fold(
-                {
-                    Result.success()
-                },
-                {
-                    when (it) {
-                        is Failure.NetworkConnection -> Result.retry()
-                        else -> {
-                            // TODO mark as failed to send?
-                            // always return success, or the chain will be stuck for ever!
-                            Result.success(
-                                    WorkerParamsFactory.toData(
-                                            params.copy(
-                                                    lastFailureMessage = it.localizedMessage
-                                            )
-                                    )
-                            )
-                        }
-                    }
-                }
-        )
-    }
-
-    override fun buildErrorParams(params: Params, message: String): Params {
-        return params.copy(lastFailureMessage = params.lastFailureMessage ?: message)
-    }
-}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt

@@ -28,7 +28,6 @@ import org.matrix.android.sdk.internal.session.content.UploadContentWorker
 import org.matrix.android.sdk.internal.session.pushers.AddPusherWorker
 import org.matrix.android.sdk.internal.session.room.aggregation.livelocation.DeactivateLiveLocationShareWorker
 import org.matrix.android.sdk.internal.session.room.send.MultipleEventSendingDispatcherWorker
-import org.matrix.android.sdk.internal.session.room.send.RedactEventWorker
 import org.matrix.android.sdk.internal.session.room.send.SendEventWorker
 import org.matrix.android.sdk.internal.session.sync.handler.UpdateUserWorker
 import org.matrix.android.sdk.internal.session.sync.job.SyncWorker
@@ -55,8 +54,6 @@ internal class MatrixWorkerFactory @Inject constructor(private val sessionManage
                 AddPusherWorker(appContext, workerParameters, sessionManager)
             MultipleEventSendingDispatcherWorker::class.java.name ->
                 MultipleEventSendingDispatcherWorker(appContext, workerParameters, sessionManager)
-            RedactEventWorker::class.java.name ->
-                RedactEventWorker(appContext, workerParameters, sessionManager)
             SendEventWorker::class.java.name ->
                 SendEventWorker(appContext, workerParameters, sessionManager)
             SyncWorker::class.java.name ->

vector/src/main/java/im/vector/app/core/services/VectorSyncAndroidService.kt

@@ -129,7 +129,7 @@ class VectorSyncAndroidService : SyncAndroidService() {
                         .setInputData(RestartWhenNetworkOn.createInputData(sessionId, syncTimeoutSeconds, syncDelaySeconds, isPeriodic))
                         .setConstraints(
                                 Constraints.Builder()
-                                        .setRequiredNetworkType(NetworkType.CONNECTED)
+                                        // .setRequiredNetworkType(NetworkType.CONNECTED)
                                         .build()
                         )
                         .build()