Add export button to AttachmentsDetailsView

Trolldemorted · Trolldemorted · commit 9ca3bb050079 · 2019-03-16T13:09:13.000+01:00
diff --git a/Signal-Windows.Lib/SignalLibHandle.cs b/Signal-Windows.Lib/SignalLibHandle.cs
@@ -76,6 +76,7 @@ public interface ISignalLibHandle
 
         // Attachment API
         void StartAttachmentDownload(SignalAttachment sa);
+        Task ExportAttachment(SignalAttachment sa);
         //void AbortAttachmentDownload(SignalAttachment sa); TODO
     }
 
@@ -481,6 +482,39 @@ public void StartAttachmentDownload(SignalAttachment sa)
                 }
             });
         }
+
+        public async Task ExportAttachment(SignalAttachment sa)
+        {
+            try
+            {
+                Logger.LogTrace("ExportAttachment() locking");
+                await SemaphoreSlim.WaitAsync(CancelSource.Token);
+                Logger.LogTrace("ExportAttachment() locked");
+                var savePicker = new Windows.Storage.Pickers.FileSavePicker
+                {
+                    SuggestedStartLocation = Windows.Storage.Pickers.PickerLocationId.Downloads,
+                    SuggestedFileName = sa.SentFileName ?? "signal"
+                };
+                savePicker.FileTypeChoices.Add("Any", new List<string>() { "." });
+                var target_file = await savePicker.PickSaveFileAsync();
+                if (target_file != null)
+                {
+                    CachedFileManager.DeferUpdates(target_file);
+                    IStorageFile localCopy = await ApplicationData.Current.LocalCacheFolder.GetFileAsync($@"Attachments\{sa.Id}.plain");
+                    await localCopy.CopyAndReplaceAsync(target_file);
+                    Windows.Storage.Provider.FileUpdateStatus status = await CachedFileManager.CompleteUpdatesAsync(target_file);
+                }
+            }
+            catch (Exception e)
+            {
+                Logger.LogError("ExportAttachment failed: {0}\n{1}", e.Message, e.StackTrace);
+            }
+            finally
+            {
+                SemaphoreSlim.Release();
+                Logger.LogTrace("ExportAttachment() released");
+            }
+        }
         #endregion
 
         #region internal api
diff --git a/Signal-Windows/Controls/ConversationListElement.xaml.cs b/Signal-Windows/Controls/ConversationListElement.xaml.cs
@@ -172,7 +172,7 @@ private void ThreadListItem_DataContextChanged(FrameworkElement sender, DataCont
                         UpdateBlockedContactElement();
                         Model.UpdateUI = UpdateBlockedContactElement;
                     }
-                    else if (frame.CurrentSourcePageType == typeof(MainPage))
+                    else
                     {
                         UpdateConversationDisplay();
                         Model.UpdateUI = UpdateConversationDisplay;
diff --git a/Signal-Windows/ViewModels/GlobalSettingsPageViewModel.cs b/Signal-Windows/ViewModels/GlobalSettingsPageViewModel.cs
@@ -5,6 +5,7 @@
 using Signal_Windows.Views;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
diff --git a/Signal-Windows/ViewModels/MainPageViewModel.cs b/Signal-Windows/ViewModels/MainPageViewModel.cs
@@ -69,6 +69,62 @@ public SignalConversation SelectedConversation
             }
         }
 
+        private bool _IsPaneOpen = false;
+        public bool IsPaneOpen
+        {
+            get => _IsPaneOpen;
+            set
+            {
+                if (_IsPaneOpen != value)
+                {
+                    _IsPaneOpen = value;
+                    RaisePropertyChanged(nameof(IsPaneOpen));
+                }
+            }
+        }
+
+        private double _CompactPaneLength = 0;
+        public double CompactPaneLength
+        {
+            get => _CompactPaneLength;
+            set
+            {
+                if (_CompactPaneLength != value)
+                {
+                    _CompactPaneLength = value;
+                    RaisePropertyChanged(nameof(CompactPaneLength));
+                }
+            }
+        }
+
+        private double _OpenPaneLength = 320;
+        public double OpenPaneLength
+        {
+            get => _OpenPaneLength;
+            set
+            {
+                if (_OpenPaneLength != value)
+                {
+                    _OpenPaneLength = value;
+                    RaisePropertyChanged(nameof(OpenPaneLength));
+                }
+            }
+        }
+
+        private SplitViewDisplayMode _DisplayMode = SplitViewDisplayMode.CompactInline;
+        public SplitViewDisplayMode DisplayMode
+        {
+            get => _DisplayMode;
+            set
+            {
+                if (_DisplayMode != value)
+                {
+                    _DisplayMode = value;
+                    RaisePropertyChanged(nameof(DisplayMode));
+                }
+            }
+        }
+
         internal void BackButton_Click(object sender, BackRequestedEventArgs e)
         {
             SelectedThread = null;
diff --git a/Signal-Windows/Views/AttachmentDetailsPage.xaml b/Signal-Windows/Views/AttachmentDetailsPage.xaml
@@ -6,15 +6,19 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    Background="Black">
 
     <!-- https://www.goedware.com/index.php/blog/3-pinch-zoom-image-in-uwp-app -->
-    <FlipView Name="ImageFlipView" ItemsSource="{x:Bind Attachments}" Width="Auto" Height="Auto">
-        <FlipView.ItemTemplate>
-            <DataTemplate>
-                <Image Source="{Binding}" />
-            </DataTemplate>
-        </FlipView.ItemTemplate>
-    </FlipView>
-
+    <StackPanel>
+        <Button Grid.Column="1" x:Name="ExportButton" Background="{x:Null}" Click="ExportButton_Click">
+            <SymbolIcon Symbol="Save" Foreground="{ThemeResource ApplicationPageBackgroundThemeBrush}" />
+        </Button>
+        <FlipView Name="ImageFlipView" ItemsSource="{x:Bind Attachments}" Width="Auto" Height="Auto">
+            <FlipView.ItemTemplate>
+                <DataTemplate>
+                    <Image Source="{Binding}" />
+                </DataTemplate>
+            </FlipView.ItemTemplate>
+        </FlipView>
+    </StackPanel>
 </Page>
diff --git a/Signal-Windows/Views/AttachmentDetailsPage.xaml.cs b/Signal-Windows/Views/AttachmentDetailsPage.xaml.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
@@ -27,6 +28,7 @@ namespace Signal_Windows.Views
     public sealed partial class AttachmentDetailsPage : Page
     {
         public ObservableCollection<string> Attachments { get; set; } = new ObservableCollection<string>();
+        private SignalAttachment Attachment;
 
         public AttachmentDetailsPage()
         {
@@ -40,7 +42,8 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
             base.OnNavigatedTo(e);
             Utils.EnableBackButton(BackButton_Click);
             Attachments.Clear();
-            Attachments.Add($"{ApplicationData.Current.LocalCacheFolder.Path}/Attachments/{(e.Parameter as SignalAttachment).Id}.plain");
+            Attachment = e.Parameter as SignalAttachment;
+            Attachments.Add($"{ApplicationData.Current.LocalCacheFolder.Path}/Attachments/{Attachment.Id}.plain");
         }
 
         protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
@@ -54,5 +57,10 @@ private void BackButton_Click(object sender, BackRequestedEventArgs e)
             Frame.GoBack();
             e.Handled = true;
         }
+
+        private async void ExportButton_Click(object sender, RoutedEventArgs e)
+        {
+            await App.Handle.ExportAttachment(Attachment);
+        }
     }
 }
diff --git a/Signal-Windows/Views/MainPage.xaml b/Signal-Windows/Views/MainPage.xaml
@@ -8,6 +8,7 @@
     xmlns:viewmodels="using:Signal_Windows.ViewModels"
     xmlns:controls="using:Signal_Windows.Controls"
     mc:Ignorable="d"
+    NavigationCacheMode="Required"
     DataContext="{Binding MainPageInstance, Source={StaticResource Locator}}">
 
     <Page.Resources>
@@ -24,7 +25,7 @@
             </ResourceDictionary.ThemeDictionaries>
         </ResourceDictionary>
     </Page.Resources>
-    <SplitView Name="MainPanel" CompactPaneLength="0" OpenPaneLength="320" DisplayMode="CompactInline">
+    <SplitView Name="MainPanel" IsPaneOpen="{x:Bind Vm.IsPaneOpen, Mode=OneWay}" CompactPaneLength="{x:Bind Vm.CompactPaneLength, Mode=OneWay}" OpenPaneLength="{x:Bind Vm.OpenPaneLength, Mode=OneWay}" DisplayMode="{x:Bind Vm.DisplayMode, Mode=OneWay}">
         <SplitView.Pane>
             <Grid x:Name="ContactsGrid">
                 <Grid.RowDefinitions>
@@ -47,10 +48,10 @@
                     </Button>
                 </Grid>
                 <AutoSuggestBox Grid.Row="1" Margin="16"/>
-                <ListView Grid.Row="2" Name="ContactsList" ItemsSource="{x:Bind Vm.Conversations, Mode=TwoWay}" SelectionMode="Single" SelectionChanged="Vm.ConversationsList_SelectionChanged" SelectedItem="{x:Bind Vm.SelectedConversation, Mode=TwoWay}">
+                <ListView Grid.Row="2" Name="ContactsList" ItemsSource="{x:Bind Vm.Conversations, Mode=TwoWay}" SelectionMode="Single" SelectionChanged="Vm.ConversationsList_SelectionChanged" SelectedItem="{x:Bind Vm.SelectedConversation, Mode=TwoWay}" VirtualizingStackPanel.VirtualizationMode="Recycling">
                     <ListView.ItemsPanel>
                         <ItemsPanelTemplate>
-                            <StackPanel></StackPanel>
+                            <VirtualizingStackPanel></VirtualizingStackPanel>
                         </ItemsPanelTemplate>
                     </ListView.ItemsPanel>
                     <ListView.ItemContainerStyle>
diff --git a/Signal-Windows/Views/MainPage.xaml.cs b/Signal-Windows/Views/MainPage.xaml.cs
@@ -6,6 +6,7 @@
 using Signal_Windows.ViewModels;
 using Signal_Windows.Views;
 using System;
+using System.Diagnostics;
 using System.Threading.Tasks;
 using Windows.Foundation;
 using Windows.UI.Popups;
@@ -38,20 +39,20 @@ public void SwitchToStyle(PageStyle newStyle)
                 if (Vm.SelectedThread != null)
                 {
                     Utils.EnableBackButton(Vm.BackButton_Click);
-                    MainPanel.IsPaneOpen = false;
-                    MainPanel.CompactPaneLength = 0;
+                    Vm.IsPaneOpen = false;
+                    Vm.CompactPaneLength = 0;
                 }
                 else
                 {
                     Unselect();
-                    MainPanel.IsPaneOpen = true;
+                    Vm.IsPaneOpen = true;
                 }
             }
             else if (newStyle == PageStyle.Wide)
             {
                 Utils.DisableBackButton(Vm.BackButton_Click);
-                MainPanel.IsPaneOpen = false;
-                MainPanel.CompactPaneLength = ContactsGrid.Width = 320;
+                Vm.IsPaneOpen = false;
+                Vm.CompactPaneLength = ContactsGrid.Width = 320;
             }
             UpdateStyle(newStyle);
         }
@@ -62,39 +63,34 @@ private void UpdateStyle(PageStyle currentStyle)
             {
                 // TODO: When phone is in landscape mode this is incorrect and some stuff gets cut off, we need to
                 // get the actual useable width (actualwidth - top icon bar - bottom control bar)
-                ContactsGrid.Width = ActualWidth;
+                ContactsGrid.Width = Frame.ActualWidth;
                 if (Vm.SelectedThread == null)
                 {
-                    MainPanel.OpenPaneLength = ActualWidth;
+                    Vm.OpenPaneLength = Frame.ActualWidth;
                 }
             }
             else if (currentStyle == PageStyle.Wide)
             {
-                MainPanel.CompactPaneLength = MainPanel.OpenPaneLength = ContactsGrid.Width = 320;
+                Vm.CompactPaneLength = Vm.OpenPaneLength = ContactsGrid.Width = 320;
             }
         }
 
         public PageStyle GetCurrentViewStyle()
         {
-            return Utils.GetViewStyle(new Size(ActualWidth, ActualHeight));
+            return Utils.GetViewStyle(new Size(Frame.ActualWidth, ActualHeight));
         }
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (e.Parameter != null)
-            {
-                Vm.RequestedConversationId = e.Parameter as string;
-            }
-            UpdateLayout();
+            Vm.RequestedConversationId = e.Parameter as string;
             SwitchToStyle(GetCurrentViewStyle());
-            MainPanel.DisplayMode = SplitViewDisplayMode.CompactInline;
+            Vm.DisplayMode = SplitViewDisplayMode.CompactInline;
             Frame.SizeChanged += Frame_SizeChanged;
             Vm.TrySelectConversation(Vm.RequestedConversationId);
         }
 
         protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
         {
-            Vm.Deselect();
             Frame.SizeChanged -= Frame_SizeChanged;
             if (GetCurrentViewStyle() == PageStyle.Narrow)
             {

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ private void ThreadListItem_DataContextChanged(FrameworkElement sender, DataCont`
`172`	`172`	`UpdateBlockedContactElement();`
`173`	`173`	`Model.UpdateUI = UpdateBlockedContactElement;`
`174`	`174`	`}`
`175`		`- else if (frame.CurrentSourcePageType == typeof(MainPage))`
	`175`	`+ else`
`176`	`176`	`{`
`177`	`177`	`UpdateConversationDisplay();`
`178`	`178`	`Model.UpdateUI = UpdateConversationDisplay;`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System;`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Collections.ObjectModel;`
	`5`	`+using System.Diagnostics;`
`5`	`6`	`using System.IO;`
`6`	`7`	`using System.Linq;`
`7`	`8`	`using System.Runtime.InteropServices.WindowsRuntime;`
`@@ -27,6 +28,7 @@ namespace Signal_Windows.Views`
`27`	`28`	`public sealed partial class AttachmentDetailsPage : Page`
`28`	`29`	`{`
`29`	`30`	`public ObservableCollection<string> Attachments { get; set; } = new ObservableCollection<string>();`
	`31`	`+ private SignalAttachment Attachment;`
`30`	`32`
`31`	`33`	`public AttachmentDetailsPage()`
`32`	`34`	`{`
`@@ -40,7 +42,8 @@ protected override void OnNavigatedTo(NavigationEventArgs e)`
`40`	`42`	`base.OnNavigatedTo(e);`
`41`	`43`	`Utils.EnableBackButton(BackButton_Click);`
`42`	`44`	`Attachments.Clear();`
`43`		`- Attachments.Add($"{ApplicationData.Current.LocalCacheFolder.Path}/Attachments/{(e.Parameter as SignalAttachment).Id}.plain");`
	`45`	`+ Attachment = e.Parameter as SignalAttachment;`
	`46`	`+ Attachments.Add($"{ApplicationData.Current.LocalCacheFolder.Path}/Attachments/{Attachment.Id}.plain");`
`44`	`47`	`}`
`45`	`48`
`46`	`49`	`protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)`
`@@ -54,5 +57,10 @@ private void BackButton_Click(object sender, BackRequestedEventArgs e)`
`54`	`57`	`Frame.GoBack();`
`55`	`58`	`e.Handled = true;`
`56`	`59`	`}`
	`60`	`+`
	`61`	`+ private async void ExportButton_Click(object sender, RoutedEventArgs e)`
	`62`	`+ {`
	`63`	`+ await App.Handle.ExportAttachment(Attachment);`
	`64`	`+ }`
`57`	`65`	`}`
`58`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using Signal_Windows.ViewModels;`
`7`	`7`	`using Signal_Windows.Views;`
`8`	`8`	`using System;`
	`9`	`+using System.Diagnostics;`
`9`	`10`	`using System.Threading.Tasks;`
`10`	`11`	`using Windows.Foundation;`
`11`	`12`	`using Windows.UI.Popups;`
`@@ -38,20 +39,20 @@ public void SwitchToStyle(PageStyle newStyle)`
`38`	`39`	`if (Vm.SelectedThread != null)`
`39`	`40`	`{`
`40`	`41`	`Utils.EnableBackButton(Vm.BackButton_Click);`
`41`		`- MainPanel.IsPaneOpen = false;`
`42`		`- MainPanel.CompactPaneLength = 0;`
	`42`	`+ Vm.IsPaneOpen = false;`
	`43`	`+ Vm.CompactPaneLength = 0;`
`43`	`44`	`}`
`44`	`45`	`else`
`45`	`46`	`{`
`46`	`47`	`Unselect();`
`47`		`- MainPanel.IsPaneOpen = true;`
	`48`	`+ Vm.IsPaneOpen = true;`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`	`else if (newStyle == PageStyle.Wide)`
`51`	`52`	`{`
`52`	`53`	`Utils.DisableBackButton(Vm.BackButton_Click);`
`53`		`- MainPanel.IsPaneOpen = false;`
`54`		`- MainPanel.CompactPaneLength = ContactsGrid.Width = 320;`
	`54`	`+ Vm.IsPaneOpen = false;`
	`55`	`+ Vm.CompactPaneLength = ContactsGrid.Width = 320;`
`55`	`56`	`}`
`56`	`57`	`UpdateStyle(newStyle);`
`57`	`58`	`}`
`@@ -62,39 +63,34 @@ private void UpdateStyle(PageStyle currentStyle)`
`62`	`63`	`{`
`63`	`64`	`// TODO: When phone is in landscape mode this is incorrect and some stuff gets cut off, we need to`
`64`	`65`	`// get the actual useable width (actualwidth - top icon bar - bottom control bar)`
`65`		`- ContactsGrid.Width = ActualWidth;`
	`66`	`+ ContactsGrid.Width = Frame.ActualWidth;`
`66`	`67`	`if (Vm.SelectedThread == null)`
`67`	`68`	`{`
`68`		`- MainPanel.OpenPaneLength = ActualWidth;`
	`69`	`+ Vm.OpenPaneLength = Frame.ActualWidth;`
`69`	`70`	`}`
`70`	`71`	`}`
`71`	`72`	`else if (currentStyle == PageStyle.Wide)`
`72`	`73`	`{`
`73`		`- MainPanel.CompactPaneLength = MainPanel.OpenPaneLength = ContactsGrid.Width = 320;`
	`74`	`+ Vm.CompactPaneLength = Vm.OpenPaneLength = ContactsGrid.Width = 320;`
`74`	`75`	`}`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`public PageStyle GetCurrentViewStyle()`
`78`	`79`	`{`
`79`		`- return Utils.GetViewStyle(new Size(ActualWidth, ActualHeight));`
	`80`	`+ return Utils.GetViewStyle(new Size(Frame.ActualWidth, ActualHeight));`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`83`	`84`	`{`
`84`		`- if (e.Parameter != null)`
`85`		`- {`
`86`		`- Vm.RequestedConversationId = e.Parameter as string;`
`87`		`- }`
`88`		`- UpdateLayout();`
	`85`	`+ Vm.RequestedConversationId = e.Parameter as string;`
`89`	`86`	`SwitchToStyle(GetCurrentViewStyle());`
`90`		`- MainPanel.DisplayMode = SplitViewDisplayMode.CompactInline;`
	`87`	`+ Vm.DisplayMode = SplitViewDisplayMode.CompactInline;`
`91`	`88`	`Frame.SizeChanged += Frame_SizeChanged;`
`92`	`89`	`Vm.TrySelectConversation(Vm.RequestedConversationId);`
`93`	`90`	`}`
`94`	`91`
`95`	`92`	`protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)`
`96`	`93`	`{`
`97`		`- Vm.Deselect();`
`98`	`94`	`Frame.SizeChanged -= Frame_SizeChanged;`
`99`	`95`	`if (GetCurrentViewStyle() == PageStyle.Narrow)`
`100`	`96`	`{`