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

Support AddedByMe in reaction + context menu reflect agree/like state

Browse Source
This commit is contained in:
Valere
2019-05-16 10:48:33 +02:00
parent a9a1fe2aa0
commit 6fe455dac0
6 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventMapper.kt
View File

@ -45,6 +45,7 @@ internal object EventMapper {
}
fun map(eventEntity: EventEntity): Event {
//TODO proxy the event to only parse unsigned data when accessed?
var ud = if (eventEntity.unsignedData.isNullOrBlank()) null
else MoshiProvider.providesMoshi().adapter(UnsignedData::class.java).fromJson(eventEntity.unsignedData)
return Event(

2
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt
View File

@ -104,7 +104,7 @@ internal class SessionModule(private val sessionParams: SessionParams) {
}
scope(DefaultSession.SCOPE) {
EventRelationsAggregationUpdater()
EventRelationsAggregationUpdater(get())
}
scope(DefaultSession.SCOPE) {

5
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/EventRelationsAggregationUpdater.kt
View File

@ -1,5 +1,6 @@
package im.vector.matrix.android.internal.session.room
import im.vector.matrix.android.api.auth.data.Credentials
import im.vector.matrix.android.api.session.events.model.*
import im.vector.matrix.android.api.session.room.model.annotation.ReactionContent
import im.vector.matrix.android.internal.database.model.EventAnnotationsSummaryEntity
@ -10,7 +11,7 @@ import io.realm.Realm
import timber.log.Timber
internal class EventRelationsAggregationUpdater {
internal class EventRelationsAggregationUpdater(private val credentials: Credentials) {
fun update(realm: Realm, roomId: String, events: List<Event>?) {
events?.forEach { event ->
@ -66,12 +67,14 @@ internal class EventRelationsAggregationUpdater {
sum.key = reaction
sum.firstTimestamp = event.originServerTs ?: 0
sum.count = 1
sum.addedByMe = sum.addedByMe || (credentials.userId == event.sender)
eventSummary.reactionsSummary.add(sum)
} else {
//is this a known event (is possible? pagination?)
if (!sum.sourceEvents.contains(eventId)) {
sum.count += 1
sum.sourceEvents.add(eventId)
sum.addedByMe = sum.addedByMe || (credentials.userId == event.sender)
}
}