From afe03c6405f5734b79233eae59153cc3d90a5d06 Mon Sep 17 00:00:00 2001
From: Clemens Ott <clemens.ott@edu.fh-joanneum.at>
Date: Mon, 17 May 2021 20:45:39 +0200
Subject: [PATCH] Improved extension handling when saving attachment

---
 Signal-Windows.Lib/SignalLibHandle.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Signal-Windows.Lib/SignalLibHandle.cs b/Signal-Windows.Lib/SignalLibHandle.cs
index a3396ad..b580c88 100644
--- a/Signal-Windows.Lib/SignalLibHandle.cs
+++ b/Signal-Windows.Lib/SignalLibHandle.cs
@@ -530,6 +530,11 @@ public async Task ExportAttachment(SignalAttachment sa)
                     SuggestedStartLocation = Windows.Storage.Pickers.PickerLocationId.Downloads,
                     SuggestedFileName = sa.SentFileName ?? "signal"
                 };
+                string extension = Path.GetExtension(savePicker.SuggestedFileName);
+                if (!string.IsNullOrWhiteSpace(extension))
+                {
+                    savePicker.FileTypeChoices.Add(extension.TrimStart('.').ToUpper(), new List<string>() { extension });
+                }
                 savePicker.FileTypeChoices.Add("Any", new List<string>() { "." });
                 var target_file = await savePicker.PickSaveFileAsync();
                 if (target_file != null)