From 5bba6d3f172eb6b43b081c22465a93d72af37f32 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Thu, 6 Jul 2017 10:32:59 -0700 Subject: [PATCH] setTrusted() -> setApproved() to dismiss the five-second warning This change makes sense, since there was already a reference in the code to the then-nonexistent setApproved()! FREEBIE --- js/models/conversations.js | 2 +- js/views/message_detail_view.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/models/conversations.js b/js/models/conversations.js index ffa667d6f..3bc782386 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -202,7 +202,7 @@ }.bind(this))); } }, - setTrusted: function() { + setApproved: function() { if (!this.isPrivate()) { throw new Error('You cannot set a group conversation as trusted. ' + 'You must set individual contacts as trusted.'); diff --git a/js/views/message_detail_view.js b/js/views/message_detail_view.js index 1a2af6f98..02ab9d01a 100644 --- a/js/views/message_detail_view.js +++ b/js/views/message_detail_view.js @@ -52,7 +52,7 @@ return this.model.isUntrusted(); }.bind(this)).then(function(untrusted) { if (untrusted) { - return this.model.setTrusted(); + return this.model.setApproved(); } }.bind(this)).then(function() { this.message.resend(this.outgoingKeyError.number);