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

Simplify signature, userId is a member of the class

This commit is contained in:
Benoit Marty 2021-03-19 15:38:14 +01:00
parent 294df236c5
commit 7e2a5e55f7
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
View File

@ -53,8 +53,9 @@ import org.matrix.android.sdk.internal.session.EventInsertLiveProcessor
import timber.log.Timber import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
internal class EventRelationsAggregationProcessor @Inject constructor(@UserId private val userId: String) internal class EventRelationsAggregationProcessor @Inject constructor(
: EventInsertLiveProcessor { @UserId private val userId: String
) : EventInsertLiveProcessor {
private val allowedTypes = listOf( private val allowedTypes = listOf(
EventType.MESSAGE, EventType.MESSAGE,
@ -87,7 +88,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
EventType.REACTION -> { EventType.REACTION -> {
// we got a reaction!! // we got a reaction!!
Timber.v("###REACTION in room $roomId , reaction eventID ${event.eventId}") Timber.v("###REACTION in room $roomId , reaction eventID ${event.eventId}")
handleReaction(event, roomId, realm, userId, isLocalEcho) handleReaction(event, roomId, realm, isLocalEcho)
} }
EventType.MESSAGE -> { EventType.MESSAGE -> {
if (event.unsignedData?.relations?.annotations != null) { if (event.unsignedData?.relations?.annotations != null) {
@ -108,7 +109,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
handleReplace(realm, event, content, roomId, isLocalEcho) handleReplace(realm, event, content, roomId, isLocalEcho)
} else if (content?.relatesTo?.type == RelationType.RESPONSE) { } else if (content?.relatesTo?.type == RelationType.RESPONSE) {
Timber.v("###RESPONSE in room $roomId for event ${event.eventId}") Timber.v("###RESPONSE in room $roomId for event ${event.eventId}")
handleResponse(realm, userId, event, content, roomId, isLocalEcho) handleResponse(realm, event, content, roomId, isLocalEcho)
} }
} }
@ -122,7 +123,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
Timber.v("## SAS REF in room $roomId for event ${event.eventId}") Timber.v("## SAS REF in room $roomId for event ${event.eventId}")
event.content.toModel<MessageRelationContent>()?.relatesTo?.let { event.content.toModel<MessageRelationContent>()?.relatesTo?.let {
if (it.type == RelationType.REFERENCE && it.eventId != null) { if (it.type == RelationType.REFERENCE && it.eventId != null) {
handleVerification(realm, event, roomId, isLocalEcho, it.eventId, userId) handleVerification(realm, event, roomId, isLocalEcho, it.eventId)
} }
} }
} }
@ -140,7 +141,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
handleReplace(realm, event, it, roomId, isLocalEcho, encryptedEventContent.relatesTo.eventId) handleReplace(realm, event, it, roomId, isLocalEcho, encryptedEventContent.relatesTo.eventId)
} else if (encryptedEventContent.relatesTo.type == RelationType.RESPONSE) { } else if (encryptedEventContent.relatesTo.type == RelationType.RESPONSE) {
Timber.v("###RESPONSE in room $roomId for event ${event.eventId}") Timber.v("###RESPONSE in room $roomId for event ${event.eventId}")
handleResponse(realm, userId, event, it, roomId, isLocalEcho, encryptedEventContent.relatesTo.eventId) handleResponse(realm, event, it, roomId, isLocalEcho, encryptedEventContent.relatesTo.eventId)
} }
} }
} else if (encryptedEventContent?.relatesTo?.type == RelationType.REFERENCE) { } else if (encryptedEventContent?.relatesTo?.type == RelationType.REFERENCE) {
@ -154,7 +155,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
EventType.KEY_VERIFICATION_KEY -> { EventType.KEY_VERIFICATION_KEY -> {
Timber.v("## SAS REF in room $roomId for event ${event.eventId}") Timber.v("## SAS REF in room $roomId for event ${event.eventId}")
encryptedEventContent.relatesTo.eventId?.let { encryptedEventContent.relatesTo.eventId?.let {
handleVerification(realm, event, roomId, isLocalEcho, it, userId) handleVerification(realm, event, roomId, isLocalEcho, it)
} }
} }
} }
@ -163,7 +164,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
if (event.getClearType() == EventType.REACTION) { if (event.getClearType() == EventType.REACTION) {
// we got a reaction!! // we got a reaction!!
Timber.v("###REACTION e2e in room $roomId , reaction eventID ${event.eventId}") Timber.v("###REACTION e2e in room $roomId , reaction eventID ${event.eventId}")
handleReaction(event, roomId, realm, userId, isLocalEcho) handleReaction(event, roomId, realm, isLocalEcho)
} }
} }
} }
@ -183,7 +184,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
} }
} }
EventType.REACTION -> { EventType.REACTION -> {
handleReactionRedact(eventToPrune, realm, userId) handleReactionRedact(eventToPrune, realm)
} }
} }
} }
@ -274,7 +275,6 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
} }
private fun handleResponse(realm: Realm, private fun handleResponse(realm: Realm,
userId: String,
event: Event, event: Event,
content: MessageContent, content: MessageContent,
roomId: String, roomId: String,
@ -383,7 +383,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
} }
} }
private fun handleReaction(event: Event, roomId: String, realm: Realm, userId: String, isLocalEcho: Boolean) { private fun handleReaction(event: Event, roomId: String, realm: Realm, isLocalEcho: Boolean) {
val content = event.content.toModel<ReactionContent>() val content = event.content.toModel<ReactionContent>()
if (content == null) { if (content == null) {
Timber.e("Malformed reaction content ${event.content}") Timber.e("Malformed reaction content ${event.content}")
@ -464,7 +464,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
sourceToDiscard.deleteFromRealm() sourceToDiscard.deleteFromRealm()
} }
private fun handleReactionRedact(eventToPrune: EventEntity, realm: Realm, userId: String) { private fun handleReactionRedact(eventToPrune: EventEntity, realm: Realm) {
Timber.v("REDACTION of reaction ${eventToPrune.eventId}") Timber.v("REDACTION of reaction ${eventToPrune.eventId}")
// delete a reaction, need to update the annotation summary if any // delete a reaction, need to update the annotation summary if any
val reactionContent: ReactionContent = EventMapper.map(eventToPrune).content.toModel() ?: return val reactionContent: ReactionContent = EventMapper.map(eventToPrune).content.toModel() ?: return
@ -501,7 +501,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
} }
} }
private fun handleVerification(realm: Realm, event: Event, roomId: String, isLocalEcho: Boolean, relatedEventId: String, userId: String) { private fun handleVerification(realm: Realm, event: Event, roomId: String, isLocalEcho: Boolean, relatedEventId: String) {
val eventSummary = EventAnnotationsSummaryEntity.getOrCreate(realm, roomId, relatedEventId) val eventSummary = EventAnnotationsSummaryEntity.getOrCreate(realm, roomId, relatedEventId)
val verifSummary = eventSummary.referencesSummaryEntity val verifSummary = eventSummary.referencesSummaryEntity