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

Handle empty google task remote parent strings

Browse Source
pull/1051/head 9.7.3
Alex Baker 4 years ago
parent ea2a25cb21
commit 8e17843ace
9 changed files with 125 additions and 15 deletions
Show Stats Download Patch File Download Diff File

4
CHANGELOG.md
Unescape Escape View File

@ -1,6 +1,10 @@
Change Log
---
=======
### 9.7.3 (2020-07-07)
* Fix Google Task bugs
### 9.7.2 (2020-06-22)
* Downgrade Mapbox SDK to remove non-free library (F-Droid only)

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

@ -43,8 +43,8 @@ android {
defaultConfig {
testApplicationId = "org.tasks.test"
applicationId = "org.tasks"
versionCode = 90703
versionName = "9.7.2"
versionCode = 90704
versionName = "9.7.3"
targetSdkVersion(Versions.targetSdk)
minSdkVersion(Versions.minSdk)
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

79
app/src/androidTest/java/org/tasks/data/GoogleTaskDaoTests.kt
Unescape Escape View File

@ -13,6 +13,7 @@ import org.tasks.injection.TestComponent
import org.tasks.makers.GoogleTaskMaker.LIST
import org.tasks.makers.GoogleTaskMaker.PARENT
import org.tasks.makers.GoogleTaskMaker.REMOTE_ID
import org.tasks.makers.GoogleTaskMaker.REMOTE_PARENT
import org.tasks.makers.GoogleTaskMaker.TASK
import org.tasks.makers.GoogleTaskMaker.newGoogleTask
import org.tasks.makers.GtaskListMaker.newGtaskList
@ -153,6 +154,84 @@ class GoogleTaskDaoTests : InjectingTestCase() {
assertEquals(listOf(2L), googleTaskDao.getChildren(listOf(1L, 2L)))
}
@Test
fun dontAllowEmptyParent() {
googleTaskDao.insert(newGoogleTask(with(TASK, 1), with(LIST, "1"), with(REMOTE_ID, "1234")))
googleTaskDao.updatePosition("1234", "", "0")
assertNull(googleTaskDao.getByTaskId(1)!!.remoteParent)
}
@Test
fun updatePosition() {
googleTaskDao.insert(newGoogleTask(with(TASK, 1), with(LIST, "1"), with(REMOTE_ID, "1234")))
googleTaskDao.updatePosition("1234", "abcd", "0")
assertEquals("abcd", googleTaskDao.getByTaskId(1)!!.remoteParent)
}
@Test
fun updateParents() {
googleTaskDao.insert(newGoogleTask(with(TASK, 1), with(LIST, "1"), with(REMOTE_ID, "123")))
googleTaskDao.insert(newGoogleTask(with(TASK, 2), with(LIST, "1"), with(REMOTE_PARENT, "123")))
googleTaskDao.updateParents()
assertEquals(1, googleTaskDao.getByTaskId(2)!!.parent)
}
@Test
fun updateParentsByList() {
googleTaskDao.insert(newGoogleTask(with(TASK, 1), with(LIST, "1"), with(REMOTE_ID, "123")))
googleTaskDao.insert(newGoogleTask(with(TASK, 2), with(LIST, "1"), with(REMOTE_PARENT, "123")))
googleTaskDao.updateParents("1")
assertEquals(1, googleTaskDao.getByTaskId(2)!!.parent)
}
@Test
fun updateParentsMustMatchList() {
googleTaskDao.insert(newGoogleTask(with(TASK, 1), with(LIST, "1"), with(REMOTE_ID, "123")))
googleTaskDao.insert(newGoogleTask(with(TASK, 2), with(LIST, "2"), with(REMOTE_PARENT, "123")))
googleTaskDao.updateParents()
assertEquals(0, googleTaskDao.getByTaskId(2)!!.parent)
}
@Test
fun updateParentsByListMustMatchList() {
googleTaskDao.insert(newGoogleTask(with(TASK, 1), with(LIST, "1"), with(REMOTE_ID, "123")))
googleTaskDao.insert(newGoogleTask(with(TASK, 2), with(LIST, "2"), with(REMOTE_PARENT, "123")))
googleTaskDao.updateParents("2")
assertEquals(0, googleTaskDao.getByTaskId(2)!!.parent)
}
@Test
fun ignoreEmptyStringWhenUpdatingParents() {
googleTaskDao.insert(newGoogleTask(with(TASK, 1), with(LIST, "1"), with(REMOTE_ID, "")))
googleTaskDao.insert(newGoogleTask(with(TASK, 2), with(LIST, "1"), with(REMOTE_ID, ""), with(REMOTE_PARENT, "")))
googleTaskDao.updateParents()
assertEquals(0, googleTaskDao.getByTaskId(2)!!.parent)
}
@Test
fun ignoreEmptyStringWhenUpdatingParentsForList() {
googleTaskDao.insert(newGoogleTask(with(TASK, 1), with(LIST, "1"), with(REMOTE_ID, "")))
googleTaskDao.insert(newGoogleTask(with(TASK, 2), with(LIST, "1"), with(REMOTE_ID, ""), with(REMOTE_PARENT, "")))
googleTaskDao.updateParents("1")
assertEquals(0, googleTaskDao.getByTaskId(2)!!.parent)
}
private fun insertTop(googleTask: GoogleTask) {
insert(googleTask, true)
}

2
app/src/commonTest/java/org/tasks/makers/GoogleTaskMaker.kt
Unescape Escape View File

@ -14,6 +14,7 @@ object GoogleTaskMaker {
val REMOTE_ID: Property<GoogleTask, String> = newProperty()
val TASK: Property<GoogleTask, Long> = newProperty()
val PARENT: Property<GoogleTask, Long> = newProperty()
val REMOTE_PARENT: Property<GoogleTask, String?> = newProperty()
private val instantiator = Instantiator<GoogleTask> {
val task = GoogleTask()
@ -22,6 +23,7 @@ object GoogleTaskMaker {
task.remoteId = it.valueOf(REMOTE_ID, UUIDHelper.newUUID())
task.task = it.valueOf(TASK, 1)
task.parent = it.valueOf(PARENT, 0L)
task.remoteParent = it.valueOf(REMOTE_PARENT, null as String?)
task
}

3
app/src/main/java/com/todoroo/astrid/service/Upgrader.kt
Unescape Escape View File

@ -31,6 +31,7 @@ class Upgrader @Inject constructor(
private val filterDao: FilterDao,
private val defaultFilterProvider: DefaultFilterProvider,
private val googleTaskListDao: GoogleTaskListDao,
private val googleTaskDao: GoogleTaskDao,
private val userActivityDao: UserActivityDao,
private val taskAttachmentDao: TaskAttachmentDao,
private val caldavDao: CaldavDao,
@ -66,6 +67,7 @@ class Upgrader @Inject constructor(
taskMover.migrateLocalTasks()
}
run(from, V9_7) { googleTaskListDao.resetOrders() }
run(from, V9_7_3) { googleTaskDao.updateParents() }
preferences.setBoolean(R.string.p_just_updated, true)
}
preferences.setCurrentVersion(to)
@ -309,6 +311,7 @@ class Upgrader @Inject constructor(
private const val V9_3 = 90300
const val V9_6 = 90600
const val V9_7 = 90700
const val V9_7_3 = 90704
@JvmStatic
fun getAndroidColor(context: Context, index: Int): Int {

5
app/src/main/java/org/tasks/data/GoogleTask.kt
Unescape Escape View File

@ -1,8 +1,6 @@
package org.tasks.data
import androidx.room.*
import com.todoroo.andlib.data.Property
import com.todoroo.andlib.data.Property.*
import com.todoroo.andlib.data.Table
@Entity(tableName = "google_tasks",
@ -31,6 +29,9 @@ class GoogleTask {
@ColumnInfo(name = "gt_remote_parent")
var remoteParent: String? = null
set(value) {
field = if (value?.isNotBlank() == true) value else null
}
@ColumnInfo(name = "gt_moved")
@Transient

39
app/src/main/java/org/tasks/data/GoogleTaskDao.kt
Unescape Escape View File

@ -117,20 +117,39 @@ abstract class GoogleTaskDao {
@Query("SELECT google_tasks.*, gt_remote_order AS primary_sort, NULL AS secondary_sort FROM google_tasks JOIN tasks ON tasks._id = gt_task WHERE gt_parent = 0 AND gt_list_id = :listId AND tasks.deleted = 0 UNION SELECT c.*, p.gt_remote_order AS primary_sort, c.gt_remote_order AS secondary_sort FROM google_tasks AS c LEFT JOIN google_tasks AS p ON c.gt_parent = p.gt_task JOIN tasks ON tasks._id = c.gt_task WHERE c.gt_parent > 0 AND c.gt_list_id = :listId AND tasks.deleted = 0 ORDER BY primary_sort ASC, secondary_sort ASC")
abstract fun getByRemoteOrder(listId: String): List<GoogleTask>
@Query("UPDATE google_tasks"
+ " SET gt_parent = IFNULL(("
+ " SELECT gt_task FROM google_tasks AS p"
+ " WHERE p.gt_remote_id = google_tasks.gt_remote_parent"
+ " AND p.gt_list_id = google_tasks.gt_list_id "
+ " AND p.gt_deleted = 0),"
+ " 0)"
+ " WHERE gt_moved = 0")
@Query("""
UPDATE google_tasks
SET gt_parent = IFNULL((SELECT gt_task
FROM google_tasks AS p
WHERE google_tasks.gt_remote_parent IS NOT NULL
AND google_tasks.gt_remote_parent != ''
AND p.gt_remote_id = google_tasks.gt_remote_parent
AND p.gt_list_id = google_tasks.gt_list_id
AND p.gt_deleted = 0), 0)
WHERE gt_moved = 0
""")
abstract fun updateParents()
@Query("UPDATE google_tasks SET gt_parent = IFNULL((SELECT gt_task FROM google_tasks AS p WHERE p.gt_remote_id = google_tasks.gt_remote_parent), 0) WHERE gt_list_id = :listId AND gt_moved = 0")
@Query("""
UPDATE google_tasks
SET gt_parent = IFNULL((SELECT gt_task
FROM google_tasks AS p
WHERE google_tasks.gt_remote_parent IS NOT NULL
AND google_tasks.gt_remote_parent != ''
AND p.gt_remote_id = google_tasks.gt_remote_parent
AND p.gt_list_id = google_tasks.gt_list_id
AND p.gt_deleted = 0), 0)
WHERE gt_list_id = :listId
AND gt_moved = 0
""")
abstract fun updateParents(listId: String)
@Query("UPDATE google_tasks SET gt_remote_parent = :parent, gt_remote_order = :position WHERE gt_remote_id = :id")
@Query("""
UPDATE google_tasks
SET gt_remote_parent = CASE WHEN :parent == '' THEN NULL ELSE :parent END,
gt_remote_order = :position
WHERE gt_remote_id = :id
""")
abstract fun updatePosition(id: String, parent: String, position: String)
@Transaction

3
app/src/main/res/values/changelog.xml
Unescape Escape View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="changelog">
<item>Downgrade Mapbox SDK to remove non-free library (F-Droid only)</item>
<item>Fix Google Task bugs</item>
<item>Join Tasks on Reddit: https://reddit.com/r/tasks</item>
</string-array>
</resources>

1
fastlane/metadata/android/en-US/changelogs/90704.txt
Unescape Escape View File

@ -0,0 +1 @@
* Fix Google Task bugs
Write Preview
Loading…
Cancel
Save