From 8d9e8a6d0b2c803915ab80a4ce3bab074519b8bd Mon Sep 17 00:00:00 2001 From: cocoa-dev004 <66989461+cocoa-dev004@users.noreply.github.com> Date: Tue, 6 Sep 2022 14:19:35 +0900 Subject: [PATCH] Disabled exposure detection --- .../Covid19Radar.Android/MainApplication.cs | 37 ---------------- .../ExposureDetectionBackgroundService.cs | 2 +- Covid19Radar/Covid19Radar.iOS/AppDelegate.cs | 42 ------------------- .../ExposureDetectionBackgroundService.cs | 2 +- 4 files changed, 2 insertions(+), 81 deletions(-) diff --git a/Covid19Radar/Covid19Radar.Android/MainApplication.cs b/Covid19Radar/Covid19Radar.Android/MainApplication.cs index cd1b18d69..2282af0bb 100644 --- a/Covid19Radar/Covid19Radar.Android/MainApplication.cs +++ b/Covid19Radar/Covid19Radar.Android/MainApplication.cs @@ -160,42 +160,5 @@ public Task GetExposureConfigurationAsync() { return _exposureConfigurationRepository.Value.GetExposureConfigurationAsync(); } - - public async Task PreExposureDetectedAsync(ExposureConfiguration exposureConfiguration) - { - long enVersion = await GetEnClient().GetVersionAsync(); - _exposureDetectionService.Value.PreExposureDetected(exposureConfiguration, enVersion); - } - - public async Task ExposureDetectedAsync(IList dailySummaries, IList exposureWindows, ExposureConfiguration exposureConfiguration) - { - long enVersion = await GetEnClient().GetVersionAsync(); - await _exposureDetectionService.Value.ExposureDetectedAsync(exposureConfiguration, enVersion, dailySummaries, exposureWindows); - } - - public async Task ExposureDetectedAsync(ExposureSummary exposureSummary, IList exposureInformations, ExposureConfiguration exposureConfiguration) - { - long enVersion = await GetEnClient().GetVersionAsync(); - await _exposureDetectionService.Value.ExposureDetectedAsync(exposureConfiguration, enVersion, exposureSummary, exposureInformations); - } - - public async Task ExposureNotDetectedAsync(ExposureConfiguration exposureConfiguration) - { - long enVersion = await GetEnClient().GetVersionAsync(); - await _exposureDetectionService.Value.ExposureNotDetectedAsync(exposureConfiguration, enVersion); - } - - public Task ExceptionOccurredAsync(ENException exception) - { - _loggerService.Value.Exception($"ENExcepiton occurred, Code:{exception.Code}, Message:{exception.Message}", exception); - return Task.CompletedTask; - } - - public Task ExceptionOccurredAsync(Exception exception) - { - _loggerService.Value.Exception("ENExcepiton occurred", exception); - return Task.CompletedTask; - } - } } diff --git a/Covid19Radar/Covid19Radar.Android/Services/ExposureDetectionBackgroundService.cs b/Covid19Radar/Covid19Radar.Android/Services/ExposureDetectionBackgroundService.cs index cd8197a30..77ee76d00 100644 --- a/Covid19Radar/Covid19Radar.Android/Services/ExposureDetectionBackgroundService.cs +++ b/Covid19Radar/Covid19Radar.Android/Services/ExposureDetectionBackgroundService.cs @@ -105,7 +105,7 @@ public override Result DoWork() try { - backgroundService.ExposureDetectionAsync().GetAwaiter().GetResult(); + return Result.InvokeSuccess(); } catch (IOException exception) diff --git a/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs b/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs index 36831be33..94946212e 100644 --- a/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs +++ b/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs @@ -301,48 +301,6 @@ public Task GetExposureConfigurationAsync() { return _exposureConfigurationRepository.Value.GetExposureConfigurationAsync(); } - - public Task DiagnosisKeysDataMappingAppliedAsync() - { - _exposureDetectionService.Value.DiagnosisKeysDataMappingApplied(); - return Task.CompletedTask; - } - - public async Task PreExposureDetectedAsync(ExposureConfiguration exposureConfiguration) - { - long enVersion = await GetEnClient().GetVersionAsync(); - _exposureDetectionService.Value.PreExposureDetected(exposureConfiguration, enVersion); - } - - public async Task ExposureDetectedAsync(IList dailySummaries, IList exposureWindows, ExposureConfiguration exposureConfiguration) - { - long enVersion = await GetEnClient().GetVersionAsync(); - await _exposureDetectionService.Value.ExposureDetectedAsync(exposureConfiguration, enVersion, dailySummaries, exposureWindows); - } - - public async Task ExposureDetectedAsync(ExposureSummary exposureSummary, IList exposureInformations, ExposureConfiguration exposureConfiguration) - { - long enVersion = await GetEnClient().GetVersionAsync(); - await _exposureDetectionService.Value.ExposureDetectedAsync(exposureConfiguration, enVersion, exposureSummary, exposureInformations); - } - - public async Task ExposureNotDetectedAsync(ExposureConfiguration exposureConfiguration) - { - long enVersion = await GetEnClient().GetVersionAsync(); - await _exposureDetectionService.Value.ExposureNotDetectedAsync(exposureConfiguration, enVersion); - } - - public Task ExceptionOccurredAsync(ENException exception) - { - _loggerService.Value.Exception($"ENExcepiton occurred, Code:{exception.Code}, Message:{exception.Message}", exception); - return Task.CompletedTask; - } - - public Task ExceptionOccurredAsync(Exception exception) - { - _loggerService.Value.Exception("ENExcepiton occurred", exception); - return Task.CompletedTask; - } } } diff --git a/Covid19Radar/Covid19Radar.iOS/Services/ExposureDetectionBackgroundService.cs b/Covid19Radar/Covid19Radar.iOS/Services/ExposureDetectionBackgroundService.cs index a26764900..1b3867f6f 100644 --- a/Covid19Radar/Covid19Radar.iOS/Services/ExposureDetectionBackgroundService.cs +++ b/Covid19Radar/Covid19Radar.iOS/Services/ExposureDetectionBackgroundService.cs @@ -68,7 +68,7 @@ public override void Schedule() { try { - await ExposureDetectionAsync(cancellationTokenSource); + task.SetTaskCompleted(true); } catch (OperationCanceledException exception)