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

1.3.1 into 1.4.0 #1177

Merged
merged 24 commits into from
Sep 17, 2020
Merged

1.3.1 into 1.4.0 #1177

merged 24 commits into from
Sep 17, 2020

Conversation

d4rken
Copy link
Member

@d4rken d4rken commented Sep 17, 2020

Merge the hotfix branch into our next RC.

pwoessner and others added 23 commits August 11, 2020 09:48
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
…2) (#1106)

* + new strings

* let the app not crash on other languages than DE

* values for lint and tests

* made bad test a comment

* removed unnecessary strings

* more string fixes

Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
Co-authored-by: Luka Harambasic <luka.harambasic@sap.com>
…APP-2405) (#1108)

* Remove Cache Clearing to reduce CDN load on failing devices. This ideally needs to be accompanied by a way to clear the cache manually and a way to identify more root causes of Transaction Failures.

Signed-off-by: d067928 <jakob.moeller@sap.com>

* Remove Files that failed for Key Retrieval

Only Remove Files from Cache that failed to download, instead of every file. This is accompanied ideally by no rollback in the Key Retrieval. We only delete the cache ref, the file will not be deleted as it is considered not present

Signed-off-by: d067928 <jakob.moeller@sap.com>

* Introduce dedicated QuotaCalculator for Unit Testing

Signed-off-by: d067928 <jakob.moeller@sap.com>

* Refactor QuotaCalculator for LocalData Property Access and Write Tests

Signed-off-by: d067928 <jakob.moeller@sap.com>

* Use Instant on the Device Read since this is not timezone specific

Signed-off-by: d067928 <jakob.moeller@sap.com>

* Add specific state for the quota calculation and dedicated rollback

Signed-off-by: d067928 <jakob.moeller@sap.com>

* PR Comments

Signed-off-by: d067928 <jakob.moeller@sap.com>
Signed-off-by: d067928 <jakob.moeller@sap.com>
Change-Id: Ib76a9ea2b03163a05dd8b6acf2179262f9bcf5bf
…the Transaction (EXPOSUREAPP-2405) (#1134)

* Throw Exception in case we have a failed entry to ensure Abortion of the Transaction.

Signed-off-by: d067928 <jakob.moeller@sap.com>

* Adjust test to not expect call to clear cache files

Signed-off-by: d067928 <jakob.moeller@sap.com>
* Fix: No exposure with low risk so far

* Fixed klint issues (#1144)

* restored reverted replaced wording for lint

* #1153 (comment)

* fixed term
…ers, Correct Quota Tests due to now lacking exception

Signed-off-by: d067928 <jakob.moeller@sap.com>
… merge/1.3.1-to-1.4.0

# Conflicts:
#	Corona-Warn-App/build.gradle
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/GoogleQuotaCalculator.kt
#	Corona-Warn-App/src/main/res/values-bg/strings.xml
#	Corona-Warn-App/src/main/res/values-pl/strings.xml
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/GoogleQuotaCalculatorTest.kt
@d4rken d4rken added maintainers Tag pull requests created by maintainers 1.4.0 labels Sep 17, 2020
@d4rken d4rken requested review from jakobmoellerdev and a team September 17, 2020 07:21
@d4rken d4rken changed the title Merge/1.3.1 to 1.4.0 1.3.1 into 1.4.0 Sep 17, 2020
@BMItr BMItr self-requested a review September 17, 2020 10:44
logWriter?.let {
try {
it.write("${System.currentTimeMillis()} ${priorityToString(priority)}/$tag: $message\n")
it.flush()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

flushing is done after every logline. This happens usually in milliseconds and can penetrate storage memory. I would recommend to buffer in general but I think its ok for a temp solution.

@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 3 Code Smells

22.1% 22.1% Coverage
0.0% 0.0% Duplication

}
}

override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would recommend to I/O async or in background thread...

@harambasicluka harambasicluka merged commit c6014d2 into release/1.4.x Sep 17, 2020
@harambasicluka harambasicluka deleted the merge/1.3.1-to-1.4.0 branch September 17, 2020 12:46
@d4rken d4rken added this to the 1.4.0 milestone Oct 7, 2020
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.

8 participants