diff --git a/app/src/main/java/com/todoroo/astrid/service/TaskDuplicator.kt b/app/src/main/java/com/todoroo/astrid/service/TaskDuplicator.kt index 2ed83ee41..c53dc340d 100644 --- a/app/src/main/java/com/todoroo/astrid/service/TaskDuplicator.kt +++ b/app/src/main/java/com/todoroo/astrid/service/TaskDuplicator.kt @@ -100,7 +100,12 @@ class TaskDuplicator @Inject constructor( } for (g in locationDao.getGeofencesForTask(task.id)) { locationDao.insert( - Geofence(clone.id, g.place, g.isArrival, g.isDeparture) + Geofence( + task = clone.id, + place = g.place, + isArrival = g.isArrival, + isDeparture = g.isDeparture, + ) ) } val alarms = alarmDao.getAlarms(task.id) diff --git a/app/src/main/java/org/tasks/ui/LocationControlSet.kt b/app/src/main/java/org/tasks/ui/LocationControlSet.kt index a9ea58155..979f8f875 100644 --- a/app/src/main/java/org/tasks/ui/LocationControlSet.kt +++ b/app/src/main/java/org/tasks/ui/LocationControlSet.kt @@ -135,9 +135,9 @@ class LocationControlSet : TaskEditControlFragment() { } else { val existing = location.geofence Geofence( - place.uid, - existing.isArrival, - existing.isDeparture + place = place.uid, + isArrival = existing.isArrival, + isDeparture = existing.isDeparture, ) } setLocation(Location(geofence, place)) diff --git a/data/src/commonMain/kotlin/org/tasks/data/entity/Geofence.kt b/data/src/commonMain/kotlin/org/tasks/data/entity/Geofence.kt index d1d446988..e93ebe25a 100644 --- a/data/src/commonMain/kotlin/org/tasks/data/entity/Geofence.kt +++ b/data/src/commonMain/kotlin/org/tasks/data/entity/Geofence.kt @@ -3,7 +3,6 @@ package org.tasks.data.entity import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.ForeignKey -import androidx.room.Ignore import androidx.room.PrimaryKey import kotlinx.serialization.Serializable import org.tasks.CommonParcelable @@ -38,30 +37,6 @@ data class Geofence( @ColumnInfo(name = "departure") var isDeparture: Boolean = false, ) : java.io.Serializable, CommonParcelable { - @Ignore - constructor( - task: Long, - place: String?, - arrival: Boolean, - departure: Boolean - ): this( - task = task, - place = place, - isArrival = arrival, - isDeparture = departure, - ) - - @Ignore - constructor( - place: String?, - arrival: Boolean, - departure: Boolean - ): this( - place = place, - isArrival = arrival, - isDeparture = departure, - ) - companion object { const val TABLE_NAME = "geofences" @JvmField val TABLE = Table(TABLE_NAME)