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

6
js/models/conversations.js
View file

@ -899,13 +899,12 @@
providedExpireTimer,
providedSource,
receivedAt,
providedOptions
options = {}
) {
const options = providedOptions || {};
let expireTimer = providedExpireTimer;
let source = providedSource;
_.defaults(options, { fromSync: false });
_.defaults(options, { fromSync: false, fromGroupUpdate: false });
if (!expireTimer) {
expireTimer = null;
@ -942,6 +941,7 @@
expireTimer,
source,
fromSync: options.fromSync,
fromGroupUpdate: options.fromGroupUpdate,
},
});
if (this.isPrivate()) {