mirror of
https://github.com/vector-im/hydrogen-web.git
synced 2024-12-23 11:35:04 +01:00
fix event tiles not updating when event is decrypted when room keys come
This commit is contained in:
parent
2855166239
commit
4875095ea3
@ -144,6 +144,9 @@ export class TilesCollection extends BaseObservableList {
|
|||||||
const tile = this._findTileAtIdx(entry, tileIdx);
|
const tile = this._findTileAtIdx(entry, tileIdx);
|
||||||
if (tile) {
|
if (tile) {
|
||||||
const action = tile.updateEntry(entry, params);
|
const action = tile.updateEntry(entry, params);
|
||||||
|
if (action.shouldReplace) {
|
||||||
|
this._replaceTile(tileIdx, this._tileCreator(entry));
|
||||||
|
}
|
||||||
if (action.shouldRemove) {
|
if (action.shouldRemove) {
|
||||||
this._removeTile(tileIdx, tile);
|
this._removeTile(tileIdx, tile);
|
||||||
}
|
}
|
||||||
@ -164,6 +167,17 @@ export class TilesCollection extends BaseObservableList {
|
|||||||
// merge with neighbours? ... hard to imagine use case for this ...
|
// merge with neighbours? ... hard to imagine use case for this ...
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_replaceTile(tileIdx, newTile) {
|
||||||
|
const prevTile = this._getTileAtIdx(tileIdx - 1);
|
||||||
|
const nextTile = this._getTileAtIdx(tileIdx + 1);
|
||||||
|
this._tiles[tileIdx] = newTile;
|
||||||
|
prevTile?.updateNextSibling(newTile);
|
||||||
|
newTile.updatePreviousSibling(prevTile);
|
||||||
|
newTile.updateNextSibling(nextTile);
|
||||||
|
nextTile?.updatePreviousSibling(newTile);
|
||||||
|
this.emitUpdate(tileIdx, newTile, null);
|
||||||
|
}
|
||||||
|
|
||||||
_removeTile(tileIdx, tile) {
|
_removeTile(tileIdx, tile) {
|
||||||
const prevTile = this._getTileAtIdx(tileIdx - 1);
|
const prevTile = this._getTileAtIdx(tileIdx - 1);
|
||||||
const nextTile = this._getTileAtIdx(tileIdx + 1);
|
const nextTile = this._getTileAtIdx(tileIdx + 1);
|
||||||
|
@ -15,12 +15,17 @@ limitations under the License.
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
export class UpdateAction {
|
export class UpdateAction {
|
||||||
constructor(remove, update, updateParams) {
|
constructor(remove, update, replace, updateParams) {
|
||||||
this._remove = remove;
|
this._remove = remove;
|
||||||
this._update = update;
|
this._update = update;
|
||||||
|
this._replace = replace;
|
||||||
this._updateParams = updateParams;
|
this._updateParams = updateParams;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get shouldReplace() {
|
||||||
|
return this._replace;
|
||||||
|
}
|
||||||
|
|
||||||
get shouldRemove() {
|
get shouldRemove() {
|
||||||
return this._remove;
|
return this._remove;
|
||||||
}
|
}
|
||||||
@ -34,14 +39,18 @@ export class UpdateAction {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static Remove() {
|
static Remove() {
|
||||||
return new UpdateAction(true, false, null);
|
return new UpdateAction(true, false, false, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Update(newParams) {
|
static Update(newParams) {
|
||||||
return new UpdateAction(false, true, newParams);
|
return new UpdateAction(false, true, false, newParams);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Nothing() {
|
static Nothing() {
|
||||||
return new UpdateAction(false, false, null);
|
return new UpdateAction(false, false, false, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
static Replace() {
|
||||||
|
return new UpdateAction(false, false, true, null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -15,8 +15,19 @@ limitations under the License.
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import {MessageTile} from "./MessageTile.js";
|
import {MessageTile} from "./MessageTile.js";
|
||||||
|
import {UpdateAction} from "../UpdateAction.js";
|
||||||
|
|
||||||
export class EncryptedEventTile extends MessageTile {
|
export class EncryptedEventTile extends MessageTile {
|
||||||
|
updateEntry(entry, params) {
|
||||||
|
const parentResult = super.updateEntry(entry, params);
|
||||||
|
// event got decrypted, recreate the tile and replace this one with it
|
||||||
|
if (entry.eventType !== "m.room.encrypted") {
|
||||||
|
return UpdateAction.Replace();
|
||||||
|
} else {
|
||||||
|
return parentResult;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
get text() {
|
get text() {
|
||||||
return this.i18n`**Encrypted message**`;
|
return this.i18n`**Encrypted message**`;
|
||||||
}
|
}
|
||||||
|
@ -64,9 +64,9 @@ export class SimpleTile extends ViewModel {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// update received for already included (falls within sort keys) entry
|
// update received for already included (falls within sort keys) entry
|
||||||
updateEntry(entry) {
|
updateEntry(entry, params) {
|
||||||
this._entry = entry;
|
this._entry = entry;
|
||||||
return UpdateAction.Nothing();
|
return UpdateAction.Update(params);
|
||||||
}
|
}
|
||||||
|
|
||||||
// return whether the tile should be removed
|
// return whether the tile should be removed
|
||||||
|
@ -45,6 +45,7 @@ export class SortedArray extends BaseObservableList {
|
|||||||
const idx = this.indexOf(item);
|
const idx = this.indexOf(item);
|
||||||
if (idx !== -1) {
|
if (idx !== -1) {
|
||||||
this._items[idx] = item;
|
this._items[idx] = item;
|
||||||
|
this.emitUpdate(idx, item, null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ import {renderMessage} from "./common.js";
|
|||||||
export class TextMessageView extends TemplateView {
|
export class TextMessageView extends TemplateView {
|
||||||
render(t, vm) {
|
render(t, vm) {
|
||||||
return renderMessage(t, vm,
|
return renderMessage(t, vm,
|
||||||
[t.p([vm.text, t.time({className: {hidden: !vm.date}}, vm.date + " " + vm.time)])]
|
[t.p([vm => vm.text, t.time({className: {hidden: !vm.date}}, vm.date + " " + vm.time)])]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user