Remove all concept of 'key conflict' from the app

js/views/contact_list_view.js

@@ -5,6 +5,7 @@
     'use strict';
     window.Whisper = window.Whisper || {};
 
+    // Contact list view is used in the list group members senario, as well as the NewGroupUpdate view
     Whisper.ContactListView = Whisper.ListView.extend({
         tagName: 'div',
         itemView: Whisper.View.extend({

js/views/error_view.js

@@ -13,48 +13,4 @@
             return this.model;
         }
     });
-
-    var KeyConflictView = ErrorView.extend({
-        className: 'key-conflict',
-        templateName: 'key-conflict',
-        initialize: function(options) {
-            this.message = options.message;
-        },
-        events: {
-            'click': 'select'
-        },
-        render_attributes: function() {
-            var errorMessage;
-            if (this.message.isIncoming()) {
-                errorMessage = 'incomingKeyConflict';
-            } else {
-                errorMessage = 'outgoingKeyConflict';
-            }
-            return { message: i18n(errorMessage) };
-        },
-        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;
-        }
-    });
 })();

js/views/group_member_list_view.js

@@ -5,6 +5,11 @@
     'use strict';
     window.Whisper = window.Whisper || {};
 
+    // This needs to make each member link to their verification view - except for yourself
+    // Do we update the display of each user to add Verified to their name if verified?
+    // What about the case where we're brought here because there are multiple users in the no-longer-verified state?
+        // We probably want to display some sort of helper text in that case at the least
+        // Or do we show only the problematic users in that case?
     Whisper.GroupMemberList = Whisper.View.extend({
         className: 'group-member-list panel',
         templateName: 'group-member-list',

js/views/key_conflict_dialogue_view.js

@@ -1,53 +0,0 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-(function () {
-    'use strict';
-
-    window.Whisper = window.Whisper || {};
-
-    Whisper.KeyConflictDialogueView = Whisper.View.extend({
-        templateName: 'key-conflict-dialogue',
-        className: 'key-conflict-dialogue clearfix',
-        initialize: function(options) {
-            this.contact = options.contact;
-            this.conversation = options.conversation;
-            this.render();
-            var view = new Whisper.KeyVerificationView({
-                model  : this.contact,
-                newKey : this.model.identityKey
-            });
-            view.$el.appendTo(this.$('.keys'));
-        },
-        events: {
-            'click .showKeys': 'showKeys',
-            'click .hideKeys': 'hideKeys',
-            'click .resolve' : 'resolve'
-        },
-        hideKeys: function() {
-            this.$('.keys, .hideKeys').hide();
-            this.$('.showKeys').show();
-        },
-        showKeys: function() {
-            this.$('.keys, .hideKeys').show();
-            this.$('.showKeys').hide();
-        },
-        resolve: function() {
-            this.remove();
-            this.conversation.resolveConflicts(this.model);
-        },
-        render_attributes: function() {
-            return {
-                name         : this.contact.getTitle(),
-                avatar       : this.contact.getAvatar(),
-                conflict     : this.model,
-                newIdentity  : i18n('newIdentity'),
-                message      : i18n('identityChanged'),
-                resolve      : i18n('acceptNewKey'),
-                showKeys     : i18n('showMore'),
-                hideKeys     : i18n('showLess'),
-                learnMore    : i18n('learnMore')
-            };
-        }
-    });
-})();

js/views/key_verification_view.js

@@ -5,9 +5,11 @@
     'use strict';
     window.Whisper = window.Whisper || {};
 
+    // TODO; find all uses of that removed panel
+    // Add the Verify functionality to this view
     Whisper.KeyVerificationView = Whisper.View.extend({
-        className: 'key-verification',
-        templateName: 'key_verification',
+        className: 'key-verification panel',
+        templateName: 'key-verification',
         initialize: function(options) {
             this.our_number = textsecure.storage.user.getNumber();
             if (options.newKey) {
@@ -21,6 +23,8 @@
               //.then(this.makeQRCode.bind(this));
         },
         makeQRCode: function() {
+            // Per Lilia: We can't turn this on until it geneates a Latin1 string, as is
+            //   required by the mobile clients.
             new QRCode(this.$('.qr')[0]).makeCode(
                 dcodeIO.ByteBuffer.wrap(this.our_key).toString('base64')
             );
@@ -72,8 +76,4 @@
             };
         }
     });
-    Whisper.KeyVerificationPanelView = Whisper.KeyVerificationView.extend({
-        className: 'key-verification panel',
-        templateName: 'key_verification_panel',
-    });
 })();

js/views/message_detail_view.js

@@ -9,7 +9,6 @@
         className: 'contact-detail',
         templateName: 'contact-detail',
         initialize: function(options) {
-            this.conflict = options.conflict;
             this.errors = _.reject(options.errors, function(e) {
                 return (e.name === 'IncomingIdentityKeyError' ||
                         e.name === 'OutgoingIdentityKeyError' ||
@@ -51,19 +50,6 @@
                 errors: this.errors[contact.id]
             }).render();
             this.$('.contacts').append(view.el);
-
-            var conflict = this.model.getKeyConflict(contact.id);
-            if (conflict) {
-                this.renderConflict(contact, conflict);
-            }
-        },
-        renderConflict: function(contact, conflict) {
-            var view = new Whisper.KeyConflictDialogueView({
-                model: conflict,
-                contact: contact,
-                conversation: this.conversation
-            });
-            this.$('.conflicts').append(view.el);
         },
         render: function() {
             this.errors = _.groupBy(this.model.get('errors'), 'number');
@@ -81,8 +67,7 @@
                 title       : i18n('messageDetail'),
                 sent        : i18n('sent'),
                 received    : i18n('received'),
-                errorLabel  : i18n('error'),
-                hasConflict : this.model.hasKeyConflicts()
+                errorLabel  : i18n('error')
             }));
             this.view.$el.prependTo(this.$('.message-container'));
 

js/views/new_group_update_view.js

@@ -5,6 +5,7 @@
     'use strict';
     window.Whisper = window.Whisper || {};
 
+    // When is this used?
     Whisper.NewGroupUpdateView = Whisper.View.extend({
         tagName:   "div",
         className: 'new-group-update',