6543
/
BayernMessenger
forked from GitHub-Mirror/riotX-android
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Merge pull request #280 from Dominaezzz/kotlinify-1 

Enhance CancelableBag
This commit is contained in:
Benoit Marty 2019-07-05 18:34:28 +02:00 committed by GitHub
parent 3abb7c8de6 0f3a63e366
commit 205af8b122
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/CancelableBag.kt
View File

@ -16,20 +16,8 @@

package im.vector.matrix.android.api.util

class CancelableBag : Cancelable {

private val cancelableList = ArrayList<Cancelable>()

fun add(cancelable: Cancelable) {
cancelableList.add(cancelable)
}

class CancelableBag : Cancelable, MutableList<Cancelable> by ArrayList() {
override fun cancel() {
cancelableList.forEach { it.cancel() }
forEach { it.cancel() }
}

}

fun Cancelable.addTo(cancelables: CancelableBag) {
cancelables.add(this)
}

7
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/DefaultSendService.kt
View File

@ -26,7 +26,6 @@ import im.vector.matrix.android.api.session.events.model.Event
import im.vector.matrix.android.api.session.room.send.SendService
import im.vector.matrix.android.api.util.Cancelable
import im.vector.matrix.android.api.util.CancelableBag
import im.vector.matrix.android.api.util.addTo
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
@ -82,11 +81,9 @@ internal class DefaultSendService @Inject constructor(private val context: Conte
}

override fun sendMedias(attachments: List<ContentAttachmentData>): Cancelable {
val cancelableBag = CancelableBag()
attachments.forEach {
sendMedia(it).addTo(cancelableBag)
return attachments.mapTo(CancelableBag()) {
sendMedia(it)
}
return cancelableBag
}

override fun redactEvent(event: Event, reason: String?): Cancelable {

4
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultTimeline.kt
View File

@ -23,7 +23,6 @@ import im.vector.matrix.android.api.session.events.model.toModel
import im.vector.matrix.android.api.session.room.timeline.Timeline
import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
import im.vector.matrix.android.api.util.CancelableBag
import im.vector.matrix.android.api.util.addTo
import im.vector.matrix.android.internal.crypto.NewSessionListener
import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent
import im.vector.matrix.android.internal.database.mapper.asDomain
@ -396,7 +395,7 @@ internal class DefaultTimeline(
limit = limit)

Timber.v("Should fetch $limit items $direction")
paginationTask.configureWith(params)
cancelableBag += paginationTask.configureWith(params)
.enableRetry()
.dispatchTo(object : MatrixCallback<TokenChunkEventPersistor.Result> {
override fun onSuccess(data: TokenChunkEventPersistor.Result) {
@ -415,7 +414,6 @@ internal class DefaultTimeline(
}
})
.executeBy(taskExecutor)
.addTo(cancelableBag)
}

/**