From baef9ddacd119e5fdce544b8f5ee476482732408 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 6 Jun 2025 18:37:17 +0800
Subject: [PATCH] Expose ISaveable interface in derived class to make sure we
 are calling the new version of Save method

---
 .../Storage/FlowLauncherJsonStorage.cs                        | 4 +++-
 Flow.Launcher.Infrastructure/Storage/PluginBinaryStorage.cs   | 4 +++-
 Flow.Launcher.Infrastructure/Storage/PluginJsonStorage.cs     | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/Storage/FlowLauncherJsonStorage.cs b/Flow.Launcher.Infrastructure/Storage/FlowLauncherJsonStorage.cs
index 158e0cdf5..857490bad 100644
--- a/Flow.Launcher.Infrastructure/Storage/FlowLauncherJsonStorage.cs
+++ b/Flow.Launcher.Infrastructure/Storage/FlowLauncherJsonStorage.cs
@@ -2,11 +2,13 @@
 using System.Threading.Tasks;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.UserSettings;
+using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedCommands;
 
 namespace Flow.Launcher.Infrastructure.Storage
 {
-    public class FlowLauncherJsonStorage<T> : JsonStorage<T> where T : new()
+    // Expose ISaveable interface in derived class to make sure we are calling the new version of Save method
+    public class FlowLauncherJsonStorage<T> : JsonStorage<T>, ISavable where T : new()
     {
         private static readonly string ClassName = "FlowLauncherJsonStorage";
 
diff --git a/Flow.Launcher.Infrastructure/Storage/PluginBinaryStorage.cs b/Flow.Launcher.Infrastructure/Storage/PluginBinaryStorage.cs
index 01da96d62..0e0906e73 100644
--- a/Flow.Launcher.Infrastructure/Storage/PluginBinaryStorage.cs
+++ b/Flow.Launcher.Infrastructure/Storage/PluginBinaryStorage.cs
@@ -1,11 +1,13 @@
 using System.IO;
 using System.Threading.Tasks;
 using Flow.Launcher.Infrastructure.Logger;
+using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedCommands;
 
 namespace Flow.Launcher.Infrastructure.Storage
 {
-    public class PluginBinaryStorage<T> : BinaryStorage<T> where T : new()
+    // Expose ISaveable interface in derived class to make sure we are calling the new version of Save method
+    public class PluginBinaryStorage<T> : BinaryStorage<T>, ISavable where T : new()
     {
         private static readonly string ClassName = "PluginBinaryStorage";
 
diff --git a/Flow.Launcher.Infrastructure/Storage/PluginJsonStorage.cs b/Flow.Launcher.Infrastructure/Storage/PluginJsonStorage.cs
index 147152949..d59083071 100644
--- a/Flow.Launcher.Infrastructure/Storage/PluginJsonStorage.cs
+++ b/Flow.Launcher.Infrastructure/Storage/PluginJsonStorage.cs
@@ -2,11 +2,13 @@
 using System.Threading.Tasks;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.UserSettings;
+using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedCommands;
 
 namespace Flow.Launcher.Infrastructure.Storage
 {
-    public class PluginJsonStorage<T> : JsonStorage<T> where T : new()
+    // Expose ISaveable interface in derived class to make sure we are calling the new version of Save method
+    public class PluginJsonStorage<T> : JsonStorage<T>, ISavable where T : new()
     {
         // Use assembly name to check which plugin is using this storage
         public readonly string AssemblyName;