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

cleaning

This commit is contained in:
Valere 2020-04-08 14:43:32 +02:00
parent 08af61b778
commit f04d8b0e03
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
View File

@ -41,7 +41,6 @@ class EncryptionItemFactory @Inject constructor(
fun create(event: TimelineEvent,
highlight: Boolean,
callback: TimelineEventController.Callback?): StatusTileTimelineItem? {
val algorithm = event.root.getClearContent().toModel<EncryptionEventContent>()?.algorithm
val informationData = informationDataFactory.create(event, null)
val attributes = messageItemAttributesFactory.create(null, informationData, callback)

7
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
View File

@ -116,7 +116,12 @@ class MergedHeaderItemFactory @Inject constructor(private val sessionHolder: Act
}
}
private fun buildRoomCreationMergedSummary(currentPosition: Int, items: List<TimelineEvent>, event: TimelineEvent, eventIdToHighlight: String?, requestModelBuild: () -> Unit, callback: TimelineEventController.Callback?): MergedRoomCreationItem_? {
private fun buildRoomCreationMergedSummary(currentPosition: Int,
items: List<TimelineEvent>,
event: TimelineEvent,
eventIdToHighlight: String?,
requestModelBuild: () -> Unit,
callback: TimelineEventController.Callback?): MergedRoomCreationItem_? {
var prevEvent = if (currentPosition > 0) items[currentPosition - 1] else null
var tmpPos = currentPosition - 1
val mergedEvents = ArrayList<TimelineEvent>().also { it.add(event) }

4
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
View File

@ -95,7 +95,7 @@ class VerificationItemFactory @Inject constructor(
.attributes(
StatusTileTimelineItem.Attributes(
title = stringProvider.getString(R.string.verification_conclusion_warning),
description = "${informationData.memberName.toString()} (${informationData.senderId})",
description = "${informationData.memberName} (${informationData.senderId})",
shieldUIState = StatusTileTimelineItem.ShieldUIState.RED,
informationData = informationData,
avatarRenderer = attributes.avatarRenderer,
@ -128,7 +128,7 @@ class VerificationItemFactory @Inject constructor(
.attributes(
StatusTileTimelineItem.Attributes(
title = stringProvider.getString(R.string.sas_verified),
description = "${informationData.memberName.toString()} (${informationData.senderId})",
description = "${informationData.memberName} (${informationData.senderId})",
shieldUIState = StatusTileTimelineItem.ShieldUIState.GREEN,
informationData = informationData,
avatarRenderer = attributes.avatarRenderer,

3
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
View File

@ -24,14 +24,12 @@ import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.core.view.isGone
import androidx.core.view.isVisible
import androidx.core.view.marginLeft
import androidx.core.view.updateLayoutParams
import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotx.R
import im.vector.riotx.features.home.AvatarRenderer
import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
import org.w3c.dom.Text
@EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo)
abstract class MergedRoomCreationItem : BasedMergedItem<MergedRoomCreationItem.Holder>() {
@ -45,7 +43,6 @@ abstract class MergedRoomCreationItem : BasedMergedItem<MergedRoomCreationItem.H
super.bind(holder)
if (attributes.isCollapsed) {
val data = distinctMergeData.firstOrNull()
val summary = holder.expandView.resources.getString(R.string.room_created_summary_item,