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

Merge tag 'v1.5.1' into sc 

Note: we already had picked the internal v1.5.1 patch for the security
release, but we still do this merge to make git merge happy again for
future merges, and also clean up a little bit of UI things that I did
for that patch but abandonned later.

Change-Id: I51b674093e6f32e19fc9556109fb0d231d8f8f3e
This commit is contained in:
SpiritCroc 2022-10-07 19:32:26 +02:00
parent cbffb06c97 aa42746034
commit c634bb74e5
6 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.md
View File

@ -1,11 +1,11 @@
Changes in Element v1.5.1 (2022-09-23) Changes in Element v1.5.1 (2022-09-28)
====================================== ======================================
Security ⚠️ Security ⚠️
---------- ----------
This update provides important security fixes, update now. This update provides important security fixes, update now.
Ref: CVE-2022-39246 CVE-2022-39248
Changes in Element v1.5.0 (2022-09-23) Changes in Element v1.5.0 (2022-09-23)
====================================== ======================================

1
library/ui-strings/src/main/res/values/strings.xml
View File

@ -2615,6 +2615,7 @@
<string name="unencrypted">Unencrypted</string> <string name="unencrypted">Unencrypted</string>
<string name="encrypted_unverified">Encrypted by an unverified device</string> <string name="encrypted_unverified">Encrypted by an unverified device</string>
<string name="key_authenticity_not_guaranteed">The authenticity of this encrypted message can\'t be guaranteed on this device.</string>
<string name="review_logins">Review where you’re logged in</string> <string name="review_logins">Review where you’re logged in</string>
<string name="verify_other_sessions">Verify all your sessions to ensure your account &amp; messages are safe</string> <string name="verify_other_sessions">Verify all your sessions to ensure your account &amp; messages are safe</string>
<!-- Argument will be replaced by the other session name (e.g, Desktop, mobile) --> <!-- Argument will be replaced by the other session name (e.g, Desktop, mobile) -->

4
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
View File

@ -86,7 +86,7 @@ abstract class AbsBaseMessageItem<H : AbsBaseMessageItem.Holder>(@LayoutRes layo
super.bind(holder) super.bind(holder)
renderReactions(holder, baseAttributes.informationData.reactionsSummary) renderReactions(holder, baseAttributes.informationData.reactionsSummary)
if (!baseAttributes.informationData.messageLayout.showsE2eDecorationInFooter()) { if (!baseAttributes.informationData.messageLayout.showsE2eDecorationInFooter()) {
holder.getEffectiveE2eDecorationView().renderE2EDecoration(baseAttributes.informationData.e2eDecoration) holder.e2EDecorationView.renderE2EDecoration(baseAttributes.informationData.e2eDecoration)
} }
holder.view.onClick(baseAttributes.itemClickListener) holder.view.onClick(baseAttributes.itemClickListener)
holder.view.setOnLongClickListener(baseAttributes.itemLongClickListener) holder.view.setOnLongClickListener(baseAttributes.itemLongClickListener)
@ -190,8 +190,6 @@ abstract class AbsBaseMessageItem<H : AbsBaseMessageItem.Holder>(@LayoutRes layo
val reactionsContainer by bind<ViewGroup>(R.id.reactionsContainer) val reactionsContainer by bind<ViewGroup>(R.id.reactionsContainer)
val informationBottom by bind<ViewGroup>(R.id.informationBottom) val informationBottom by bind<ViewGroup>(R.id.informationBottom)
val e2EDecorationView by bind<ShieldImageView>(R.id.messageE2EDecoration) val e2EDecorationView by bind<ShieldImageView>(R.id.messageE2EDecoration)
open fun getEffectiveE2eDecorationView() = e2EDecorationView
} }
/** /**