Added service folder to German SCUs

fiskaltrust · Oct 1, 2024 · 240fd4a · 240fd4a
1 parent bfe009b
commit 240fd4a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/src/fiskaltrust.AndroidLauncher.Common/AndroidService/MiddlewareLauncherService.cs b/src/fiskaltrust.AndroidLauncher.Common/AndroidService/MiddlewareLauncherService.cs
@@ -56,6 +56,7 @@ public override StartCommandResult OnStartCommand(Intent intent, StartCommandFla
 
             try
             {
+                Task.Delay(20000).Wait();
                 var isSandbox = intent.GetBooleanExtra("sandbox", false);
                 var cashboxIdString = intent.GetStringExtra("cashboxid");
                 var accessToken = intent.GetStringExtra("accesstoken");

diff --git a/src/fiskaltrust.AndroidLauncher.Common/Services/MiddlewareLauncher.cs b/src/fiskaltrust.AndroidLauncher.Common/Services/MiddlewareLauncher.cs
@@ -140,15 +140,15 @@ public async Task StopAsync()
         private async Task InitializeDESwissbitScuAsync(PackageConfiguration packageConfig)
         {
             var scuProvider = new DESwissbitScuProvider();
-            var scu = scuProvider.CreateSCU(packageConfig, _cashboxId, _isSandbox, _logLevel);
+            var scu = scuProvider.CreateSCU(Environment.GetFolderPath(Environment.SpecialFolder.Personal), packageConfig, _cashboxId, _isSandbox, _logLevel);
             _scus.Add(GetPrimaryUriForSignaturCreationUnit(packageConfig), scu);
             Log.Logger.Debug($"Created German SCU of type 'fiskaltrust.Middleware.SCU.DE.Swissbit'.");
         }
 
         private async Task InitializeDEFiskalyCertifiedScuAsync(PackageConfiguration packageConfig)
         {
             var scuProvider = new DEFiskalyCertifiedScuProvider();
-            var scu = scuProvider.CreateSCU(packageConfig, _cashboxId, _isSandbox, _logLevel);
+            var scu = scuProvider.CreateSCU(Environment.GetFolderPath(Environment.SpecialFolder.Personal), packageConfig, _cashboxId, _isSandbox, _logLevel);
             _scus.Add(GetPrimaryUriForSignaturCreationUnit(packageConfig), scu);
             Log.Logger.Debug($"Created German SCU of type 'fiskaltrust.Middleware.SCU.DE.FiskalyCertified'.");
         }

diff --git a/src/fiskaltrust.AndroidLauncher.Common/Services/SCU/DEFiskalyCertifiedScuProvider.cs b/src/fiskaltrust.AndroidLauncher.Common/Services/SCU/DEFiskalyCertifiedScuProvider.cs
@@ -11,8 +11,9 @@ namespace fiskaltrust.AndroidLauncher.Common.Services.SCU
 {
     class DEFiskalyCertifiedScuProvider : IDESSCDProvider
     {
-        public IDESSCD CreateSCU(PackageConfiguration scuConfiguration, Guid ftCashBoxId, bool isSandbox, LogLevel logLevel)
+        public IDESSCD CreateSCU(string workingDir, PackageConfiguration scuConfiguration, Guid ftCashBoxId, bool isSandbox, LogLevel logLevel)
         {
+            scuConfiguration.Configuration["servicefolder"] = workingDir;
             var bootstrapper = new ScuBootstrapper
             {
                 Configuration = scuConfiguration.Configuration,

diff --git a/src/fiskaltrust.AndroidLauncher.Common/Services/SCU/DESwissbitScuProvider.cs b/src/fiskaltrust.AndroidLauncher.Common/Services/SCU/DESwissbitScuProvider.cs
@@ -15,9 +15,10 @@ namespace fiskaltrust.AndroidLauncher.Common.Services.SCU
 {
     class DESwissbitScuProvider : IDESSCDProvider
     {
-        public IDESSCD CreateSCU(PackageConfiguration scuConfiguration, Guid ftCashBoxId, bool isSandbox, LogLevel logLevel)
+        public IDESSCD CreateSCU(string workingDir, PackageConfiguration scuConfiguration, Guid ftCashBoxId, bool isSandbox, LogLevel logLevel)
         {
             var dir = InitializeTseAsync();
+            scuConfiguration.Configuration["servicefolder"] = workingDir;
             scuConfiguration.Configuration["devicePath"] = dir;
 
             var bootstrapper = new ScuBootstrapper

diff --git a/src/fiskaltrust.AndroidLauncher.Common/Services/SCU/IDESSCDProvider.cs b/src/fiskaltrust.AndroidLauncher.Common/Services/SCU/IDESSCDProvider.cs
@@ -7,6 +7,6 @@ namespace fiskaltrust.AndroidLauncher.Common.Services.SCU
 {
     interface IDESSCDProvider
     {
-        IDESSCD CreateSCU(PackageConfiguration scuConfiguration, Guid ftCashBoxId, bool isSandbox, LogLevel logLevel);
+        IDESSCD CreateSCU(string workingDir, PackageConfiguration scuConfiguration, Guid ftCashBoxId, bool isSandbox, LogLevel logLevel);
     }
 }