Skip to content
This repository has been archived by the owner on Apr 12, 2023. It is now read-only.

接触確認の処理を実施しないようにする #1133

Merged
1 commit merged into from
Sep 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 0 additions & 37 deletions Covid19Radar/Covid19Radar.Android/MainApplication.cs
Original file line number Diff line number Diff line change
Expand Up @@ -160,42 +160,5 @@ public Task<ExposureConfiguration> 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<DailySummary> dailySummaries, IList<ExposureWindow> exposureWindows, ExposureConfiguration exposureConfiguration)
{
long enVersion = await GetEnClient().GetVersionAsync();
await _exposureDetectionService.Value.ExposureDetectedAsync(exposureConfiguration, enVersion, dailySummaries, exposureWindows);
}

public async Task ExposureDetectedAsync(ExposureSummary exposureSummary, IList<ExposureInformation> 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;
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public override Result DoWork()

try
{
backgroundService.ExposureDetectionAsync().GetAwaiter().GetResult();

return Result.InvokeSuccess();
}
catch (IOException exception)
Expand Down
42 changes: 0 additions & 42 deletions Covid19Radar/Covid19Radar.iOS/AppDelegate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -301,48 +301,6 @@ public Task<ExposureConfiguration> 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<DailySummary> dailySummaries, IList<ExposureWindow> exposureWindows, ExposureConfiguration exposureConfiguration)
{
long enVersion = await GetEnClient().GetVersionAsync();
await _exposureDetectionService.Value.ExposureDetectedAsync(exposureConfiguration, enVersion, dailySummaries, exposureWindows);
}

public async Task ExposureDetectedAsync(ExposureSummary exposureSummary, IList<ExposureInformation> 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;
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public override void Schedule()
{
try
{
await ExposureDetectionAsync(cancellationTokenSource);

task.SetTaskCompleted(true);
}
catch (OperationCanceledException exception)
Expand Down