mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Both UI timer and database timer will remove expired message

Browse source
This commit is contained in:
Scott Nonnenberg 2018-08-09 16:18:10 -07:00
parent 9f920aa35b
commit 37f3054976
4 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/models/messages.js
View file

@ -83,6 +83,7 @@
this.on('change:expirationStartTimestamp', this.setToExpire);
this.on('change:expireTimer', this.setToExpire);
this.on('unload', this.unload);
this.on('expired', this.onExpired);
this.setToExpire();
},
idForLogging() {
@ -233,7 +234,9 @@
this.quotedMessage = null;
}
},
onExpired() {
this.hasExpired = true;
},
getPropsForTimerNotification() {
const { expireTimer, fromSync, source } = this.get(
'expirationTimerUpdate'
@ -424,6 +427,7 @@
attachment: this.getPropsForAttachment(firstAttachment),
quote: this.getPropsForQuote(),
authorAvatarPath,
isExpired: this.hasExpired,
expirationLength,
expirationTimestamp,
onReply: () => this.trigger('reply', this),