Skip to content

Fix Dependency Injection Issue #3275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

Fix Dependency Injection Issue #3275

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c11d78c
Fix dispatcher thread issue in dependency injection
Jack251970 Feb 25, 2025
cbc4369
Merge branch 'dev' into dependency_injection_viewmodel
Jack251970 Feb 26, 2025
18290b8
Add exception when app constructor failed
Jack251970 Feb 26, 2025
d8b07f6
Use message box instead
Jack251970 Feb 26, 2025
92df021
Improve message box in app constructor
Jack251970 Feb 26, 2025
b61199a
Fail fast to exit Flow when encountering issue in constructor
Jack251970 Feb 26, 2025
d48b4df
Downgrade dependency injection version
Jack251970 Feb 26, 2025
437b1c0
Revert "Downgrade dependency injection version"
Jack251970 Feb 26, 2025
1434257
Remove auto startup position
Jack251970 Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 43 additions & 22 deletions Flow.Launcher/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,31 +35,52 @@ public partial class App : IDisposable, ISingleInstanceApp
public App()
{
// Initialize settings
var storage = new FlowLauncherJsonStorage<Settings>();
_settings = storage.Load();
_settings.SetStorage(storage);
_settings.WMPInstalled = WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled();
try
{
var storage = new FlowLauncherJsonStorage<Settings>();
_settings = storage.Load();
_settings.SetStorage(storage);
_settings.WMPInstalled = WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled();
}
catch (Exception e)
{
MessageBox.Show($"Cannot load setting storage: {e}");
}

// Configure the dependency injection container
var host = Host.CreateDefaultBuilder()
.UseContentRoot(AppContext.BaseDirectory)
.ConfigureServices(services => services
.AddSingleton(_ => _settings)
.AddSingleton(sp => new Updater(sp.GetRequiredService<IPublicAPI>(), Launcher.Properties.Settings.Default.GithubRepo))
.AddSingleton<Portable>()
.AddSingleton<SettingWindowViewModel>()
.AddSingleton<IAlphabet, PinyinAlphabet>()
.AddSingleton<StringMatcher>()
.AddSingleton<Internationalization>()
.AddSingleton<IPublicAPI, PublicAPIInstance>()
.AddSingleton<MainViewModel>()
.AddSingleton<Theme>()
).Build();
Ioc.Default.ConfigureServices(host.Services);
try
{
var host = Host.CreateDefaultBuilder()
.UseContentRoot(AppContext.BaseDirectory)
.ConfigureServices(services => services
.AddSingleton(_ => _settings)
.AddSingleton(sp => new Updater(sp.GetRequiredService<IPublicAPI>(), Launcher.Properties.Settings.Default.GithubRepo))
.AddSingleton<Portable>()
.AddSingleton<SettingWindowViewModel>()
.AddSingleton<IAlphabet, PinyinAlphabet>()
.AddSingleton<StringMatcher>()
.AddSingleton<Internationalization>()
.AddSingleton<IPublicAPI, PublicAPIInstance>()
.AddSingleton<MainViewModel>()
.AddSingleton<Theme>()
).Build();
Ioc.Default.ConfigureServices(host.Services);
}
catch (Exception e)
{
MessageBox.Show($"Cannot configure dependency injection container: {e}");
}

// Initialize the public API and Settings first
API = Ioc.Default.GetRequiredService<IPublicAPI>();
_settings.Initialize();
try
{
API = Ioc.Default.GetRequiredService<IPublicAPI>();
_settings.Initialize();
}
catch (Exception e)
{
MessageBox.Show($"Cannot initialize public API and settings: {e}");
}
}

[STAThread]
Expand Down Expand Up @@ -102,8 +123,8 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
await imageLoadertask;

var mainVM = Ioc.Default.GetRequiredService<MainViewModel>();
((PublicAPIInstance)API).Initialize(mainVM);
var window = new MainWindow(_settings, mainVM);

Log.Info($"|App.OnStartup|Dependencies Info:{ErrorReporting.DependenciesInfo()}");

Current.MainWindow = window;
Expand Down
13 changes: 9 additions & 4 deletions Flow.Launcher/PublicAPIInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,22 @@ namespace Flow.Launcher
public class PublicAPIInstance : IPublicAPI
{
private readonly Settings _settings;
private readonly MainViewModel _mainVM;
private MainViewModel _mainVM;

#region Constructor
#region Constructor & Initialization

public PublicAPIInstance(Settings settings, MainViewModel mainVM)
public PublicAPIInstance(Settings settings)
{
_settings = settings;
_mainVM = mainVM;
GlobalHotkey.hookedKeyboardCallback = KListener_hookedKeyboardCallback;
WebRequest.RegisterPrefix("data", new DataWebRequestFactory());
}

// We must initialize mainVM later to avoid dispatcher thread issue
public void Initialize(MainViewModel mainVM)
{
_mainVM = mainVM;
}

#endregion

Expand Down
Loading