This repository has been archived by the owner on Jun 20, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 284
Clear the key packages and app config on ENError = 2 #1359
Merged
marcussc
merged 3 commits into
rc/1.5.1
from
fix/3297-Reset_Diagnosis_Key_Cache_on_EN_Error_Code_2
Oct 16, 2020
Merged
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,13 +11,13 @@ final class ExposureDetectionExecutor: ExposureDetectionDelegate { | |
private let client: Client | ||
|
||
private let downloadedPackagesStore: DownloadedPackagesStore | ||
private let store: Store | ||
private let store: Store & AppConfigCaching | ||
private let exposureDetector: ExposureDetector | ||
|
||
init( | ||
client: Client, | ||
downloadedPackagesStore: DownloadedPackagesStore, | ||
store: Store, | ||
store: Store & AppConfigCaching, | ||
exposureDetector: ExposureDetector | ||
) { | ||
self.client = client | ||
|
@@ -168,11 +168,26 @@ final class ExposureDetectionExecutor: ExposureDetectionDelegate { | |
writtenPackages: WrittenPackages, | ||
completion: @escaping (Result<ENExposureDetectionSummary, Error>) -> Void | ||
) -> Progress { | ||
|
||
// Clear the key packages and app config on ENError = 2 = .badParameter | ||
// For more details, see: https://jira.itc.sap.com/browse/EXPOSUREAPP-3297 | ||
func clearCacheOnError2(error: Error) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why call this func ..OnError2 and explain the error code in the comment? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. :) Renamed! |
||
if let enError = error as? ENError, enError.code == .badParameter { | ||
// Clear the key packages | ||
downloadedPackagesStore.reset() | ||
downloadedPackagesStore.open() | ||
|
||
// Clear the app config | ||
store.appConfig = nil | ||
marcussc marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
} | ||
|
||
func withResultFrom( | ||
summary: ENExposureDetectionSummary?, | ||
error: Error? | ||
) -> Result<ENExposureDetectionSummary, Error> { | ||
if let error = error { | ||
clearCacheOnError2(error: error) | ||
return .failure(error) | ||
} | ||
if let summary = summary { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍