mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-28 13:38:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

Change order of parameters

Browse source
This commit is contained in:
Benoit Marty 2019-10-18 14:32:34 +02:00
parent 8078c39d6e
commit 17636019e0
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/RelationService.kt
View file

@ -50,19 +50,19 @@ interface RelationService {
/** /**
* Sends a reaction (emoji) to the targetedEvent. * Sends a reaction (emoji) to the targetedEvent.
* @param reaction the reaction (preferably emoji)
* @param targetEventId the id of the event being reacted * @param targetEventId the id of the event being reacted
* @param reaction the reaction (preferably emoji)
*/ */
fun sendReaction(reaction: String, fun sendReaction(targetEventId: String,
targetEventId: String): Cancelable reaction: String): Cancelable
/** /**
* Undo a reaction (emoji) to the targetedEvent. * Undo a reaction (emoji) to the targetedEvent.
* @param reaction the reaction (preferably emoji)
* @param targetEventId the id of the event being reacted * @param targetEventId the id of the event being reacted
* @param reaction the reaction (preferably emoji)
*/ */
fun undoReaction(reaction: String, fun undoReaction(targetEventId: String,
targetEventId: String) : Cancelable reaction: String): Cancelable
/** /**
* Edit a text message body. Limited to "m.text" contentType * Edit a text message body. Limited to "m.text" contentType

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

@ -65,7 +65,7 @@ internal class DefaultRelationService @AssistedInject constructor(@Assisted priv
fun create(roomId: String): RelationService fun create(roomId: String): RelationService
} }
override fun sendReaction(reaction: String, targetEventId: String): Cancelable { override fun sendReaction(targetEventId: String, reaction: String): Cancelable {
val event = eventFactory.createReactionEvent(roomId, targetEventId, reaction) val event = eventFactory.createReactionEvent(roomId, targetEventId, reaction)
.also { .also {
saveLocalEcho(it) saveLocalEcho(it)
@ -75,7 +75,7 @@ internal class DefaultRelationService @AssistedInject constructor(@Assisted priv
return CancelableWork(context, sendRelationWork.id) return CancelableWork(context, sendRelationWork.id)
} }
override fun undoReaction(reaction: String, targetEventId: String): Cancelable { override fun undoReaction(targetEventId: String, reaction: String): Cancelable {
val params = FindReactionEventForUndoTask.Params( val params = FindReactionEventForUndoTask.Params(
roomId, roomId,
targetEventId, targetEventId,

2
matrix-sdk-android/src/test/java/im/vector/matrix/android/api/pushrules/PushrulesConditionTest.kt
View file

@ -330,7 +330,7 @@ class PushrulesConditionTest {
TODO("not implemented") // To change body of created functions use File | Settings | File Templates. TODO("not implemented") // To change body of created functions use File | Settings | File Templates.
} }
override fun sendReaction(reaction: String, targetEventId: String): Cancelable { override fun sendReaction(targetEventId: String, reaction: String): Cancelable {
TODO("not implemented") // To change body of created functions use File | Settings | File Templates. TODO("not implemented") // To change body of created functions use File | Settings | File Templates.
} }

8
vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
View file

@ -445,7 +445,7 @@ class RoomDetailViewModel @AssistedInject constructor(@Assisted initialState: Ro
} }
private fun handleSendReaction(action: RoomDetailActions.SendReaction) { private fun handleSendReaction(action: RoomDetailActions.SendReaction) {
room.sendReaction(action.reaction, action.targetEventId) room.sendReaction(action.targetEventId, action.reaction)
} }
private fun handleRedactEvent(action: RoomDetailActions.RedactAction) { private fun handleRedactEvent(action: RoomDetailActions.RedactAction) {
@ -454,14 +454,14 @@ class RoomDetailViewModel @AssistedInject constructor(@Assisted initialState: Ro
} }
private fun handleUndoReact(action: RoomDetailActions.UndoReaction) { private fun handleUndoReact(action: RoomDetailActions.UndoReaction) {
room.undoReaction(action.reaction, action.targetEventId) room.undoReaction(action.targetEventId, action.reaction)
} }
private fun handleUpdateQuickReaction(action: RoomDetailActions.UpdateQuickReactAction) { private fun handleUpdateQuickReaction(action: RoomDetailActions.UpdateQuickReactAction) {
if (action.add) { if (action.add) {
room.sendReaction(action.selectedReaction, action.targetEventId) room.sendReaction(action.targetEventId, action.selectedReaction)
} else { } else {
room.undoReaction(action.selectedReaction, action.targetEventId) room.undoReaction(action.targetEventId, action.selectedReaction)
} }
} }