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

klint cleaning

Browse source
This commit is contained in:
Valere 2020-01-05 11:49:29 +01:00 committed by Benoit Marty
parent 0cea26ec77
commit 6001ac60ab
7 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/PollSummaryContent.kt
View file

@ -24,7 +24,7 @@ import com.squareup.moshi.JsonClass
*/ */
@JsonClass(generateAdapter = true) @JsonClass(generateAdapter = true)
data class PollSummaryContent( data class PollSummaryContent(
//Index of my vote // Index of my vote
var myVote: Int? = null, var myVote: Int? = null,
// Array of VoteInfo, list is constructed so that there is only one vote by user // Array of VoteInfo, list is constructed so that there is only one vote by user
// And that optionIndex is valid // And that optionIndex is valid

4
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventAnnotationsSummaryMapper.kt
View file

@ -16,16 +16,12 @@
package im.vector.matrix.android.internal.database.mapper package im.vector.matrix.android.internal.database.mapper
import im.vector.matrix.android.api.session.events.model.toContent
import im.vector.matrix.android.api.session.events.model.toModel
import im.vector.matrix.android.api.session.room.model.EditAggregatedSummary import im.vector.matrix.android.api.session.room.model.EditAggregatedSummary
import im.vector.matrix.android.api.session.room.model.EventAnnotationsSummary import im.vector.matrix.android.api.session.room.model.EventAnnotationsSummary
import im.vector.matrix.android.api.session.room.model.PollResponseAggregatedSummary
import im.vector.matrix.android.api.session.room.model.ReactionAggregatedSummary import im.vector.matrix.android.api.session.room.model.ReactionAggregatedSummary
import im.vector.matrix.android.api.session.room.model.ReferencesAggregatedSummary import im.vector.matrix.android.api.session.room.model.ReferencesAggregatedSummary
import im.vector.matrix.android.internal.database.model.EditAggregatedSummaryEntity import im.vector.matrix.android.internal.database.model.EditAggregatedSummaryEntity
import im.vector.matrix.android.internal.database.model.EventAnnotationsSummaryEntity import im.vector.matrix.android.internal.database.model.EventAnnotationsSummaryEntity
import im.vector.matrix.android.internal.database.model.PollResponseAggregatedSummaryEntity
import im.vector.matrix.android.internal.database.model.ReactionAggregatedSummaryEntity import im.vector.matrix.android.internal.database.model.ReactionAggregatedSummaryEntity
import im.vector.matrix.android.internal.database.model.ReferencesAggregatedSummaryEntity import im.vector.matrix.android.internal.database.model.ReferencesAggregatedSummaryEntity
import io.realm.RealmList import io.realm.RealmList

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

@ -33,7 +33,6 @@ internal object PollResponseAggregatedSummaryEntityMapper {
) )
} }
fun map(model: PollResponseAggregatedSummary): PollResponseAggregatedSummaryEntity { fun map(model: PollResponseAggregatedSummary): PollResponseAggregatedSummaryEntity {
return PollResponseAggregatedSummaryEntity( return PollResponseAggregatedSummaryEntity(
aggregatedContent = ContentMapper.map(model.aggregatedContent.toContent()), aggregatedContent = ContentMapper.map(model.aggregatedContent.toContent()),

12
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/EventRelationsAggregationTask.kt
View file

@ -130,7 +130,7 @@ internal class DefaultEventRelationsAggregationTask @Inject constructor(
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, userId, event, content, roomId, isLocalEcho)
} }
} }
@ -344,11 +344,11 @@ internal class DefaultEventRelationsAggregationTask @Inject constructor(
val votes = sumModel.votes?.toMutableList() ?: ArrayList() val votes = sumModel.votes?.toMutableList() ?: ArrayList()
val existingVoteIndex = votes.indexOfFirst { it.userId == senderId } val existingVoteIndex = votes.indexOfFirst { it.userId == senderId }
if (existingVoteIndex != -1) { if (existingVoteIndex != -1) {
//Is the vote newer? // Is the vote newer?
val existingVote = votes[existingVoteIndex] val existingVote = votes[existingVoteIndex]
if (existingVote.voteTimestamp < eventTimestamp) { if (existingVote.voteTimestamp < eventTimestamp) {
//Take the new one // Take the new one
votes[existingVoteIndex] = VoteInfo(senderId,optionIndex, eventTimestamp) votes[existingVoteIndex] = VoteInfo(senderId, optionIndex, eventTimestamp)
if (userId == senderId) { if (userId == senderId) {
sumModel.myVote = optionIndex sumModel.myVote = optionIndex
} }
@ -357,7 +357,7 @@ internal class DefaultEventRelationsAggregationTask @Inject constructor(
Timber.v("## POLL Ignoring vote (older than known one) eventId:$eventId ") Timber.v("## POLL Ignoring vote (older than known one) eventId:$eventId ")
} }
} else { } else {
votes.add(VoteInfo(senderId,optionIndex, eventTimestamp)) votes.add(VoteInfo(senderId, optionIndex, eventTimestamp))
if (userId == senderId) { if (userId == senderId) {
sumModel.myVote = optionIndex sumModel.myVote = optionIndex
} }
@ -373,8 +373,6 @@ internal class DefaultEventRelationsAggregationTask @Inject constructor(
existingPollSummary.aggregatedContent = ContentMapper.map(sumModel.toContent()) existingPollSummary.aggregatedContent = ContentMapper.map(sumModel.toContent())
} }
private fun handleInitialAggregatedRelations(event: Event, roomId: String, aggregation: AggregatedAnnotation, realm: Realm) { private fun handleInitialAggregatedRelations(event: Event, roomId: String, aggregation: AggregatedAnnotation, realm: Realm) {
if (SHOULD_HANDLE_SERVER_AGREGGATION) { if (SHOULD_HANDLE_SERVER_AGREGGATION) {
aggregation.chunk?.forEach { aggregation.chunk?.forEach {

2
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
View file

@ -88,7 +88,7 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
myVote = it.aggregatedContent?.myVote, myVote = it.aggregatedContent?.myVote,
isClosed = it.closedTime ?: Long.MAX_VALUE > System.currentTimeMillis(), isClosed = it.closedTime ?: Long.MAX_VALUE > System.currentTimeMillis(),
votes = it.aggregatedContent?.votes votes = it.aggregatedContent?.votes
?.groupBy ({ it.optionIndex }, { it.userId }) ?.groupBy({ it.optionIndex }, { it.userId })
?.mapValues { it.value.size } ?.mapValues { it.value.size }
) )
}, },

6
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessagePollItem.kt
View file

@ -87,9 +87,11 @@ abstract class MessagePollItem : AbsMessageItem<MessagePollItem.Holder>() {
if (index < resultLines.size) { if (index < resultLines.size) {
val optionCount = votes?.get(index) ?: 0 val optionCount = votes?.get(index) ?: 0
val count = if (percentMode) { val count = if (percentMode) {
if (totalVotes > 0) if (totalVotes > 0) {
(optionCount / totalVotes.toFloat() * 100).roundToInt().let { "$it%" } (optionCount / totalVotes.toFloat() * 100).roundToInt().let { "$it%" }
else "" } else {
""
}
} else { } else {
optionCount.toString() optionCount.toString()
} }

2
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/PollResultLineView.kt
View file

@ -26,7 +26,6 @@ import butterknife.BindView
import butterknife.ButterKnife import butterknife.ButterKnife
import im.vector.riotx.R import im.vector.riotx.R
import im.vector.riotx.core.extensions.setTextOrHide import im.vector.riotx.core.extensions.setTextOrHide
import im.vector.riotx.features.themes.ThemeUtils
class PollResultLineView @JvmOverloads constructor( class PollResultLineView @JvmOverloads constructor(
context: Context, context: Context,
@ -69,7 +68,6 @@ class PollResultLineView @JvmOverloads constructor(
percentTextView.setTypeface(percentTextView.getTypeface(), if (value) Typeface.BOLD else Typeface.NORMAL) percentTextView.setTypeface(percentTextView.getTypeface(), if (value) Typeface.BOLD else Typeface.NORMAL)
} }
init { init {
inflate(context, R.layout.item_timeline_event_poll_result_item, this) inflate(context, R.layout.item_timeline_event_poll_result_item, this)
orientation = HORIZONTAL orientation = HORIZONTAL