Remove Geofence constructors

pull/2898/head
Alex Baker 2 years ago
parent 17d218aa4e
commit 60211355e0

@ -100,7 +100,12 @@ class TaskDuplicator @Inject constructor(
} }
for (g in locationDao.getGeofencesForTask(task.id)) { for (g in locationDao.getGeofencesForTask(task.id)) {
locationDao.insert( 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) val alarms = alarmDao.getAlarms(task.id)

@ -135,9 +135,9 @@ class LocationControlSet : TaskEditControlFragment() {
} else { } else {
val existing = location.geofence val existing = location.geofence
Geofence( Geofence(
place.uid, place = place.uid,
existing.isArrival, isArrival = existing.isArrival,
existing.isDeparture isDeparture = existing.isDeparture,
) )
} }
setLocation(Location(geofence, place)) setLocation(Location(geofence, place))

@ -3,7 +3,6 @@ package org.tasks.data.entity
import androidx.room.ColumnInfo import androidx.room.ColumnInfo
import androidx.room.Entity import androidx.room.Entity
import androidx.room.ForeignKey import androidx.room.ForeignKey
import androidx.room.Ignore
import androidx.room.PrimaryKey import androidx.room.PrimaryKey
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import org.tasks.CommonParcelable import org.tasks.CommonParcelable
@ -38,30 +37,6 @@ data class Geofence(
@ColumnInfo(name = "departure") @ColumnInfo(name = "departure")
var isDeparture: Boolean = false, var isDeparture: Boolean = false,
) : java.io.Serializable, CommonParcelable { ) : 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 { companion object {
const val TABLE_NAME = "geofences" const val TABLE_NAME = "geofences"
@JvmField val TABLE = Table(TABLE_NAME) @JvmField val TABLE = Table(TABLE_NAME)

Loading…
Cancel
Save