From 71467822f686d0e40f2e0b1c12a8ee4c880afe30 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Mon, 22 Feb 2016 13:25:34 -0800
Subject: [PATCH] Clear key conflict before replaying it

Don't save the change until we successfully process the message, but
make it first so that the user sees the error disappear when the new key
is accepted.

// FREEBIE
---
 js/models/messages.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/models/messages.js b/js/models/messages.js
index 11191e8a..688f25cd 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -233,6 +233,7 @@
         resolveConflict: function(number) {
             var error = this.getKeyConflict(number);
             if (error) {
+                this.removeConflictFor(number);
                 var promise = new textsecure.ReplayableError(error).replay();
                 if (this.isIncoming()) {
                     promise = promise.then(function(dataMessage) {