From b1f5855b905d669b9bc80e20ead6f852cbc58a9a Mon Sep 17 00:00:00 2001
From: d2dyno006 <53011783+d2dyno006@users.noreply.github.com>
Date: Wed, 22 Dec 2021 21:11:00 +0100
Subject: [PATCH] Small fix for file names when pasting images

---
 ClipboardCanvas/CanavsPasteModels/ImagePasteModel.cs | 8 +++++++-
 ClipboardCanvas/Helpers/ClipboardHelpers.cs          | 5 +++++
 ClipboardCanvas/Package.appxmanifest                 | 2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ClipboardCanvas/CanavsPasteModels/ImagePasteModel.cs b/ClipboardCanvas/CanavsPasteModels/ImagePasteModel.cs
index ee1a650..e42d7fd 100644
--- a/ClipboardCanvas/CanavsPasteModels/ImagePasteModel.cs
+++ b/ClipboardCanvas/CanavsPasteModels/ImagePasteModel.cs
@@ -16,6 +16,7 @@
 using ClipboardCanvas.Contexts.Operations;
 using ClipboardCanvas.Helpers;
 using ClipboardCanvas.Helpers.Filesystem;
+using System.IO;
 
 namespace ClipboardCanvas.CanavsPasteModels
 {
@@ -90,8 +91,13 @@ protected override async Task<SafeWrapperResult> SetDataFromDataPackage(DataPack
                 }
                 else // Just image
                 {
-
                     SafeWrapper<RandomAccessStreamReference> bitmap = await dataPackage.SafeGetBitmapAsync();
+                    SafeWrapper<Uri> uri = await dataPackage.SafeGetUriAsync();
+
+                    if (uri)
+                    {
+                        customName = Path.GetFileName(uri.Result.LocalPath);
+                    }
 
                     if (!bitmap)
                     {
diff --git a/ClipboardCanvas/Helpers/ClipboardHelpers.cs b/ClipboardCanvas/Helpers/ClipboardHelpers.cs
index a56d99e..7c26c47 100644
--- a/ClipboardCanvas/Helpers/ClipboardHelpers.cs
+++ b/ClipboardCanvas/Helpers/ClipboardHelpers.cs
@@ -47,5 +47,10 @@ public static async Task<SafeWrapper<RandomAccessStreamReference>> SafeGetBitmap
         {
             return await SafeWrapperRoutines.SafeWrapAsync(() => dataPackage.GetBitmapAsync().AsTask());
         }
+
+        public static async Task<SafeWrapper<Uri>> SafeGetUriAsync(this DataPackageView dataPackage)
+        {
+            return await SafeWrapperRoutines.SafeWrapAsync(() => dataPackage.GetUriAsync().AsTask());
+        }
     }
 }
diff --git a/ClipboardCanvas/Package.appxmanifest b/ClipboardCanvas/Package.appxmanifest
index 95d3e37..510bb84 100644
--- a/ClipboardCanvas/Package.appxmanifest
+++ b/ClipboardCanvas/Package.appxmanifest
@@ -32,7 +32,7 @@
       EntryPoint="$targetentrypoint$">
       <uap:VisualElements
         DisplayName="Clipboard Canvas"
-        Description="A tool that helps you be productive, preview multiple files on Infinite Canvas, save storage space with smart Reference Files, and work uninterruptedly with AutoPaste."
+        Description="A tool that helps you be productive, preview multiple files on Infinite Canvas, save storage space with smart Reference Files, and work uninterruptedly with Autopaste."
         BackgroundColor="transparent"
         Square150x150Logo="Assets\AppIcon\Square150x150Logo.png"
         Square44x44Logo="Assets\AppIcon\Square44x44Logo.png">