display previously downloaded jpeg, png and gif images

Author: Trolldemorted

Signal-Windows.Lib/SignalLibHandle.cs

@@ -486,6 +486,7 @@ private void StartAttachmentDownloads(SignalMessage message)
                         // this is the recommended way to call CreateDownload
                         // see https://docs.microsoft.com/en-us/uwp/api/windows.networking.backgroundtransfer.backgrounddownloader#Methods
                         DownloadOperation download = downloader.CreateDownload(new Uri(RetrieveAttachmentUrl(attachmentPointer)), tmpDownload);
+                        attachment.FileName = "" + download.Guid;
                         SignalDBContext.UpdateAttachmentFileName(attachment);
                         Downloads.Add(download);
                         Task.Run(async () =>
@@ -511,6 +512,7 @@ private async Task HandleSuccessfullDownload(SignalAttachment attachment, IStora
             Logger.LogInformation("Deleting tmpFile {0}", tmpDownload.Name);
             await tmpDownload.DeleteAsync();
             attachment.Status = SignalAttachmentStatus.Finished;
+            SignalDBContext.UpdateAttachmentStatus(attachment);
             DispatchAttachmentStatusChanged(download, attachment);
         }
 

Signal-Windows.Lib/Storage/DB.cs

@@ -935,6 +935,21 @@ internal static void UpdateAttachmentFileName(SignalAttachment attachment)
             }
         }
 
+        internal static void UpdateAttachmentStatus(SignalAttachment attachment)
+        {
+            lock (DBLock)
+            {
+                using (var ctx = new SignalDBContext())
+                {
+                    var savedAttachment = ctx.Attachments
+                        .Where(a => a.Id == attachment.Id)
+                        .First();
+                    savedAttachment.Status = attachment.Status;
+                    ctx.SaveChanges();
+                }
+            }
+        }
+
         #endregion Attachments
 
         #region Threads

Signal-Windows/Controls/Attachment.xaml

@@ -16,9 +16,18 @@
         </Grid.ColumnDefinitions>
         <Ellipse Fill="#FF9B9B9B" Width="50" Height="50"/>
         <SymbolIcon Symbol="Page2"/>
-        <StackPanel Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="8,0,0,0">
-            <TextBlock Text="{x:Bind FileName, Mode=OneWay}" Style="{StaticResource BodyTextBlockStyle}"/>
-            <TextBlock Text="{x:Bind FileSize, Mode=OneWay}" Style="{StaticResource CaptionTextBlockStyle}"/>
+        <StackPanel Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="8,0,0,0">
+            <StackPanel Name="ImageStackPanel" Visibility="Visible">
+                <Image>
+                    <Image.Source>
+                        <BitmapImage UriSource="{x:Bind ImagePath, Mode=TwoWay}"/>
+                    </Image.Source>
+                </Image>
+            </StackPanel>
+            <StackPanel Name="DefaultStackPanel" Visibility="Visible">
+                <TextBlock Text="{x:Bind FileName, Mode=OneWay}" Style="{StaticResource BodyTextBlockStyle}"/>
+                <TextBlock Text="{x:Bind FileSize, Mode=OneWay}" Style="{StaticResource CaptionTextBlockStyle}"/>
+            </StackPanel>
         </StackPanel>
     </Grid>
 </UserControl>

Signal-Windows/Controls/Attachment.xaml.cs

@@ -7,6 +7,7 @@
 using Signal_Windows.Models;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
+using Windows.Storage;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
@@ -35,12 +36,18 @@ public string FileSize
         {
             get { return fileSize; }
             set { fileSize = value; PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(FileSize))); }
+        }
+
+        private Uri imagePath;
+        public Uri ImagePath
+        {
+            get { return imagePath; }
+            set { imagePath = value; PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ImagePath))); }
         }
 
         public SignalAttachment Model
         {
             get { return DataContext as SignalAttachment; }
-            set { DataContext = value; }
         }
 
         public Attachment()
@@ -54,8 +61,23 @@ private void Attachment_DataContextChanged(FrameworkElement sender, DataContextC
             if (Model != null)
             {
                 FileName = Model.FileName;
-                FileSize = Utils.BytesToString(Model.Size);
+                FileSize = Utils.BytesToString(Model.Size);
+                if (Model.Status == SignalAttachmentStatus.Finished)
+                {
+                    if (IMAGE_TYPES.Contains(Model.ContentType))
+                    {
+                        var path = ApplicationData.Current.LocalCacheFolder.Path + @"\Attachments\" + Model.Id + ".plain";
+                        ImagePath = new Uri(path);
+                    }
+                }
             }
-        }
+        }
+
+        private static HashSet<string> IMAGE_TYPES = new HashSet<string>()
+        {
+            "image/jpeg",
+            "image/png",
+            "image/gif"
+        };
     }
 }

Signal-Windows/Controls/Message.xaml

@@ -18,7 +18,7 @@
         <ItemsControl>
             <local: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" />
+            <TextBlock Name="MessageContentTextBlock" TextWrapping="Wrap" MaxWidth="300" IsTextSelectionEnabled="True" FontSize="14" Foreground="Black" HorizontalAlignment="Left" />
             <Grid Name="FooterPanel" MaxWidth="300">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto"/>