From 4deb7eb86598d3a74c11cd618dddb9e0c1929990 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 5 Aug 2019 16:40:18 +0200 Subject: [PATCH] Javadoc for NoMerger --- .../android/internal/session/room/send/DefaultSendService.kt | 4 ++-- .../matrix/android/internal/session/room/send/NoMerger.kt | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git 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 index 3f9d000ddb..b1b2d7a3b4 100644 --- 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 @@ -278,7 +278,7 @@ internal class DefaultSendService @Inject constructor(private val context: Conte return "${roomId}_$identifier" } - private fun createEncryptEventWork(event: Event, startChain: Boolean = false): OneTimeWorkRequest { + private fun createEncryptEventWork(event: Event, startChain: Boolean): OneTimeWorkRequest { // Same parameter val params = EncryptEventWorker.Params(credentials.userId, roomId, event) val sendWorkData = WorkerParamsFactory.toData(params) @@ -314,7 +314,7 @@ internal class DefaultSendService @Inject constructor(private val context: Conte private fun createUploadMediaWork(event: Event, attachment: ContentAttachmentData, isRoomEncrypted: Boolean, - startChain: Boolean = false): OneTimeWorkRequest { + startChain: Boolean): OneTimeWorkRequest { val uploadMediaWorkerParams = UploadContentWorker.Params(credentials.userId, roomId, event, attachment, isRoomEncrypted) val uploadWorkData = WorkerParamsFactory.toData(uploadMediaWorkerParams) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/NoMerger.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/NoMerger.kt index 6938bc2258..7719885741 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/NoMerger.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/NoMerger.kt @@ -18,7 +18,10 @@ package im.vector.matrix.android.internal.session.room.send import androidx.work.Data import androidx.work.InputMerger -class NoMerger : InputMerger() { +/** + * InputMerger which takes only the first input, to ensure an appended work with only have the specified parameters + */ +internal class NoMerger : InputMerger() { override fun merge(inputs: MutableList): Data { return inputs.first() }