From 04662e58d8e26ee6fb70e1862cca62d9edfa61c8 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Mon, 12 May 2025 12:21:43 +0200
Subject: [PATCH] ServiceFacade Refactor missing file

---
 BeWo/ServiceProxy/ServiceFacade.cs          | 44 +++------------------
 BeWo/ServiceProxy/ServiceFacadeExtension.cs |  2 +-
 2 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/BeWo/ServiceProxy/ServiceFacade.cs b/BeWo/ServiceProxy/ServiceFacade.cs
index 9cca1a540..2c908ab63 100644
--- a/BeWo/ServiceProxy/ServiceFacade.cs
+++ b/BeWo/ServiceProxy/ServiceFacade.cs
@@ -301,46 +301,14 @@ namespace BeWo.ServiceProxy
 		#endregion
 
 		#region GkvAccounting
-		public static void DoGkvAccountingServiceAsync<T>(Func<IGkvAccountingService, T> pFunc, Action<T> pCallBack, bool showWaitDialog)
-		{
-			DoAsync<GkvAccountingServiceClient, IGkvAccountingService, T>(pFunc, pCallBack, showWaitDialog);
-		}
-		public static void DoGkvAccountingServiceAsync<T>(Func<IGkvAccountingService, T> pFunc, Action<T> pCallBack)
-		{
-			DoAsync<GkvAccountingServiceClient, IGkvAccountingService, T>(pFunc, pCallBack, true);
-		}
-		public static void DoGkvAccountingServiceAsync(Action<IGkvAccountingService> pAction, Action pCallBack)
-		{
-			DoAsync<GkvAccountingServiceClient, IGkvAccountingService, T>(pFunc, pCallBack, null, true, dispatcher);
-		}
-		public static void DoGkvAccountingServiceAsync(Action<IGkvAccountingService> pAction)
-		{
-			DoAsync<GkvAccountingServiceClient, IGkvAccountingService>(pAction, true);
-		}
 		public static void DoGkvAccountingServiceSync(Action<IGkvAccountingService> pAction)
-		{
-			try
-			{
-				pAction.Invoke(GetInstance<GkvAccountingServiceClient, IGkvAccountingService>());
-			}
-			catch (Exception e)
-			{
-				ShowErrorMessage(e);
-			}
-		}
+		 => DoSync<GkvAccountingServiceClient, IGkvAccountingService>(pAction);
 		public static T DoGkvAccountingServiceSync<T>(Func<IGkvAccountingService, T> pFunc)
-		{
-			try
-			{
-				return pFunc.Invoke(GetInstance<GkvAccountingServiceClient, IGkvAccountingService>());
-			}
-			catch (Exception e)
-			{
-				ShowErrorMessage(e);
-			}
-
-			return default(T);
-		}
+		 => DoSync<GkvAccountingServiceClient, IGkvAccountingService, T>(pFunc);
+		public static void DoGkvAccountingServiceAsync(Action<IGkvAccountingService> pAction, Action pCallback = null, Action<Exception> pErrorCallback = null, bool showWaitDialog = true, UserControl caller = null)
+		 => DoAsync<GkvAccountingServiceClient, IGkvAccountingService>(pAction, pCallback, pErrorCallback, showWaitDialog, caller?.Dispatcher);
+		public static void DoGkvAccountingServiceAsync<T>(Func<IGkvAccountingService, T> pFunc, Action<T> pCallback = null, Action<Exception> pErrorCallback = null, bool showWaitDialog = true, UserControl caller = null)
+		 => DoAsync<GkvAccountingServiceClient, IGkvAccountingService, T>(pFunc, pCallback, pErrorCallback, showWaitDialog, caller?.Dispatcher);
 		#endregion
 
 
diff --git a/BeWo/ServiceProxy/ServiceFacadeExtension.cs b/BeWo/ServiceProxy/ServiceFacadeExtension.cs
index b657f313e..2af8cad6e 100644
--- a/BeWo/ServiceProxy/ServiceFacadeExtension.cs
+++ b/BeWo/ServiceProxy/ServiceFacadeExtension.cs
@@ -25,7 +25,7 @@ namespace BeWo.ServiceProxy
 					});
 			}
 
-			ServiceFacade.DoGkvAccountingServiceAsync<T>(pFunc, lCallBack, true);
+			ServiceFacade.DoGkvAccountingServiceAsync<T>(pFunc, lCallBack);
 		}
 
 		public static void DoGkvAccountingServiceAsync(this UserControl uc, Action<IGkvAccountingService> pAction, Action pCallBack = null, bool showWaitDialog = true)