Commitefb60ca

authored

chore: fixed user notifier default notification handler (#141)

1 parent7e3782f commitefb60caCopy full SHA for efb60ca

File tree

+16

-11

lines changed

+16

-11

lines changed

Lines changed: 4 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`
`28`	`28`	`namespaceCoder.Desktop.App;`
`29`	`29`
`30`		`-publicpartialclassApp:Application,IDispatcherQueueManager,INotificationHandler`
	`30`	`+publicpartialclassApp:Application,IDispatcherQueueManager,IDefaultNotificationHandler`
`31`	`31`	`{`
`32`	`32`	`privateconststringMutagenControllerConfigSection="MutagenController";`
`33`	`33`	`privateconststringUpdaterConfigSection="Updater";`
`@@ -91,7 +91,7 @@ public App()`
`91`	`91`	`services.AddSingleton<IAgentApiClientFactory,AgentApiClientFactory>();`
`92`	`92`
`93`	`93`	`services.AddSingleton<IDispatcherQueueManager>(_=>this);`
`94`		`-services.AddSingleton<INotificationHandler>(_=>this);`
	`94`	`+services.AddSingleton<IDefaultNotificationHandler>(_=>this);`
`95`	`95`	`services.AddSingleton<ICredentialBackend>(_=>`
`96`	`96`	`newWindowsCredentialBackend(WindowsCredentialBackend.CoderCredentialsTargetName));`
`97`	`97`	`services.AddSingleton<ICredentialManager,CredentialManager>();`
`@@ -337,12 +337,8 @@ public void RunInUiThread(DispatcherQueueHandler action)`
`337`	`337`	`dispatcherQueue.TryEnqueue(action);`
`338`	`338`	`}`
`339`	`339`
`340`		`-publicvoidHandleNotificationActivation(IDictionary<string,string>args)`
	`340`	`+publicvoidHandleNotificationActivation(IDictionary<string,string>_)`
`341`	`341`	`{`
`342`		`-varapp=(App)Current;`
`343`		`-if(app!=null&&app.TrayWindow!=null)`
`344`		`-{`
`345`		`-app.TrayWindow.Tray_Open();`
`346`		`-}`
	`342`	`+TrayWindow?.Tray_Open();`
`347`	`343`	`}`
`348`	`344`	`}`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,12 @@ public interface INotificationHandler`
`15`	`15`	`publicvoidHandleNotificationActivation(IDictionary<string,string>args);`
`16`	`16`	`}`
`17`	`17`
	`18`	`+// This interface is meant to protect the default`
	`19`	`+// notification handler from being overriden by DI.`
	`20`	`+publicinterfaceIDefaultNotificationHandler:INotificationHandler`
	`21`	`+{`
	`22`	`+}`
	`23`	`+`
`18`	`24`	`publicinterfaceIUserNotifier:INotificationHandler,IAsyncDisposable`
`19`	`25`	`{`
`20`	`26`	`publicvoidRegisterHandler(stringname,INotificationHandlerhandler);`
`@@ -46,7 +52,7 @@ public class UserNotifier : IUserNotifier`
`46`	`52`	`privateConcurrentDictionary<string,INotificationHandler>Handlers{get;}=new();`
`47`	`53`
`48`	`54`	`publicUserNotifier(ILogger<UserNotifier>logger,IDispatcherQueueManagerdispatcherQueueManager,`
`49`		`-INotificationHandlernotificationHandler)`
	`55`	`+IDefaultNotificationHandlernotificationHandler)`
`50`	`56`	`{`
`51`	`57`	`_logger=logger;`
`52`	`58`	`_dispatcherQueueManager=dispatcherQueueManager;`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -152,10 +152,13 @@ private void SetPageByState(RpcModel rpcModel, CredentialModel credentialModel,`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
	`155`	`+/// <summary>`
	`156`	`+/// This method is called when the state changes, but we don't want to notify`
	`157`	`+/// the user if the state hasn't changed.`
	`158`	`+/// </summary>`
	`159`	`+/// <param name="rpcModel"></param>`
`155`	`160`	`privatevoidMaybeNotifyUser(RpcModelrpcModel)`
`156`	`161`	`{`
`157`		`-// This method is called when the state changes, but we don't want to notify`
`158`		`-// the user if the state hasn't changed.`
`159`	`162`	`varisRpcLifecycleChanged=rpcModel.RpcLifecycle==RpcLifecycle.Disconnected&&curRpcLifecycle!=rpcModel.RpcLifecycle;`
`160`	`163`	`varisVpnLifecycleChanged=(rpcModel.VpnLifecycle==VpnLifecycle.Started\|\|rpcModel.VpnLifecycle==VpnLifecycle.Stopped)&&curVpnLifecycle!=rpcModel.VpnLifecycle;`
`161`	`164`

Comments

(0)