mirror of https://github.com/tasks/tasks
Convert GoogleTask to CaldavTask
parent
513f8b017f
commit
2006e2c84b
@ -1,126 +1,15 @@
|
||||
package org.tasks.data
|
||||
|
||||
import androidx.room.ColumnInfo
|
||||
import androidx.room.Entity
|
||||
import androidx.room.ForeignKey
|
||||
import androidx.room.Ignore
|
||||
import androidx.room.Index
|
||||
import androidx.room.PrimaryKey
|
||||
import com.todoroo.andlib.data.Table
|
||||
import com.todoroo.astrid.data.Task
|
||||
|
||||
@Entity(
|
||||
tableName = "google_tasks",
|
||||
indices = [
|
||||
Index(name = "gt_list_parent", value = ["gt_list_id", "gt_parent"])
|
||||
],
|
||||
foreignKeys = [
|
||||
ForeignKey(
|
||||
entity = Task::class,
|
||||
parentColumns = ["_id"],
|
||||
childColumns = ["gt_task"],
|
||||
onDelete = ForeignKey.CASCADE,
|
||||
),
|
||||
]
|
||||
)
|
||||
class GoogleTask {
|
||||
@PrimaryKey(autoGenerate = true)
|
||||
@ColumnInfo(name = "gt_id")
|
||||
@Transient
|
||||
var id: Long = 0
|
||||
|
||||
@ColumnInfo(name = "gt_task", index = true)
|
||||
@Transient
|
||||
var task: Long = 0
|
||||
|
||||
@ColumnInfo(name = "gt_remote_id")
|
||||
var remoteId: String? = ""
|
||||
|
||||
@ColumnInfo(name = "gt_list_id")
|
||||
var listId: String? = ""
|
||||
|
||||
@ColumnInfo(name = "gt_parent")
|
||||
@Transient
|
||||
var parent: Long = 0
|
||||
|
||||
@ColumnInfo(name = "gt_remote_parent")
|
||||
var remoteParent: String? = null
|
||||
set(value) {
|
||||
field = if (value?.isNotBlank() == true) value else null
|
||||
}
|
||||
|
||||
@ColumnInfo(name = "gt_moved")
|
||||
@Transient
|
||||
var isMoved = false
|
||||
|
||||
@ColumnInfo(name = "gt_order")
|
||||
@Transient
|
||||
var order: Long = 0
|
||||
|
||||
@ColumnInfo(name = "gt_remote_order")
|
||||
var remoteOrder: Long = 0
|
||||
|
||||
@ColumnInfo(name = "gt_last_sync")
|
||||
var lastSync: Long = 0
|
||||
|
||||
@ColumnInfo(name = "gt_deleted")
|
||||
var deleted: Long = 0
|
||||
|
||||
constructor()
|
||||
|
||||
@Ignore
|
||||
constructor(task: Long, listId: String) {
|
||||
this.task = task
|
||||
this.listId = listId
|
||||
}
|
||||
|
||||
override fun equals(other: Any?): Boolean {
|
||||
if (this === other) return true
|
||||
if (other !is GoogleTask) return false
|
||||
|
||||
if (id != other.id) return false
|
||||
if (task != other.task) return false
|
||||
if (remoteId != other.remoteId) return false
|
||||
if (listId != other.listId) return false
|
||||
if (parent != other.parent) return false
|
||||
if (remoteParent != other.remoteParent) return false
|
||||
if (isMoved != other.isMoved) return false
|
||||
if (order != other.order) return false
|
||||
if (remoteOrder != other.remoteOrder) return false
|
||||
if (lastSync != other.lastSync) return false
|
||||
if (deleted != other.deleted) return false
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
override fun hashCode(): Int {
|
||||
var result = id.hashCode()
|
||||
result = 31 * result + task.hashCode()
|
||||
result = 31 * result + remoteId.hashCode()
|
||||
result = 31 * result + listId.hashCode()
|
||||
result = 31 * result + parent.hashCode()
|
||||
result = 31 * result + (remoteParent?.hashCode() ?: 0)
|
||||
result = 31 * result + isMoved.hashCode()
|
||||
result = 31 * result + order.hashCode()
|
||||
result = 31 * result + remoteOrder.hashCode()
|
||||
result = 31 * result + lastSync.hashCode()
|
||||
result = 31 * result + deleted.hashCode()
|
||||
return result
|
||||
}
|
||||
|
||||
override fun toString(): String =
|
||||
"GoogleTask(id=$id, task=$task, remoteId='$remoteId', listId='$listId', parent=$parent, remoteParent=$remoteParent, isMoved=$isMoved, order=$order, remoteOrder=$remoteOrder, lastSync=$lastSync, deleted=$deleted)"
|
||||
|
||||
val isNew: Boolean
|
||||
get() = id == 0L
|
||||
|
||||
@Deprecated("For backup use only")
|
||||
data class GoogleTask(
|
||||
var remoteId: String? = "",
|
||||
var listId: String? = "",
|
||||
var remoteParent: String? = null,
|
||||
var remoteOrder: Long = 0,
|
||||
var lastSync: Long = 0,
|
||||
var deleted: Long = 0,
|
||||
) {
|
||||
companion object {
|
||||
const val KEY = "gtasks"
|
||||
@JvmField val TABLE = Table("google_tasks")
|
||||
val ID = TABLE.column("gt_id")
|
||||
@JvmField val PARENT = TABLE.column("gt_parent")
|
||||
@JvmField val TASK = TABLE.column("gt_task")
|
||||
@JvmField val DELETED = TABLE.column("gt_deleted")
|
||||
@JvmField val LIST = TABLE.column("gt_list_id")
|
||||
}
|
||||
}
|
@ -1,70 +0,0 @@
|
||||
package org.tasks.data;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public class SubsetGoogleTask {
|
||||
|
||||
public long gt_id;
|
||||
public long gt_parent;
|
||||
public String gt_list_id;
|
||||
public long gt_order;
|
||||
|
||||
public long getId() {
|
||||
return gt_id;
|
||||
}
|
||||
|
||||
public String getListId() {
|
||||
return gt_list_id;
|
||||
}
|
||||
|
||||
public long getParent() {
|
||||
return gt_parent;
|
||||
}
|
||||
|
||||
public void setParent(long parent) {
|
||||
gt_parent = parent;
|
||||
}
|
||||
|
||||
public long getOrder() {
|
||||
return gt_order;
|
||||
}
|
||||
|
||||
public void setOrder(long order) {
|
||||
gt_order = order;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) {
|
||||
return true;
|
||||
}
|
||||
if (!(o instanceof SubsetGoogleTask)) {
|
||||
return false;
|
||||
}
|
||||
SubsetGoogleTask that = (SubsetGoogleTask) o;
|
||||
return gt_id == that.gt_id
|
||||
&& gt_parent == that.gt_parent
|
||||
&& gt_order == that.gt_order
|
||||
&& Objects.equals(gt_list_id, that.gt_list_id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(gt_id, gt_parent, gt_list_id, gt_order);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "SubsetGoogleTask{"
|
||||
+ "gt_id="
|
||||
+ gt_id
|
||||
+ ", gt_parent="
|
||||
+ gt_parent
|
||||
+ ", gt_list_id='"
|
||||
+ gt_list_id
|
||||
+ '\''
|
||||
+ ", gt_order="
|
||||
+ gt_order
|
||||
+ '}';
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue