mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2025-01-09 11:55:37 +01:00
Code Issues Projects Releases Wiki Activity

return decrypted type and content

Browse Source
This commit is contained in:
Bruno Windels 2020-09-04 16:41:03 +02:00
parent 7bfcfc9eed
commit a817a9aaf9
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/matrix/room/timeline/entries/EventEntry.js
View File

@ -22,7 +22,7 @@ export class EventEntry extends BaseEntry {
super(fragmentIdComparer); super(fragmentIdComparer);
this._eventEntry = eventEntry; this._eventEntry = eventEntry;
this._decryptionError = null; this._decryptionError = null;
this._isEncrypted = false; this._decryptedEvent = null;
} }
get event() { get event() {
@ -38,7 +38,7 @@ export class EventEntry extends BaseEntry {
} }
get content() { get content() {
return this._eventEntry.event.content; return this._decryptedEvent?.content || this._eventEntry.event.content;
} }
get prevContent() { get prevContent() {
@ -46,7 +46,7 @@ export class EventEntry extends BaseEntry {
} }
get eventType() { get eventType() {
return this._eventEntry.event.type; return this._decryptedEvent?.type || this._eventEntry.event.type;
} }
get stateKey() { get stateKey() {
@ -74,8 +74,7 @@ export class EventEntry extends BaseEntry {
} }
replaceWithDecrypted(event) { replaceWithDecrypted(event) {
this._eventEntry.event = event; this._decryptedEvent = event;
this._isEncrypted = true;
} }
setDecryptionError(err) { setDecryptionError(err) {