From 51f752ec54708e754463106b78591ab2c1e96a1c Mon Sep 17 00:00:00 2001
From: Emmanuel Hansen <emmausssss@gmail.com>
Date: Wed, 3 Apr 2024 15:36:09 +0000
Subject: [PATCH 1/2] apply current_filter extension from dbus save picker

---
 src/Avalonia.FreeDesktop/DBusSystemDialog.cs | 36 +++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.FreeDesktop/DBusSystemDialog.cs b/src/Avalonia.FreeDesktop/DBusSystemDialog.cs
index 7e43aaf943e..7ee963fc170 100644
--- a/src/Avalonia.FreeDesktop/DBusSystemDialog.cs
+++ b/src/Avalonia.FreeDesktop/DBusSystemDialog.cs
@@ -98,12 +98,46 @@ public override async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(File
             objectPath = await _fileChooser.SaveFileAsync(parentWindow, options.Title ?? string.Empty, chooserOptions);
             var request = new OrgFreedesktopPortalRequest(_connection, "org.freedesktop.portal.Desktop", objectPath);
             var tsc = new TaskCompletionSource<string[]?>();
+            FilePickerFileType? selectedType = null;
             using var disposable = await request.WatchResponseAsync((e, x) =>
             {
                 if (e is not null)
                     tsc.TrySetException(e);
                 else
+                {
+                    if(x.results.TryGetValue("current_filter", out var value))
+                    {
+                        var currentFilter = value.Value as DBusStructItem;
+                        if(currentFilter != null)
+                        {
+                            var name = (currentFilter[0] as DBusStringItem)?.Value.ToString() ?? "";
+                            selectedType = new FilePickerFileType(name);
+                            if(currentFilter[1] is DBusArrayItem types)
+                            {
+                                List<string> filters = new List<string>();
+                                List<string> mimeTypes = new List<string>();
+                                foreach(var t in types)
+                                {
+                                    if(t is DBusStructItem filter)
+                                    {
+                                        if((filter[0] as DBusUInt32Item)?.Value == 1)
+                                        {
+                                            mimeTypes.Add((filter[1] as DBusStringItem)?.Value.ToString() ?? "");
+                                        }
+                                        else
+                                        {
+                                            filters.Add((filter[1] as DBusStringItem)?.Value.ToString() ?? "");
+                                        }
+                                    }
+                                }
+
+                                selectedType.Patterns = filters;
+                                selectedType.MimeTypes = mimeTypes;
+                            }
+                        }
+                    }
                     tsc.TrySetResult((x.results["uris"].Value as DBusArrayItem)?.Select(static y => (y as DBusStringItem)!.Value).ToArray());
+                }
             });
 
             var uris = await tsc.Task;
@@ -113,7 +147,7 @@ public override async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(File
                 return null;
 
             // WSL2 freedesktop automatically adds extension from selected file type, but we can't pass "default ext". So apply it manually.
-            path = StorageProviderHelpers.NameWithExtension(path, options.DefaultExtension, null);
+            path = StorageProviderHelpers.NameWithExtension(path, options.DefaultExtension, selectedType);
             return new BclStorageFile(new FileInfo(path));
         }
 

From 7a8cb0ca4d48d6980b18dd494c2ae6c71de15e1d Mon Sep 17 00:00:00 2001
From: Emmanuel Hansen <emmausssss@gmail.com>
Date: Wed, 3 Apr 2024 15:45:19 +0000
Subject: [PATCH 2/2] simplify reading  filters

---
 samples/ControlCatalog/Pages/DialogsPage.xaml.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
index 39b00590f31..7cfb036577d 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
@@ -247,7 +247,6 @@ List<FileDialogFilter> GetFilters()
                     FileTypeChoices = fileTypes,
                     SuggestedStartLocation = lastSelectedDirectory,
                     SuggestedFileName = "FileName",
-                    DefaultExtension = fileTypes?.Any() == true ? "txt" : null,
                     ShowOverwritePrompt = true
                 });