display attachments in messages which arrived after the conversation was loaded

Trolldemorted · Trolldemorted · commit 669ad20f57be · 2018-04-26T16:52:53.000+02:00
diff --git a/Signal-Windows.Lib/Models/SignalAttachmentContainer.cs b/Signal-Windows.Lib/Models/SignalAttachmentContainer.cs
@@ -0,0 +1,24 @@
+﻿using libsignalservice;
+using Microsoft.Extensions.Logging;
+using Signal_Windows.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Signal_Windows.Lib.Models
+{
+    public class SignalAttachmentContainer
+    {
+        public SignalAttachment Attachment;
+        public int AttachmentIndex;
+        public int MessageIndex;
+        public SignalAttachmentContainer(SignalAttachment attachment, int attachmentIndex, int messageIndex)
+        {
+            Attachment = attachment;
+            AttachmentIndex = attachmentIndex;
+            MessageIndex = messageIndex;
+        }
+    }
+}
diff --git a/Signal-Windows.Lib/Models/SignalMessage.cs b/Signal-Windows.Lib/Models/SignalMessage.cs
@@ -21,7 +21,7 @@ public class SignalMessage
         public long ComposedTimestamp { get; set; }
         public uint ExpiresAt { get; set; }
         public uint AttachmentsCount { get; set; }
-        public List<SignalAttachment> Attachments { get; set; }
+        public List<SignalAttachment> Attachments { get; set; } = new List<SignalAttachment>();
     }
 
     public enum SignalMessageType
diff --git a/Signal-Windows.Lib/Signal-Windows.Lib.csproj b/Signal-Windows.Lib/Signal-Windows.Lib.csproj
@@ -137,6 +137,7 @@
     <Compile Include="Migrations\SignalDB\SignalDBContextModelSnapshot.cs" />
     <Compile Include="Models\PhoneContact.cs" />
     <Compile Include="Models\SignalAttachment.cs" />
+    <Compile Include="Models\SignalAttachmentContainer.cs" />
     <Compile Include="Models\SignalContact.cs" />
     <Compile Include="Models\SignalConversation.cs" />
     <Compile Include="Models\SignalEarlyReceipt.cs" />
diff --git a/Signal-Windows/Controls/Attachment.xaml.cs b/Signal-Windows/Controls/Attachment.xaml.cs
@@ -18,6 +18,7 @@
 using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Media.Imaging;
 using Windows.UI.Xaml.Navigation;
 
 // The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
@@ -52,6 +53,12 @@ public Attachment()
         {
             this.InitializeComponent();
             DataContextChanged += Attachment_DataContextChanged;
+            AttachmentImage.ImageFailed += AttachmentImage_ImageFailed;
+        }
+
+        private void AttachmentImage_ImageFailed(object sender, ExceptionRoutedEventArgs e)
+        {
+            Logger.LogError("AttachmentImage_ImageFailed {0}", e.ErrorMessage);
         }
 
         private void Attachment_DataContextChanged(FrameworkElement sender, DataContextChangedEventArgs args)
@@ -87,5 +94,11 @@ private void AttachmentDownloadIcon_Tapped(object sender, TappedRoutedEventArgs
             "image/png",
             "image/gif"
         };
+
+        public bool HandleUpdate(SignalAttachment sa)
+        {
+            DataContext = sa;
+            return Model.Status != SignalAttachmentStatus.Finished && Model.Status != SignalAttachmentStatus.Failed_Permanently;
+        }
     }
 }
diff --git a/Signal-Windows/Controls/Conversation.xaml.cs b/Signal-Windows/Controls/Conversation.xaml.cs
@@ -1,5 +1,8 @@
+using libsignalservice;
 using libsignalservice.util;
+using Microsoft.Extensions.Logging;
 using Signal_Windows.Lib;
+using Signal_Windows.Lib.Models;
 using Signal_Windows.Models;
 using Signal_Windows.Storage;
 using Signal_Windows.ViewModels;
@@ -10,6 +13,7 @@
 using System.Diagnostics;
 using System.Threading.Tasks;
 using Windows.Foundation;
+using Windows.Storage;
 using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -25,6 +29,7 @@ public sealed partial class Conversation : UserControl, INotifyPropertyChanged
         public event PropertyChangedEventHandler PropertyChanged;
         private bool SendingMessage = false;
         private Dictionary<long, SignalMessageContainer> OutgoingCache = new Dictionary<long, SignalMessageContainer>();
+        private Dictionary<long, SignalAttachmentContainer> UnfinishedAttachmentsCache = new Dictionary<long, SignalAttachmentContainer>();
         private SignalConversation SignalConversation;
         public VirtualizedCollection Collection;
 
@@ -150,6 +155,7 @@ public void Load(SignalConversation conversation)
         public void DisposeCurrentThread()
         {
             OutgoingCache.Clear();
+            UnfinishedAttachmentsCache.Clear();
         }
 
         public T FindElementByName<T>(FrameworkElement element, string sChildName) where T : FrameworkElement
@@ -195,6 +201,25 @@ public void UpdateMessageBox(SignalMessage updatedMessage)
             }
         }
 
+        public void UpdateAttachment(SignalAttachment sa)
+        {
+            if (UnfinishedAttachmentsCache.ContainsKey(sa.Id))
+            {
+                var a = UnfinishedAttachmentsCache[sa.Id];
+                var messageItem = (ListViewItem)ConversationItemsControl.ContainerFromIndex(Collection.GetVirtualIndex(a.MessageIndex));
+                if (messageItem != null)
+                {
+                    var message = FindElementByName<Message>(messageItem, "ListBoxItemContent");
+                    var attachment = FindElementByName<Attachment>(message, "Attachment");
+                    bool retain = attachment.HandleUpdate(sa);
+                    if (!retain)
+                    {
+                        OutgoingCache.Remove(sa.Id);
+                    }
+                }
+            }
+        }
+
         public void Append(SignalMessageContainer sm)
         {
             var sourcePanel = (ItemsStackPanel)ConversationItemsControl.ItemsPanelRoot;
@@ -211,6 +236,11 @@ public void AddToOutgoingMessagesCache(SignalMessageContainer m)
         {
             OutgoingCache[m.Message.Id] = m;
         }
+
+        public void AddToUnfinishedAttachmentsCache(SignalAttachmentContainer m)
+        {
+            UnfinishedAttachmentsCache[m.Attachment.Id] = m;
+        }
         
         private async void TextBox_KeyDown(object sender, KeyRoutedEventArgs e)
         {
diff --git a/Signal-Windows/Controls/Message.xaml b/Signal-Windows/Controls/Message.xaml
@@ -16,7 +16,7 @@
     </UserControl.Resources>
     <Border Name="MessageBoxBorder" BorderBrush="#00000000" BorderThickness="1,1,1,1" CornerRadius="4,4,4,4" Padding="10 5 10 5" Margin="4">
         <ItemsControl>
-            <local:Attachment DataContext="{x:Bind Attachment, Mode=OneWay}" Visibility="{x:Bind HasAttachment, Mode=OneWay}"/>
+            <local:Attachment Name="Attachment" DataContext="{x:Bind Attachment, Mode=OneWay}" Visibility="{x:Bind HasAttachment, Mode=OneWay}"/>
             <TextBlock Name="MessageAuthor" FontWeight="Bold" />
             <TextBlock Name="MessageContentTextBlock" TextWrapping="Wrap" MaxWidth="300" IsTextSelectionEnabled="True" FontSize="14" Foreground="Black" HorizontalAlignment="Left" />
             <Grid Name="FooterPanel" MaxWidth="300">
diff --git a/Signal-Windows/Controls/VirtualizedMessagesCollection.cs b/Signal-Windows/Controls/VirtualizedMessagesCollection.cs
@@ -2,6 +2,7 @@
 using libsignalservice;
 using Microsoft.Extensions.Logging;
 using Signal_Windows.Lib;
+using Signal_Windows.Lib.Models;
 using Signal_Windows.Models;
 using Signal_Windows.Storage;
 using System;
@@ -86,14 +87,7 @@ private SignalMessageContainer Get(int index)
             if (!Cache.ContainsKey(pageIndex))
             {
                 Logger.LogTrace("Get() cache miss ({0})", pageIndex);
-                Cache[pageIndex] = App.Handle.GetMessages(Conversation, pageIndex * PAGE_SIZE, PAGE_SIZE);
-                foreach (var msg in Cache[pageIndex])
-                {
-                    if (msg.Message.Author == null)
-                    {
-                        ConversationView.AddToOutgoingMessagesCache(msg);
-                    }
-                }
+                LoadPage(pageIndex);
             }
             var page = Cache[pageIndex];
             var item = page[inpageIndex];
@@ -144,24 +138,40 @@ public int Add(object value, bool hideUnreadMarker)
             Logger.LogTrace("Add() Id={0} Index={1} PageIndex={2} InpageIndex={3}", message.Message.Id, message.Index, pageIndex, inpageIndex);
             if (!Cache.ContainsKey(pageIndex))
             {
-                Cache[pageIndex] = App.Handle.GetMessages(Conversation, pageIndex * PAGE_SIZE, PAGE_SIZE);
-                foreach (var msg in Cache[pageIndex])
-                {
-                    if (msg.Message.Author == null)
-                    {
-                        ConversationView.AddToOutgoingMessagesCache(msg);
-                    }
-                }
+                LoadPage(pageIndex);
             }
             Cache[pageIndex].Insert(inpageIndex, message);
             int virtualIndex = GetVirtualIndex(message.Index);
             Logger.LogTrace("Add() Index={0} VirtualIndex={1}", message.Index, virtualIndex);
             CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, message, virtualIndex));
-            if (message.Message.Author == null)
+            FillUpdateCaches(message);
+            return message.Index;
+        }
+
+        private void LoadPage(int pageIndex)
+        {
+            Cache[pageIndex] = App.Handle.GetMessages(Conversation, pageIndex * PAGE_SIZE, PAGE_SIZE);
+            foreach (var msg in Cache[pageIndex])
             {
-                ConversationView.AddToOutgoingMessagesCache(message);
+                FillUpdateCaches(msg);
+            }
+        }
+
+        private void FillUpdateCaches(SignalMessageContainer msg)
+        {
+            if (msg.Message.Author == null)
+            {
+                ConversationView.AddToOutgoingMessagesCache(msg);
+            }
+            int attachmentIndex = 0;
+            foreach (var attachment in msg.Message.Attachments)
+            {
+                if (attachment.Status != SignalAttachmentStatus.Finished && attachment.Status != SignalAttachmentStatus.Failed_Permanently)
+                {
+                    ConversationView.AddToUnfinishedAttachmentsCache(new SignalAttachmentContainer(attachment, attachmentIndex, msg.Index));
+                }
+                attachmentIndex++;
             }
-            return message.Index;
         }
 
         public void Clear()
diff --git a/Signal-Windows/ViewModels/MainPageViewModel.cs b/Signal-Windows/ViewModels/MainPageViewModel.cs
@@ -291,6 +291,10 @@ public void ReplaceConversationList(List<SignalConversation> conversations)
         public void HandleAttachmentStatusChanged(SignalAttachment sa)
         {
             Logger.LogInformation("MPVM received attachment status update! {0}", sa.Status);
+            if (SelectedThread != null && SelectedThread.ThreadId == sa.Message.ThreadId)
+            {
+                View.Thread.UpdateAttachment(sa);
+            }
         }
         #endregion
     }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class SignalMessage`
`21`	`21`	`public long ComposedTimestamp { get; set; }`
`22`	`22`	`public uint ExpiresAt { get; set; }`
`23`	`23`	`public uint AttachmentsCount { get; set; }`
`24`		`- public List<SignalAttachment> Attachments { get; set; }`
	`24`	`+ public List<SignalAttachment> Attachments { get; set; } = new List<SignalAttachment>();`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public enum SignalMessageType`
Original file line number	Diff line number	Diff line change
`@@ -291,6 +291,10 @@ public void ReplaceConversationList(List<SignalConversation> conversations)`
`291`	`291`	`public void HandleAttachmentStatusChanged(SignalAttachment sa)`
`292`	`292`	`{`
`293`	`293`	`Logger.LogInformation("MPVM received attachment status update! {0}", sa.Status);`
	`294`	`+ if (SelectedThread != null && SelectedThread.ThreadId == sa.Message.ThreadId)`
	`295`	`+ {`
	`296`	`+ View.Thread.UpdateAttachment(sa);`
	`297`	`+ }`
`294`	`298`	`}`
`295`	`299`	`#endregion`
`296`	`300`	`}`