From fef8016a30af9ea6d79e4737add205fa8ba20537 Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Wed, 28 Oct 2020 20:44:34 +0100
Subject: [PATCH] Fix merge regression.
---
.../de/rki/coronawarnapp/ui/main/home/HomeFragment.kt | 2 +-
.../util/security/EncryptionResetToolTest.kt | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt
index e2085635b..7b095ed45 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt
@@ -81,7 +81,7 @@ class HomeFragment : Fragment(R.layout.fragment_home), AutoInject {
HomeFragmentEvents.ShowErrorResetDialog -> {
RecoveryByResetDialogFactory(this).showDialog(
detailsLink = R.string.errors_generic_text_catastrophic_error_encryption_failure,
- onDismiss = { vm.errorResetDialogDismissed() }
+ onPositive = { vm.errorResetDialogDismissed() }
)
}
HomeFragmentEvents.ShowDeleteTestDialog -> {
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/security/EncryptionResetToolTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/security/EncryptionResetToolTest.kt
index bb6c5932e..7ae3bef04 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/security/EncryptionResetToolTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/security/EncryptionResetToolTest.kt
@@ -220,8 +220,8 @@ class EncryptionResetToolTest : BaseIOTest() {
encryptedDatabaseFile.exists() shouldBe false
mockPreferences.dataMapPeek.apply {
- this["ea1851.reset.performedAt"] shouldNotBe null
- this["ea1851.reset.windowconsumed"] shouldBe true
+ this["ea1851.reset.performedAt"] shouldBe 1234567890L
+ this["ea1851.reset.windowconsumed.160"] shouldBe true
this["ea1851.reset.shownotice"] shouldBe true
}
}
@@ -246,8 +246,8 @@ class EncryptionResetToolTest : BaseIOTest() {
encryptedDatabaseFile.exists() shouldBe false
mockPreferences.dataMapPeek.apply {
- this["ea1851.reset.performedAt"] shouldNotBe null
- this["ea1851.reset.windowconsumed"] shouldBe true
+ this["ea1851.reset.performedAt"] shouldBe 1234567890L
+ this["ea1851.reset.windowconsumed.160"] shouldBe true
this["ea1851.reset.shownotice"] shouldBe true
}
}
@@ -276,7 +276,7 @@ class EncryptionResetToolTest : BaseIOTest() {
mockPreferences.dataMapPeek.apply {
this["ea1851.reset.performedAt"] shouldBe null
- this["ea1851.reset.windowconsumed"] shouldBe true
+ this["ea1851.reset.windowconsumed.160"] shouldBe true
this["ea1851.reset.shownotice"] shouldBe null
}
}
--
GitLab