Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 20:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Differentiate between local and remote trust decisions

Browse Source 
FREEBIE
This commit is contained in:
Scott Nonnenberg
2017-06-19 11:45:42 -07:00
parent 20f4d48991
commit 1e8ae774a2
3 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/models/conversations.js
View File

@@ -101,7 +101,7 @@
return promise.then(function() {
return this.save({verified: DEFAULT});
}.bind(this)).then(function() {
this.addVerifiedChange(this.id, false);
this.addVerifiedChange(this.id, false, {local: !options.viaSyncMessage});
if (!options.viaSyncMessage) {
this.sendVerifySyncMessage(this.id, DEFAULT);
}
@@ -134,7 +134,7 @@
return promise.then(function() {
return this.save({verified: VERIFIED});
}.bind(this)).then(function() {
this.addVerifiedChange(this.id, true);
this.addVerifiedChange(this.id, true, {local: !options.viaSyncMessage});
if (!options.viaSyncMessage) {
this.sendVerifySyncMessage(this.id, VERIFIED);
}
@@ -270,7 +270,10 @@
});
message.save().then(this.trigger.bind(this,'newmessage', message));
},
addVerifiedChange: function(id, verified) {
addVerifiedChange: function(id, verified, options) {
options = options || {};
_.defaults(options, {local: true});
console.log('adding verified change advisory for', this.id, id, this.get('timestamp'));
var timestamp = Date.now();
var message = new Whisper.Message({
@@ -280,7 +283,8 @@
sent_at : this.get('timestamp'),
received_at : timestamp,
verifiedChanged : id,
verified : verified
verified : verified,
local : options.local
});
message.save().then(this.trigger.bind(this,'newmessage', message));