Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Conversation

@d4rken
Copy link
Member

@d4rken d4rken commented Nov 16, 2020

  • Had to manually resolve merge conflicts in HotDataFlow, DefaultExposureDetectionTracker and in ExposureDetectionTrackerStorage
  • Fixed one little merge regression in unit tests

d4rken and others added 5 commits November 16, 2020 12:09
#1604)

* Flush the json data after writing it, otherwise if the app process dies, we end up with an empty file.
GSON deserializes this into a null object that looks like a non-null object until it is evaluated some time later.

Force an evaluation via `require(it.size >= 0)` and delete the corrupt data file when catching the exception.

* Show a visible error dialog if we fail to save data.

* Used buffered versions of readers and writer.
* Fix HotDataFlow behavior.
* Prevent re-execution of past submissions when the observable goes cold.
* Guard internal value updates with a mutex in case the value update is not as thread-safe as we think it is.

* Fix problematic testcases.
# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/detectiontracker/ExposureDetectionTrackerStorage.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/flow/HotDataFlow.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/flow/HotDataFlowTest.kt
#	gradle.properties
@d4rken d4rken added the maintainers Tag pull requests created by maintainers label Nov 16, 2020
@d4rken d4rken added this to the 1.7.0 milestone Nov 16, 2020
@d4rken d4rken requested a review from a team November 16, 2020 14:27
@d4rken
Copy link
Member Author

d4rken commented Nov 16, 2020

This also fixes EXPOSUREAPP-3808 (config update in bursts).

@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

77.8% 77.8% Coverage
0.0% 0.0% Duplication

@harambasicluka harambasicluka self-assigned this Nov 16, 2020
@harambasicluka harambasicluka merged commit 3bd7bf9 into release/1.7.x Nov 16, 2020
@harambasicluka harambasicluka deleted the fix/1.6.x-into-1.7.x branch November 16, 2020 15:07
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

maintainers Tag pull requests created by maintainers

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants