From 7c9a38449dfe20b784440b17394726a9cff99391 Mon Sep 17 00:00:00 2001
From: BMItter <berndus@gmx.de>
Date: Mon, 7 Dec 2020 17:47:07 +0100
Subject: [PATCH] cleanup
---
.../contactdiary/model/DefaultContactDiaryElement.kt | 4 ++--
.../rki/coronawarnapp/contactdiary/model/DefaultLocation.kt | 4 +---
.../de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt | 4 +---
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt
index e1c40c0de..0bd0eaf80 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt
@@ -4,6 +4,6 @@ import java.time.Instant
data class DefaultContactDiaryElement(
override val createdAt: Instant,
- override val defaultPeople: List<DefaultPerson>,
- override val defaultLocations: List<DefaultLocation>
+ override val people: List<Person>,
+ override val locations: List<Location>
) : ContactDiaryElement
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt
index 111b0338b..df56603f9 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt
@@ -1,5 +1,3 @@
package de.rki.coronawarnapp.contactdiary.model
-data class DefaultLocation(
- var locationName: String
-)
+data class DefaultLocation(override var location: Location) : Location
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt
index cb4f11271..01642d992 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt
@@ -1,5 +1,3 @@
package de.rki.coronawarnapp.contactdiary.model
-data class DefaultPerson(
- var completeName: String
-)
+data class DefaultPerson(override var person: Person) : Person
--
GitLab