mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-18 21:10:02 +03:00
Code Issues Projects Releases Packages Wiki Activity

Formating code

Browse source
This commit is contained in:
ariskotsomitopoulos 2022-02-22 20:59:22 +02:00
parent f7f363ce25
commit 79c97ac512
3 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/model/ThreadEditions.kt
View file

@ -1,5 +1,5 @@
/* /*
* Copyright 2020 The Matrix.org Foundation C.I.C. * Copyright 2022 The Matrix.org Foundation C.I.C.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

10
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadSummaryHelper.kt
View file

@ -56,17 +56,9 @@ internal fun ThreadSummaryEntity.updateThreadSummary(
roomMemberContentsByUser: HashMap<String, RoomMemberContent?>) { roomMemberContentsByUser: HashMap<String, RoomMemberContent?>) {
updateThreadSummaryRootEvent(rootThreadEventEntity, roomMemberContentsByUser) updateThreadSummaryRootEvent(rootThreadEventEntity, roomMemberContentsByUser)
updateThreadSummaryLatestEvent(latestThreadEventEntity, roomMemberContentsByUser) updateThreadSummaryLatestEvent(latestThreadEventEntity, roomMemberContentsByUser)
// Update latest event
// latestThreadEventEntity?.toTimelineEventEntity(roomMemberContentsByUser)?.let {
// Timber.i("###THREADS FetchThreadSummariesTask ThreadSummaryEntity updated latest event:${it.eventId} !")
// this.eventEntity?.threadSummaryLatestMessage = it
// }
// Update number of threads
this.isUserParticipating = isUserParticipating this.isUserParticipating = isUserParticipating
numberOfThreads?.let { numberOfThreads?.let {
// Update only when there is an actual value // Update number of threads only when there is an actual value
this.numberOfThreads = it this.numberOfThreads = it
} }
} }

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

@ -197,15 +197,15 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
handleReaction(realm, event, roomId, isLocalEcho) handleReaction(realm, event, roomId, isLocalEcho)
} }
} }
// TODO is that ok?? // HandleInitialAggregatedRelations should also be applied in encrypted messages with annotations
// else if (event.unsignedData?.relations?.annotations != null) { // else if (event.unsignedData?.relations?.annotations != null) {
// Timber.v("###REACTION e2e Aggregation in room $roomId for event ${event.eventId}") // Timber.v("###REACTION e2e Aggregation in room $roomId for event ${event.eventId}")
// handleInitialAggregatedRelations(realm, event, roomId, event.unsignedData.relations.annotations) // handleInitialAggregatedRelations(realm, event, roomId, event.unsignedData.relations.annotations)
// // EventAnnotationsSummaryEntity.where(realm, roomId, event.eventId ?: "").findFirst() // EventAnnotationsSummaryEntity.where(realm, roomId, event.eventId ?: "").findFirst()
// // ?.let { // ?.let {
// // TimelineEventEntity.where(realm, roomId = roomId, eventId = event.eventId ?: "").findAll() // TimelineEventEntity.where(realm, roomId = roomId, eventId = event.eventId ?: "").findAll()
// // ?.forEach { tet -> tet.annotations = it } // ?.forEach { tet -> tet.annotations = it }
// // } // }
// } // }
} }
EventType.REDACTION -> { EventType.REDACTION -> {