mirror of https://github.com/vector-im/riot-web
				
				
				
			Merge pull request #1380 from matrix-org/dbkr/update_roomlist_event_decrypted
Update roomlist when an event is decryptedpull/21833/head
						commit
						8ad69eee49
					
				| 
						 | 
					@ -87,6 +87,7 @@ module.exports = React.createClass({
 | 
				
			||||||
        cli.on("Room.receipt", this.onRoomReceipt);
 | 
					        cli.on("Room.receipt", this.onRoomReceipt);
 | 
				
			||||||
        cli.on("RoomState.events", this.onRoomStateEvents);
 | 
					        cli.on("RoomState.events", this.onRoomStateEvents);
 | 
				
			||||||
        cli.on("RoomMember.name", this.onRoomMemberName);
 | 
					        cli.on("RoomMember.name", this.onRoomMemberName);
 | 
				
			||||||
 | 
					        cli.on("Event.decrypted", this.onEventDecrypted);
 | 
				
			||||||
        cli.on("accountData", this.onAccountData);
 | 
					        cli.on("accountData", this.onAccountData);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        this.refreshRoomList();
 | 
					        this.refreshRoomList();
 | 
				
			||||||
| 
						 | 
					@ -154,6 +155,7 @@ module.exports = React.createClass({
 | 
				
			||||||
            MatrixClientPeg.get().removeListener("Room.receipt", this.onRoomReceipt);
 | 
					            MatrixClientPeg.get().removeListener("Room.receipt", this.onRoomReceipt);
 | 
				
			||||||
            MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents);
 | 
					            MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents);
 | 
				
			||||||
            MatrixClientPeg.get().removeListener("RoomMember.name", this.onRoomMemberName);
 | 
					            MatrixClientPeg.get().removeListener("RoomMember.name", this.onRoomMemberName);
 | 
				
			||||||
 | 
					            MatrixClientPeg.get().removeListener("Event.decrypted", this.onEventDecrypted);
 | 
				
			||||||
            MatrixClientPeg.get().removeListener("accountData", this.onAccountData);
 | 
					            MatrixClientPeg.get().removeListener("accountData", this.onAccountData);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        // cancel any pending calls to the rate_limited_funcs
 | 
					        // cancel any pending calls to the rate_limited_funcs
 | 
				
			||||||
| 
						 | 
					@ -223,6 +225,11 @@ module.exports = React.createClass({
 | 
				
			||||||
        this._delayedRefreshRoomList();
 | 
					        this._delayedRefreshRoomList();
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    onEventDecrypted: function(ev) {
 | 
				
			||||||
 | 
					        // An event being decrypted may mean we need to re-order the room list
 | 
				
			||||||
 | 
					        this._delayedRefreshRoomList();
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    onAccountData: function(ev) {
 | 
					    onAccountData: function(ev) {
 | 
				
			||||||
        if (ev.getType() == 'm.direct') {
 | 
					        if (ev.getType() == 'm.direct') {
 | 
				
			||||||
            this._delayedRefreshRoomList();
 | 
					            this._delayedRefreshRoomList();
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue