Improve identity key conflict ux
Clicking on a key conflict message opens the message detail view, which displays the contact(s) in this conversation. If the message contains a key conflict with any of these contacts, a button is displayed which attempts to resolve that conflict and any other conflicts in the conversation that are related to that contact.pull/749/head
lilia
10 years ago
parent
857eee5003
commit
897d391817
@ -0,0 +1,72 @@
|
||||
/* 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 || {};
|
||||
|
||||
var ErrorView = Backbone.View.extend({
|
||||
className: 'error',
|
||||
initialize: function() {
|
||||
this.template = $('#generic-error').html();
|
||||
Mustache.parse(this.template);
|
||||
},
|
||||
render: function() {
|
||||
this.$el.html(Mustache.render(this.template, this.model));
|
||||
return this;
|
||||
}
|
||||
});
|
||||
|
||||
var KeyConflictView = ErrorView.extend({
|
||||
className: 'key-conflict',
|
||||
initialize: function(options) {
|
||||
this.message = options.message;
|
||||
if (this.message.isIncoming()) {
|
||||
this.template = $('#incoming-key-conflict').html();
|
||||
} else if (this.message.isOutgoing()) {
|
||||
this.template = $('#outgoing-key-conflict').html();
|
||||
}
|
||||
Mustache.parse(this.template);
|
||||
},
|
||||
events: {
|
||||
'click': 'select'
|
||||
},
|
||||
select: function() {
|
||||
this.$el.trigger('select', {message: this.message});
|
||||
},
|
||||
});
|
||||
|
||||
Whisper.MessageErrorView = Backbone.View.extend({
|
||||
className: 'error',
|
||||
initialize: function(options) {
|
||||
if (this.model.name === 'IncomingIdentityKeyError' ||
|
||||
this.model.name === 'OutgoingIdentityKeyError') {
|
||||
this.view = new KeyConflictView({
|
||||
model : this.model,
|
||||
message : options.message
|
||||
});
|
||||
} else {
|
||||
this.view = new ErrorView({ model: this.model });
|
||||
}
|
||||
this.$el.append(this.view.el);
|
||||
this.view.render();
|
||||
},
|
||||
render: function() {
|
||||
this.view.render();
|
||||
return this;
|
||||
}
|
||||
});
|
||||
})();
|
||||
@ -0,0 +1,54 @@
|
||||
/* 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.KeyConflictDialogueView = Backbone.View.extend({
|
||||
className: 'key-conflict-dialogue',
|
||||
initialize: function(options) {
|
||||
this.template = $('#key-conflict-dialogue').html();
|
||||
Mustache.parse(this.template);
|
||||
this.conversation = options.conversation;
|
||||
},
|
||||
events: {
|
||||
'click .verify': 'triggerVerify',
|
||||
'click .resolve': 'resolve',
|
||||
'click .cancel': 'remove',
|
||||
'click': 'clickOut'
|
||||
},
|
||||
triggerVerify: function() {
|
||||
this.trigger('verify', {number: this.model.number});
|
||||
},
|
||||
clickOut: function(e) {
|
||||
if (!$(e.target).closest('.content').length) {
|
||||
this.remove();
|
||||
}
|
||||
},
|
||||
resolve: function() {
|
||||
new Promise(function() {
|
||||
this.conversation.resolveConflicts(this.model.number);
|
||||
}.bind(this));
|
||||
this.trigger('resolve');
|
||||
this.remove();
|
||||
},
|
||||
render: function() {
|
||||
this.$el.html(Mustache.render(this.template, this.model));
|
||||
return this;
|
||||
}
|
||||
});
|
||||
})();
|
||||
Loading…
Reference in New Issue