6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Fix / clear unknown session map before re-request decrypt

Browse Source
This commit is contained in:
Valere 2019-07-08 12:49:22 +02:00
parent 7096094224
commit ee27d3e047
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TimelineEventDecryptor.kt
View File

@ -38,12 +38,16 @@ internal class TimelineEventDecryptor(
private val newSessionListener = object : NewSessionListener { private val newSessionListener = object : NewSessionListener {
override fun onNewSession(roomId: String?, senderKey: String, sessionId: String) { override fun onNewSession(roomId: String?, senderKey: String, sessionId: String) {
synchronized(unknownSessionsFailure) { synchronized(unknownSessionsFailure) {
val toDecryptAgain = ArrayList<String>()
unknownSessionsFailure[sessionId]?.let { eventIds -> unknownSessionsFailure[sessionId]?.let { eventIds ->
eventIds.forEach { toDecryptAgain.addAll(eventIds)
}
if (toDecryptAgain.isNotEmpty()) {
unknownSessionsFailure[sessionId]?.clear()
toDecryptAgain.forEach {
requestDecryption(it) requestDecryption(it)
} }
} }
unknownSessionsFailure[sessionId]?.clear()
} }
} }



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

@ -55,7 +55,8 @@ class EncryptedItemFactory @Inject constructor(private val messageInformationDat
cryptoError?.name cryptoError?.name
} }


val message = stringProvider.getString(R.string.notice_crypto_unable_to_decrypt, errorDescription) val message = stringProvider.getString(R.string.encrypted_message).takeIf { cryptoError == null }
?: stringProvider.getString(R.string.notice_crypto_unable_to_decrypt, errorDescription)
val spannableStr = span(message) { val spannableStr = span(message) {
textStyle = "italic" textStyle = "italic"
textColor = colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary) textColor = colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)