Don't add IKChange messages twice, always display them properly

Author: Trolldemorted

Signal-Windows.Lib/SignalLibHandle.cs

@@ -796,7 +796,6 @@ internal async Task HandleOutgoingKeyChangeLocked(string user, string identity)
                 Logger.LogTrace("HandleOutgoingKeyChange() locked");
                 var messages = LibsignalDBContext.InsertIdentityChangedMessagesLocked(user);
                 await LibsignalDBContext.SaveIdentityLocked(new SignalProtocolAddress(user, 1), identity);
-                await DispatchHandleIdentityKeyChange(messages);
             }
             catch (Exception e)
             {

Signal-Windows/Controls/Conversation.xaml.cs

@@ -272,7 +272,7 @@ public void UpdateAttachment(SignalAttachment sa)
             }
         }
 
-        public AppendResult Append(Message sm)
+        public AppendResult Append(IMessageView sm)
         {
             AppendResult result = new AppendResult(false);
             bool bottom = GetBottommostIndex() == Collection.Count - 2; // -2 because we already incremented Count

Signal-Windows/Controls/VirtualizedMessagesCollection.cs

@@ -158,12 +158,8 @@ public int Add(object value, bool hideUnreadMarker)
         private void LoadPage(int pageIndex)
         {
             MessageStorage[pageIndex] = App.Handle.GetMessages(Conversation, pageIndex * PAGE_SIZE, PAGE_SIZE)
-                .Select(m =>
-                {
-                    if (m.Type == SignalMessageType.IdentityKeyChange)
-                        return new IdentityKeyChangeMessage(m) as IMessageView;
-                    return new Message(m) as IMessageView;
-                }).ToList();
+                .Select(m => Utils.CreateMessageView(m)).ToList();
+
             foreach (var msg in MessageStorage[pageIndex])
             {
                 AddMessageToMap(msg);

Signal-Windows/Utils.cs

@@ -1,4 +1,6 @@
-using System;
+using Signal_Windows.Controls;
+using Signal_Windows.Models;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
@@ -130,6 +132,13 @@ public static string GetColorFromBrush(SolidColorBrush brush)
             else { return GREY; }
         }
 
+        public static IMessageView CreateMessageView(SignalMessage message)
+        {
+            if (message.Type == SignalMessageType.IdentityKeyChange)
+                return new IdentityKeyChangeMessage(message) as IMessageView;
+            return new Message(message) as IMessageView;
+        }
+
         public static void AddRange<T>(this ObservableCollection<T> observableCollection, IEnumerable<T> collection)
         {
             foreach (var item in collection)

Signal-Windows/ViewModels/MainPageViewModel.cs

@@ -204,8 +204,8 @@ public void AddOrUpdateConversation(SignalConversation conversation, SignalMessa
                     {
                         if (updateMessage != null)
                         {
-                            var container = new Message(updateMessage);
-                            View.Thread.Append(container);
+                            var messageView = Utils.CreateMessageView(updateMessage);
+                            View.Thread.Append(messageView);
                             View.Reload();
                         }
                     }
@@ -235,8 +235,8 @@ public AppendResult HandleMessage(SignalMessage message, SignalConversation conv
             localConversation.UpdateUI();
             if (SelectedThread != null && SelectedThread == localConversation)
             {
-                var container = new Message(message);
-                result = View.Thread.Append(container);
+                var messageView = Utils.CreateMessageView(message);
+                result = View.Thread.Append(messageView);
             }
             RepositionConversation(localConversation);
             return result;