11/*
22Copyright 2015, 2016 OpenMarket Ltd
33Copyright 2017 Vector Creations Ltd
4+ Copyright 2017 New Vector Ltd
45
56Licensed under the Apache License, Version 2.0 (the "License");
67you may not use this file except in compliance with the License.
@@ -33,9 +34,16 @@ import Modal from './Modal';
3334 * }
3435 */
3536
37+ const MAX_PENDING_ENCRYPTED = 20 ;
38+
3639const Notifier = {
3740 notifsByRoom : { } ,
3841
42+ // A list of event IDs that we've received but need to wait until
43+ // they're decrypted until we decide whether to notify for them
44+ // or not
45+ pendingEncryptedEventIds : [ ] ,
46+
3947 notificationMessageForEvent : function ( ev ) {
4048 return TextForEvent . textForEvent ( ev ) ;
4149 } ,
@@ -89,26 +97,28 @@ const Notifier = {
8997 _playAudioNotification : function ( ev , room ) {
9098 const e = document . getElementById ( "messageAudio" ) ;
9199 if ( e ) {
92- e . load ( ) ;
93100 e . play ( ) ;
94101 }
95102 } ,
96103
97104 start : function ( ) {
98- this . boundOnRoomTimeline = this . onRoomTimeline . bind ( this ) ;
105+ this . boundOnEvent = this . onEvent . bind ( this ) ;
99106 this . boundOnSyncStateChange = this . onSyncStateChange . bind ( this ) ;
100107 this . boundOnRoomReceipt = this . onRoomReceipt . bind ( this ) ;
101- MatrixClientPeg . get ( ) . on ( 'Room.timeline' , this . boundOnRoomTimeline ) ;
108+ this . boundOnEventDecrypted = this . onEventDecrypted . bind ( this ) ;
109+ MatrixClientPeg . get ( ) . on ( 'event' , this . boundOnEvent ) ;
102110 MatrixClientPeg . get ( ) . on ( 'Room.receipt' , this . boundOnRoomReceipt ) ;
111+ MatrixClientPeg . get ( ) . on ( 'Event.decrypted' , this . boundOnEventDecrypted ) ;
103112 MatrixClientPeg . get ( ) . on ( "sync" , this . boundOnSyncStateChange ) ;
104113 this . toolbarHidden = false ;
105114 this . isSyncing = false ;
106115 } ,
107116
108117 stop : function ( ) {
109118 if ( MatrixClientPeg . get ( ) && this . boundOnRoomTimeline ) {
110- MatrixClientPeg . get ( ) . removeListener ( 'Room.timeline ' , this . boundOnRoomTimeline ) ;
119+ MatrixClientPeg . get ( ) . removeListener ( 'Event ' , this . boundOnEvent ) ;
111120 MatrixClientPeg . get ( ) . removeListener ( 'Room.receipt' , this . boundOnRoomReceipt ) ;
121+ MatrixClientPeg . get ( ) . removeListener ( 'Event.decrypted' , this . boundOnEventDecrypted ) ;
112122 MatrixClientPeg . get ( ) . removeListener ( 'sync' , this . boundOnSyncStateChange ) ;
113123 }
114124 this . isSyncing = false ;
@@ -237,23 +247,30 @@ const Notifier = {
237247 }
238248 } ,
239249
240- onRoomTimeline : function ( ev , room , toStartOfTimeline , removed , data ) {
241- if ( toStartOfTimeline ) return ;
242- if ( ! room ) return ;
250+ onEvent : function ( ev ) {
243251 if ( ! this . isSyncing ) return ; // don't alert for any messages initially
244252 if ( ev . sender && ev . sender . userId === MatrixClientPeg . get ( ) . credentials . userId ) return ;
245- if ( data . timeline . getTimelineSet ( ) !== room . getUnfilteredTimelineSet ( ) ) return ;
246253
247- const actions = MatrixClientPeg . get ( ) . getPushActionsForEvent ( ev ) ;
248- if ( actions && actions . notify ) {
249- if ( this . isEnabled ( ) ) {
250- this . _displayPopupNotification ( ev , room ) ;
251- }
252- if ( actions . tweaks . sound && this . isAudioEnabled ( ) ) {
253- PlatformPeg . get ( ) . loudNotification ( ev , room ) ;
254- this . _playAudioNotification ( ev , room ) ;
254+ // If it's an encrypted event and the type is still 'm.room.encrypted',
255+ // it hasn't yet been decrypted, so wait until it is.
256+ if ( ev . isBeingDecrypted ( ) || ev . isDecryptionFailure ( ) ) {
257+ this . pendingEncryptedEventIds . push ( ev . getId ( ) ) ;
258+ // don't let the list fill up indefinitely
259+ while ( this . pendingEncryptedEventIds . length > MAX_PENDING_ENCRYPTED ) {
260+ this . pendingEncryptedEventIds . shift ( ) ;
255261 }
262+ return ;
256263 }
264+
265+ this . _evaluateEvent ( ev ) ;
266+ } ,
267+
268+ onEventDecrypted : function ( ev ) {
269+ const idx = this . pendingEncryptedEventIds . indexOf ( ev . getId ( ) ) ;
270+ if ( idx === - 1 ) return ;
271+
272+ this . pendingEncryptedEventIds . splice ( idx , 1 ) ;
273+ this . _evaluateEvent ( ev ) ;
257274 } ,
258275
259276 onRoomReceipt : function ( ev , room ) {
@@ -273,6 +290,20 @@ const Notifier = {
273290 delete this . notifsByRoom [ room . roomId ] ;
274291 }
275292 } ,
293+
294+ _evaluateEvent : function ( ev ) {
295+ const room = MatrixClientPeg . get ( ) . getRoom ( ev . getRoomId ( ) ) ;
296+ const actions = MatrixClientPeg . get ( ) . getPushActionsForEvent ( ev ) ;
297+ if ( actions && actions . notify ) {
298+ if ( this . isEnabled ( ) ) {
299+ this . _displayPopupNotification ( ev , room ) ;
300+ }
301+ if ( actions . tweaks . sound && this . isAudioEnabled ( ) ) {
302+ PlatformPeg . get ( ) . loudNotification ( ev , room ) ;
303+ this . _playAudioNotification ( ev , room ) ;
304+ }
305+ }
306+ }
276307} ;
277308
278309if ( ! global . mxNotifier ) {
0 commit comments