archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Google Task v1-rev20200516-1.30.10

Browse Source
pull/1122/head
Alex Baker 5 years ago
parent bb2842fa85
commit 1d2bd5ea17
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File

2
app/build.gradle.kts
Unescape Escape View File

@ -195,7 +195,7 @@ dependencies {
} }
implementation("com.wdullaer:materialdatetimepicker:4.2.3") implementation("com.wdullaer:materialdatetimepicker:4.2.3")
implementation("me.leolin:ShortcutBadger:1.1.22@aar") implementation("me.leolin:ShortcutBadger:1.1.22@aar")
implementation("com.google.apis:google-api-services-tasks:v1-rev20200129-1.30.9") implementation("com.google.apis:google-api-services-tasks:v1-rev20200516-1.30.10")
implementation("com.google.apis:google-api-services-drive:v3-rev20200609-1.30.9") implementation("com.google.apis:google-api-services-drive:v3-rev20200609-1.30.9")
implementation("com.google.auth:google-auth-library-oauth2-http:0.20.0") implementation("com.google.auth:google-auth-library-oauth2-http:0.20.0")
implementation("androidx.work:work-runtime:${Versions.work}") implementation("androidx.work:work-runtime:${Versions.work}")

6
app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.kt
Unescape Escape View File

@ -76,7 +76,7 @@ class GtasksInvoker {
@Throws(IOException::class) @Throws(IOException::class)
suspend fun allGtaskLists(pageToken: String?): TaskLists? = suspend fun allGtaskLists(pageToken: String?): TaskLists? =
execute(service!!.tasklists().list().setMaxResults(100L).setPageToken(pageToken)) execute(service!!.tasklists().list().setMaxResults(100).setPageToken(pageToken))
@Throws(IOException::class) @Throws(IOException::class)
suspend fun getAllGtasksFromListId( suspend fun getAllGtasksFromListId(
@ -85,7 +85,7 @@ class GtasksInvoker {
service!! service!!
.tasks() .tasks()
.list(listId) .list(listId)
.setMaxResults(100L) .setMaxResults(100)
.setShowDeleted(true) .setShowDeleted(true)
.setShowHidden(true) .setShowHidden(true)
.setPageToken(pageToken) .setPageToken(pageToken)
@ -99,7 +99,7 @@ class GtasksInvoker {
service!! service!!
.tasks() .tasks()
.list(listId) .list(listId)
.setMaxResults(100L) .setMaxResults(100)
.setShowDeleted(false) .setShowDeleted(false)
.setShowHidden(false) .setShowHidden(false)
.setPageToken(pageToken) .setPageToken(pageToken)

11
app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.kt
Unescape Escape View File

@ -2,6 +2,7 @@ package org.tasks.gtasks
import android.content.Context import android.content.Context
import com.google.api.client.googleapis.json.GoogleJsonResponseException import com.google.api.client.googleapis.json.GoogleJsonResponseException
import com.google.api.client.util.DateTime
import com.google.api.services.tasks.model.Task import com.google.api.services.tasks.model.Task
import com.google.api.services.tasks.model.TaskList import com.google.api.services.tasks.model.TaskList
import com.google.api.services.tasks.model.Tasks import com.google.api.services.tasks.model.Tasks
@ -212,10 +213,10 @@ class GoogleTaskSynchronizer @Inject constructor(
remoteModel.title = truncate(task.title, MAX_TITLE_LENGTH) remoteModel.title = truncate(task.title, MAX_TITLE_LENGTH)
remoteModel.notes = truncate(task.notes, MAX_DESCRIPTION_LENGTH) remoteModel.notes = truncate(task.notes, MAX_DESCRIPTION_LENGTH)
if (task.hasDueDate()) { if (task.hasDueDate()) {
remoteModel.due = GtasksApiUtilities.unixTimeToGtasksDueDate(task.dueDate) remoteModel.due = GtasksApiUtilities.unixTimeToGtasksDueDate(task.dueDate).toStringRfc3339()
} }
if (task.isCompleted) { if (task.isCompleted) {
remoteModel.completed = GtasksApiUtilities.unixTimeToGtasksCompletionTime(task.completionDate) remoteModel.completed = GtasksApiUtilities.unixTimeToGtasksCompletionTime(task.completionDate).toStringRfc3339()
remoteModel.status = "completed" // $NON-NLS-1$ remoteModel.status = "completed" // $NON-NLS-1$
} else { } else {
remoteModel.completed = null remoteModel.completed = null
@ -314,7 +315,7 @@ class GoogleTaskSynchronizer @Inject constructor(
} else if (googleTask.task > 0) { } else if (googleTask.task > 0) {
task = taskDao.fetch(googleTask.task) task = taskDao.fetch(googleTask.task)
} }
val updated = gtask.updated val updated = DateTime(gtask.updated)
if (updated != null) { if (updated != null) {
lastSyncDate = max(lastSyncDate, updated.value) lastSyncDate = max(lastSyncDate, updated.value)
} }
@ -346,8 +347,8 @@ class GoogleTaskSynchronizer @Inject constructor(
} }
task!!.title = getTruncatedValue(task.title, gtask.title, MAX_TITLE_LENGTH) task!!.title = getTruncatedValue(task.title, gtask.title, MAX_TITLE_LENGTH)
task.creationDate = DateUtilities.now() task.creationDate = DateUtilities.now()
task.completionDate = GtasksApiUtilities.gtasksCompletedTimeToUnixTime(gtask.completed) task.completionDate = GtasksApiUtilities.gtasksCompletedTimeToUnixTime(DateTime(gtask.completed))
val dueDate = GtasksApiUtilities.gtasksDueTimeToUnixTime(gtask.due) val dueDate = GtasksApiUtilities.gtasksDueTimeToUnixTime(DateTime(gtask.due))
mergeDates(createDueDate(com.todoroo.astrid.data.Task.URGENCY_SPECIFIC_DAY, dueDate), task) mergeDates(createDueDate(com.todoroo.astrid.data.Task.URGENCY_SPECIFIC_DAY, dueDate), task)
task.notes = getTruncatedValue(task.notes, gtask.notes, MAX_DESCRIPTION_LENGTH) task.notes = getTruncatedValue(task.notes, gtask.notes, MAX_DESCRIPTION_LENGTH)
googleTask.listId = listId googleTask.listId = listId

Write Preview
Loading…
Cancel
Save