filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

typo

This commit is contained in:
Benoit Marty 2020-01-14 15:33:35 +01:00 committed by Valere
parent 9fe155bafd
commit 3b420dbb50
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/DefaultRelationService.kt
View File

@ -52,7 +52,7 @@ import timber.log.Timber
internal class DefaultRelationService @AssistedInject constructor( internal class DefaultRelationService @AssistedInject constructor(
@Assisted private val roomId: String, @Assisted private val roomId: String,
@SessionId private val sessionId: String, @SessionId private val sessionId: String,
private val timeLineEveSendEventWorkCommon: TimelineSendEventWorkCommon, private val timeLineSendEventWorkCommon: TimelineSendEventWorkCommon,
private val eventFactory: LocalEchoEventFactory, private val eventFactory: LocalEchoEventFactory,
private val cryptoService: CryptoService, private val cryptoService: CryptoService,
private val findReactionEventForUndoTask: FindReactionEventForUndoTask, private val findReactionEventForUndoTask: FindReactionEventForUndoTask,
@ -83,7 +83,7 @@ internal class DefaultRelationService @AssistedInject constructor(
val event = eventFactory.createReactionEvent(roomId, targetEventId, reaction) val event = eventFactory.createReactionEvent(roomId, targetEventId, reaction)
.also { saveLocalEcho(it) } .also { saveLocalEcho(it) }
val sendRelationWork = createSendEventWork(event, true) val sendRelationWork = createSendEventWork(event, true)
timeLineEveSendEventWorkCommon.postWork(roomId, sendRelationWork) timeLineSendEventWorkCommon.postWork(roomId, sendRelationWork)
} else { } else {
Timber.w("Reaction already added") Timber.w("Reaction already added")
NoOpCancellable NoOpCancellable
@ -108,7 +108,7 @@ internal class DefaultRelationService @AssistedInject constructor(
.also { saveLocalEcho(it) } .also { saveLocalEcho(it) }
val redactWork = createRedactEventWork(redactEvent, toRedact, null) val redactWork = createRedactEventWork(redactEvent, toRedact, null)
timeLineEveSendEventWorkCommon.postWork(roomId, redactWork) timeLineSendEventWorkCommon.postWork(roomId, redactWork)
} }
} }
} }
@ -129,7 +129,7 @@ internal class DefaultRelationService @AssistedInject constructor(
eventId, eventId,
reason) reason)
val redactWorkData = WorkerParamsFactory.toData(sendContentWorkerParams) val redactWorkData = WorkerParamsFactory.toData(sendContentWorkerParams)
return timeLineEveSendEventWorkCommon.createWork<RedactEventWorker>(redactWorkData, true) return timeLineSendEventWorkCommon.createWork<RedactEventWorker>(redactWorkData, true)
} }
override fun editTextMessage(targetEventId: String, override fun editTextMessage(targetEventId: String,
@ -143,10 +143,10 @@ internal class DefaultRelationService @AssistedInject constructor(
return if (cryptoService.isRoomEncrypted(roomId)) { return if (cryptoService.isRoomEncrypted(roomId)) {
val encryptWork = createEncryptEventWork(event, listOf("m.relates_to")) val encryptWork = createEncryptEventWork(event, listOf("m.relates_to"))
val workRequest = createSendEventWork(event, false) val workRequest = createSendEventWork(event, false)
timeLineEveSendEventWorkCommon.postSequentialWorks(roomId, encryptWork, workRequest) timeLineSendEventWorkCommon.postSequentialWorks(roomId, encryptWork, workRequest)
} else { } else {
val workRequest = createSendEventWork(event, true) val workRequest = createSendEventWork(event, true)
timeLineEveSendEventWorkCommon.postWork(roomId, workRequest) timeLineSendEventWorkCommon.postWork(roomId, workRequest)
} }
} }
@ -163,10 +163,10 @@ internal class DefaultRelationService @AssistedInject constructor(
return if (cryptoService.isRoomEncrypted(roomId)) { return if (cryptoService.isRoomEncrypted(roomId)) {
val encryptWork = createEncryptEventWork(event, listOf("m.relates_to")) val encryptWork = createEncryptEventWork(event, listOf("m.relates_to"))
val workRequest = createSendEventWork(event, false) val workRequest = createSendEventWork(event, false)
timeLineEveSendEventWorkCommon.postSequentialWorks(roomId, encryptWork, workRequest) timeLineSendEventWorkCommon.postSequentialWorks(roomId, encryptWork, workRequest)
} else { } else {
val workRequest = createSendEventWork(event, true) val workRequest = createSendEventWork(event, true)
timeLineEveSendEventWorkCommon.postWork(roomId, workRequest) timeLineSendEventWorkCommon.postWork(roomId, workRequest)
} }
} }
@ -187,10 +187,10 @@ internal class DefaultRelationService @AssistedInject constructor(
return if (cryptoService.isRoomEncrypted(roomId)) { return if (cryptoService.isRoomEncrypted(roomId)) {
val encryptWork = createEncryptEventWork(event, listOf("m.relates_to")) val encryptWork = createEncryptEventWork(event, listOf("m.relates_to"))
val workRequest = createSendEventWork(event, false) val workRequest = createSendEventWork(event, false)
timeLineEveSendEventWorkCommon.postSequentialWorks(roomId, encryptWork, workRequest) timeLineSendEventWorkCommon.postSequentialWorks(roomId, encryptWork, workRequest)
} else { } else {
val workRequest = createSendEventWork(event, true) val workRequest = createSendEventWork(event, true)
timeLineEveSendEventWorkCommon.postWork(roomId, workRequest) timeLineSendEventWorkCommon.postWork(roomId, workRequest)
} }
} }
@ -198,13 +198,13 @@ internal class DefaultRelationService @AssistedInject constructor(
// Same parameter // Same parameter
val params = EncryptEventWorker.Params(sessionId, roomId, event, keepKeys) val params = EncryptEventWorker.Params(sessionId, roomId, event, keepKeys)
val sendWorkData = WorkerParamsFactory.toData(params) val sendWorkData = WorkerParamsFactory.toData(params)
return timeLineEveSendEventWorkCommon.createWork<EncryptEventWorker>(sendWorkData, true) return timeLineSendEventWorkCommon.createWork<EncryptEventWorker>(sendWorkData, true)
} }
private fun createSendEventWork(event: Event, startChain: Boolean): OneTimeWorkRequest { private fun createSendEventWork(event: Event, startChain: Boolean): OneTimeWorkRequest {
val sendContentWorkerParams = SendEventWorker.Params(sessionId, roomId, event) val sendContentWorkerParams = SendEventWorker.Params(sessionId, roomId, event)
val sendWorkData = WorkerParamsFactory.toData(sendContentWorkerParams) val sendWorkData = WorkerParamsFactory.toData(sendContentWorkerParams)
return timeLineEveSendEventWorkCommon.createWork<SendEventWorker>(sendWorkData, startChain) return timeLineSendEventWorkCommon.createWork<SendEventWorker>(sendWorkData, startChain)
} }
override fun getEventAnnotationsSummary(eventId: String): EventAnnotationsSummary? { override fun getEventAnnotationsSummary(eventId: String): EventAnnotationsSummary? {

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

@ -31,7 +31,6 @@ import javax.inject.Inject
* if not the chain will be doomed in failed state. * if not the chain will be doomed in failed state.
*/ */
internal class TimelineSendEventWorkCommon @Inject constructor( internal class TimelineSendEventWorkCommon @Inject constructor(
// TODO @Assisted private val roomId: String,
private val workManagerProvider: WorkManagerProvider private val workManagerProvider: WorkManagerProvider
) { ) {