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

Try to make the app work on air-gapped mode #8233

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
+5 −103
Draft

Try to make the app work on air-gapped mode #8233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d8859e
Remove unused RedactEventWorker class.
bmarty Mar 9, 2023
2095338
Remove NetworkType.CONNECTED constraint on all the Worker.
bmarty Mar 10, 2023
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
2 changes: 1 addition & 1 deletion matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -119,8 +118,6 @@ internal interface SessionComponent {

fun inject(worker: MultipleEventSendingDispatcherWorker)

fun inject(worker: RedactEventWorker)

fun inject(worker: UploadContentWorker)

fun inject(worker: SyncWorker)
Expand Down
3 changes: 3 additions & 0 deletions ...roid/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down
95 changes: 0 additions & 95 deletions ...roid/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions ...x-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 ->
Expand Down
2 changes: 1 addition & 1 deletion vector/src/main/java/im/vector/app/core/services/VectorSyncAndroidService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down