Add key verification screen
Accessible from the menu on private conversations.
This commit is contained in:
parent
33b9a11e65
commit
dcc1588219
6 changed files with 132 additions and 3 deletions
|
@ -52,11 +52,32 @@
|
|||
'click .end-session': 'endSession',
|
||||
'click .leave-group': 'leaveGroup',
|
||||
'click .new-group-update': 'newGroupUpdate',
|
||||
'click .verify-identity': 'verifyIdentity',
|
||||
'click .hamburger': 'toggleMenu',
|
||||
'click' : 'closeMenu',
|
||||
'select .entry': 'messageDetail'
|
||||
},
|
||||
|
||||
verifyIdentity: function() {
|
||||
if (this.model.isPrivate()) {
|
||||
var number = this.model.id;
|
||||
var view = new Whisper.KeyVerificationView({
|
||||
model: {
|
||||
their_key: textsecure.storage.devices.getIdentityKeyForNumber(number),
|
||||
your_key: textsecure.storage.devices.getIdentityKeyForNumber(
|
||||
textsecure.utils.unencodeNumber(textsecure.storage.getUnencrypted("number_id"))[0]
|
||||
)
|
||||
}
|
||||
});
|
||||
this.$el.hide();
|
||||
view.render().$el.insertAfter(this.el);
|
||||
this.listenTo(view, 'back', function() {
|
||||
view.remove();
|
||||
this.$el.show();
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
messageDetail: function(e, data) {
|
||||
var view = new Whisper.MessageDetailView({ model: data.message, conversation: this.model });
|
||||
view.$el.insertAfter(this.$el);
|
||||
|
|
48
js/views/key_verification_view.js
Normal file
48
js/views/key_verification_view.js
Normal file
|
@ -0,0 +1,48 @@
|
|||
/* vim: ts=4:sw=4:expandtab
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
(function () {
|
||||
'use strict';
|
||||
|
||||
window.Whisper = window.Whisper || {};
|
||||
|
||||
Whisper.KeyVerificationView = Backbone.View.extend({
|
||||
className: 'key-verification',
|
||||
initialize: function(options) {
|
||||
this.template = $('#key-verification').html();
|
||||
Mustache.parse(this.template);
|
||||
},
|
||||
events: {
|
||||
'click .back': 'goBack'
|
||||
},
|
||||
goBack: function() {
|
||||
this.trigger('back');
|
||||
},
|
||||
splitKey: function(key) {
|
||||
// key is a binary string
|
||||
return _.map(key, function(chr, i) {
|
||||
return ('0' + key.charCodeAt(i).toString(16)).slice(-2);
|
||||
|
||||
});
|
||||
},
|
||||
render: function() {
|
||||
this.$el.html(Mustache.render(this.template, {
|
||||
your_key: this.splitKey(this.model.your_key),
|
||||
their_key: this.splitKey(this.model.their_key)
|
||||
}));
|
||||
return this;
|
||||
}
|
||||
});
|
||||
})();
|
|
@ -27,11 +27,28 @@
|
|||
this.conversation = options.conversation;
|
||||
},
|
||||
events: {
|
||||
'click .back': 'goBack'
|
||||
'click .back': 'goBack',
|
||||
'verify': 'verify'
|
||||
},
|
||||
goBack: function() {
|
||||
this.trigger('back');
|
||||
},
|
||||
verify: function(number) {
|
||||
var view = new Whisper.KeyVerificationView({
|
||||
model: {
|
||||
their_key: textsecure.storage.devices.getIdentityKeyForNumber(number),
|
||||
your_key: textsecure.storage.devices.getIdentityKeyForNumber(
|
||||
textsecure.utils.unencodeNumber(textsecure.storage.getUnencrypted("number_id"))[0]
|
||||
)
|
||||
}
|
||||
});
|
||||
this.$el.hide();
|
||||
view.render().$el.insertAfter(this.el);
|
||||
this.listenTo(view, 'back', function() {
|
||||
view.remove();
|
||||
this.$el.show();
|
||||
});
|
||||
},
|
||||
render: function() {
|
||||
this.$el.html(Mustache.render(this.template, {
|
||||
sent_at: moment(this.model.get('sent_at')).toString(),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue