Cancelling file picker shouldn't send info

microsoft · Apr 23, 2024 · 1f64109 · 1f64109
1 parent 1a3e02b
commit 1f64109
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/common/Renderers/FilePickerAction.cs b/common/Renderers/FilePickerAction.cs
@@ -71,7 +71,9 @@ public JsonObject ToJson()
         return json;
     }
 
-    public void LaunchFilePicker()
+    /// <summary>Launches the file picker dialog to select a file.</summary>
+    /// <returns>true if a file was selected, false otherwise.</returns>
+    public bool LaunchFilePicker()
     {
         var filePicker = new FileOpenPicker();
         filePicker.FileTypeFilter.Add("*");
@@ -87,7 +89,10 @@ public void LaunchFilePicker()
         if (file != null)
         {
             FilePath = file.Path;
+            return true;
         }
+
+        return false;
     }
 }
 

diff --git a/tools/Dashboard/DevHome.Dashboard/ViewModels/WidgetViewModel.cs b/tools/Dashboard/DevHome.Dashboard/ViewModels/WidgetViewModel.cs
@@ -325,7 +325,12 @@ private async void HandleAdaptiveAction(RenderedAdaptiveCard sender, AdaptiveAct
         else if (args.Action is FilePickerAction filePickerAction)
         {
             var dataToSend = string.Empty;
-            filePickerAction.LaunchFilePicker();
+            if (!filePickerAction.LaunchFilePicker())
+            {
+                // Don't send data if the user canceled the file picker.
+                return;
+            }
+
             var dataType = filePickerAction.ToJson().ValueType;
             if (dataType != Windows.Data.Json.JsonValueType.Null)
             {