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

klint

This commit is contained in:
Valere 2019-12-30 17:54:44 +01:00
parent 5b33a42f8a
commit 2152af8851
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,10 +113,11 @@ class VerificationItemFactory @Inject constructor(
}
EventType.KEY_VERIFICATION_DONE -> {
// Is the request referenced is actually really completed?
if (referenceInformationData.referencesInfoData?.verificationStatus != VerificationState.DONE)
if (referenceInformationData.referencesInfoData?.verificationStatus != VerificationState.DONE) {
return ignoredConclusion(event, highlight, callback)
}
// We only tale the one sent by me
if (informationData.sentByMe) {
// We only display the done sent by the other user, the done send by me is ignored
return ignoredConclusion(event, highlight, callback)

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

@ -58,19 +58,17 @@ abstract class VerificationRequestItem : AbsBaseMessageItem<VerificationRequestI
this.marginEnd = leftGuideline
}
holder.titleView.text = if (attributes.informationData.sentByMe)
holder.titleView.text = if (attributes.informationData.sentByMe) {
holder.view.context.getString(R.string.verification_sent)
// + "\n ${attributes.informationData.referencesInfoData?.verificationStatus?.name
// ?: "??"}"
else
} else {
holder.view.context.getString(R.string.verification_request)
// + "\n ${attributes.informationData.referencesInfoData?.verificationStatus?.name
// ?: "??"}"
}
holder.descriptionView.text = if (!attributes.informationData.sentByMe)
holder.descriptionView.text = if (!attributes.informationData.sentByMe) {
"${attributes.informationData.memberName} (${attributes.informationData.senderId})"
else
} else {
"${attributes.otherUserName} (${attributes.otherUserId})"
}
when (attributes.informationData.referencesInfoData?.verificationStatus) {
VerificationState.REQUEST,
@ -96,10 +94,11 @@ abstract class VerificationRequestItem : AbsBaseMessageItem<VerificationRequestI
}
VerificationState.DONE -> {
holder.buttonBar.isVisible = false
holder.statusTextView.text = if (attributes.informationData.sentByMe)
holder.statusTextView.text = if (attributes.informationData.sentByMe) {
holder.view.context.getString(R.string.verification_request_other_accepted, attributes.otherUserName)
else
} else {
holder.view.context.getString(R.string.verification_request_you_accepted)
}
holder.statusTextView.isVisible = true
}
else -> {