Fix outgoing identity key conflict handling

// FREEBIE

background.html

@@ -211,7 +211,7 @@
   </script>
   <script type='text/x-tmpl-mustache' id='outgoing-key-conflict'>
     <p>
-      This contact's identity key.has changed.
+      This contact's identity key has changed.
       Click to process and display.
     </p>
   </script>

js/libtextsecure.js

@@ -39945,8 +39945,12 @@ window.textsecure.messaging = function() {
                                 }
                             });
                     });
-                } else
+                } else if (error.message !== "Identity key changed at session save time") {
                     registerError(number, "Failed to create or send message", error);
+                } else {
+                    error = new textsecure.OutgoingIdentityKeyError(number, message.toArrayBuffer(), timestamp);
+                    registerError(number, "Identity key changed", error);
+                }
             });
         }
 

libtextsecure/sendmessage.js

@@ -215,8 +215,12 @@ window.textsecure.messaging = function() {
                                 }
                             });
                     });
-                } else
+                } else if (error.message !== "Identity key changed at session save time") {
                     registerError(number, "Failed to create or send message", error);
+                } else {
+                    error = new textsecure.OutgoingIdentityKeyError(number, message.toArrayBuffer(), timestamp);
+                    registerError(number, "Identity key changed", error);
+                }
             });
         }