thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Let key verification view lazy-load keys

Browse source 
// FREEBIE
This commit is contained in:
lilia 2016-09-17 18:59:22 -07:00
parent fe209a2f41
commit c16e80c5e4
4 changed files with 48 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
js/views/conversation_view.js
View file

@ -196,21 +196,10 @@
verifyIdentity: function() { verifyIdentity: function() {
if (this.model.isPrivate()) { if (this.model.isPrivate()) {
var their_number = this.model.id; var view = new Whisper.KeyVerificationPanelView({
var our_number = textsecure.storage.user.getNumber(); model: { their_number: this.model.id }
textsecure.storage.protocol.loadIdentityKey(their_number).then(function(their_key) { });
textsecure.storage.protocol.loadIdentityKey(our_number).then(function(our_key) { this.listenBack(view);
var view = new Whisper.KeyVerificationPanelView({
model: {
your_number: our_number,
their_number: their_number,
their_key: their_key,
your_key: our_key
}
});
this.listenBack(view);
}.bind(this));
}.bind(this));
} }
}, },

22
js/views/key_conflict_dialogue_view.js
View file

@ -12,20 +12,14 @@
initialize: function(options) { initialize: function(options) {
this.contact = options.contact; this.contact = options.contact;
this.conversation = options.conversation; this.conversation = options.conversation;
var our_number = textsecure.storage.user.getNumber(); this.render();
textsecure.storage.protocol.loadIdentityKey(our_number).then(function(our_key) { var view = new Whisper.KeyVerificationView({
this.your_key = our_key; model: {
this.render(); their_number: this.model.number,
var view = new Whisper.KeyVerificationView({ their_key : this.model.identityKey,
model: { }
your_number: our_number, });
their_number: this.model.number, view.$el.appendTo(this.$('.keys'));
their_key : this.model.identityKey,
your_key : our_key
}
});
view.$el.appendTo(this.$('.keys'));
}.bind(this));
}, },
events: { events: {
'click .showKeys': 'showKeys', 'click .showKeys': 'showKeys',

41
js/views/key_verification_view.js
View file

@ -37,12 +37,41 @@
className: 'key-verification', className: 'key-verification',
templateName: 'key_verification', templateName: 'key_verification',
initialize: function() { initialize: function() {
this.render(); Promise.all([
/* this.loadTheirKey(),
this.$('.securityNumber').append( this.loadOurKey(),
new SecurityNumberView({model: this.model}).el ]).then(function() {
); this.render();
*/ /*
this.$('.securityNumber').append(
new SecurityNumberView({model: this.model}).el
);
*/
}.bind(this));
},
setOurKey: function(our_key) {
this.model.your_key = our_key;
},
setTheirKey: function(their_key) {
this.model.their_key = their_key;
},
loadTheirKey: function() {
if (this.model.their_key) {
return Promise.resolve(this.model.their_key);
} else {
return textsecure.storage.protocol.loadIdentityKey(
this.model.their_number
).then(this.setTheirKey.bind(this));
}
},
loadOurKey: function() {
if (this.model.your_key) {
return Promise.resolve(this.model.your_key);
} else {
return textsecure.storage.protocol.loadIdentityKey(
textsecure.storage.user.getNumber()
).then(this.setOurKey.bind(this));
}
}, },
splitKey: function(key) { splitKey: function(key) {
// key is an array buffer // key is an array buffer

2
js/views/message_detail_view.js
View file

@ -62,7 +62,7 @@
model: conflict, model: conflict,
contact: contact, contact: contact,
conversation: this.conversation conversation: this.conversation
}).render(); });
this.$('.conflicts').append(view.el); this.$('.conflicts').append(view.el);
}, },
render: function() { render: function() {