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

Nest key verification inside conflict dialogs

Browse source 
// FREEBIE
This commit is contained in:
lilia 2016-03-23 12:33:50 -07:00
parent c4fcbd8cbe
commit 6fe9c3f964
8 changed files with 123 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

21
js/views/message_detail_view.js
View file

@ -43,19 +43,6 @@
goBack: function() {
this.trigger('back');
},
verify: function(their_key) {
textsecure.storage.axolotl.getIdentityKey(textsecure.storage.user.getNumber()).then(function(our_key) {
var view = new Whisper.KeyVerificationView({
model: { their_key: their_key, your_key: our_key }
});
this.$el.hide();
view.render().$el.insertAfter(this.el);
this.listenTo(view, 'back', function() {
view.remove();
this.$el.show();
}.bind(this));
}.bind(this));
},
contacts: function() {
if (this.model.isIncoming()) {
var number = this.model.get('source');
@ -83,14 +70,6 @@
conversation: this.conversation
}).render();
this.$('.conflicts').append(view.el);
this.listenTo(view, 'verify', function(data) {
this.verify(conflict.identityKey);
});
/*
this.listenTo(view, 'resolve', function() {
this.render();
});
*/
},
render: function() {
this.errors = _.groupBy(this.model.get('errors'), 'number');