Skip to content

Commit 1ede69c

Browse files
committed
Make Plugin dictionary private
1 parent 63378e1 commit 1ede69c

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

Flow.Launcher.Core/Plugin/PluginManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ internal static async Task UninstallPluginAsync(PluginMetadata plugin, bool remo
622622
API.ShowMsg(API.GetTranslation("failedToRemovePluginCacheTitle"),
623623
string.Format(API.GetTranslation("failedToRemovePluginCacheMessage"), plugin.Name));
624624
}
625-
Settings.Plugins.Remove(plugin.ID);
625+
Settings.RemovePluginSettings(plugin.ID);
626626
AllPlugins.RemoveAll(p => p.Metadata.ID == plugin.ID);
627627
}
628628

Flow.Launcher.Infrastructure/UserSettings/PluginSettings.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public string NodeExecutablePath
2727
}
2828
}
2929

30-
public Dictionary<string, Plugin> Plugins { get; set; } = new Dictionary<string, Plugin>();
30+
private Dictionary<string, Plugin> Plugins { get; set; } = new();
3131

3232
public void UpdatePluginSettings(List<PluginMetadata> metadatas)
3333
{
@@ -67,6 +67,21 @@ public void UpdatePluginSettings(List<PluginMetadata> metadatas)
6767
}
6868
}
6969
}
70+
71+
public Plugin GetPluginSettings(string id)
72+
{
73+
if (Plugins.TryGetValue(id, out var plugin))
74+
{
75+
return plugin;
76+
}
77+
return null;
78+
}
79+
80+
public Plugin RemovePluginSettings(string id)
81+
{
82+
Plugins.Remove(id, out var plugin);
83+
return plugin;
84+
}
7085
}
7186

7287
public class Plugin

Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginsViewModel.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ public SettingsPanePluginsViewModel(Settings settings)
3030
.Select(plugin => new PluginViewModel
3131
{
3232
PluginPair = plugin,
33-
PluginSettingsObject = _settings.PluginSettings.Plugins[plugin.Metadata.ID]
33+
PluginSettingsObject = _settings.PluginSettings.GetPluginSettings(plugin.Metadata.ID)
3434
})
35+
.Where(plugin => plugin.PluginSettingsObject != null)
3536
.ToList();
3637

3738
public List<PluginViewModel> FilteredPluginViewModels => PluginViewModels

0 commit comments

Comments
 (0)