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

Handle timer updates along with group updates

Browse source
This commit is contained in:
Scott Nonnenberg 2018-06-25 15:58:55 -07:00
parent 67464774c3
commit 9d9a797bda
4 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/views/message_view.js
View file

@ -103,7 +103,10 @@
const timerUpdate = this.model.get('expirationTimerUpdate');
const prettySeconds = Whisper.ExpirationTimerOptions.getName(seconds);
if (timerUpdate && timerUpdate.fromSync) {
if (
timerUpdate &&
(timerUpdate.fromSync || timerUpdate.fromGroupUpdate)
) {
timerMessage = i18n('timerSetOnSync', prettySeconds);
} else if (this.conversation.id === textsecure.storage.user.getNumber()) {
timerMessage = i18n('youChangedTheTimer', prettySeconds);