Let key verification view lazy-load keys

// FREEBIE

js/views/conversation_view.js

@@ -196,21 +196,10 @@
 
         verifyIdentity: function() {
             if (this.model.isPrivate()) {
-                var their_number = this.model.id;
-                var our_number = textsecure.storage.user.getNumber();
-                textsecure.storage.protocol.loadIdentityKey(their_number).then(function(their_key) {
-                    textsecure.storage.protocol.loadIdentityKey(our_number).then(function(our_key) {
-                        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));
+                var view = new Whisper.KeyVerificationPanelView({
+                    model: { their_number: this.model.id }
+                });
+                this.listenBack(view);
             }
         },
 

js/views/key_conflict_dialogue_view.js

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

js/views/key_verification_view.js

@@ -37,12 +37,41 @@
         className: 'key-verification',
         templateName: 'key_verification',
         initialize: function() {
-            this.render();
-            /*
-            this.$('.securityNumber').append(
-                new SecurityNumberView({model: this.model}).el
-            );
-            */
+            Promise.all([
+                this.loadTheirKey(),
+                this.loadOurKey(),
+            ]).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) {
             // key is an array buffer

js/views/message_detail_view.js

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