Move query constants

app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt

@@ -621,7 +621,7 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
                     }
                 }
             }
-            REQUEST_LIST_SETTINGS -> if (resultCode == Activity.RESULT_OK) {
+            REQUEST_LIST_SETTINGS -> if (resultCode == RESULT_OK) {
                 val action = data!!.action
                 if (ACTION_DELETED == action) {
                     openFilter(BuiltInFilterExposer.getMyTasksFilter(resources))
@@ -629,7 +629,7 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
                     openFilter(data.getParcelableExtra(MainActivity.OPEN_FILTER))
                 }
             }
-            REQUEST_TAG_TASKS -> if (resultCode == Activity.RESULT_OK) {
+            REQUEST_TAG_TASKS -> if (resultCode == RESULT_OK) {
                 lifecycleScope.launch {
                     val modified = tagDataDao.applyTags(
                             taskDao
@@ -985,8 +985,6 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
     }
 
     companion object {
-        const val TAGS_METADATA_JOIN = "for_tags" // $NON-NLS-1$
-        const val CALDAV_METADATA_JOIN = "for_caldav" // $NON-NLS-1$
         const val ACTION_RELOAD = "action_reload"
         const val ACTION_DELETED = "action_deleted"
         private const val EXTRA_SELECTED_TASK_IDS = "extra_selected_task_ids"

app/src/main/java/org/tasks/data/TaskListQuery.kt

@@ -3,7 +3,6 @@ package org.tasks.data
 import com.todoroo.andlib.sql.Criterion
 import com.todoroo.andlib.sql.Field.Companion.field
 import com.todoroo.andlib.sql.Join
-import com.todoroo.astrid.activity.TaskListFragment
 import com.todoroo.astrid.api.Filter
 import com.todoroo.astrid.data.Task
 import org.tasks.data.TaskListQueryNonRecursive.getNonRecursiveQuery
@@ -11,19 +10,20 @@ import org.tasks.data.TaskListQueryRecursive.getRecursiveQuery
 import org.tasks.preferences.QueryPreferences
 
 object TaskListQuery {
+    private const val CALDAV_METADATA_JOIN = "for_caldav"
     private val JOIN_CALDAV = Criterion.and(
-            Task.ID.eq(field("${TaskListFragment.CALDAV_METADATA_JOIN}.cd_task")),
-            field("${TaskListFragment.CALDAV_METADATA_JOIN}.cd_deleted").eq(0))
+            Task.ID.eq(field("$CALDAV_METADATA_JOIN.cd_task")),
+            field("$CALDAV_METADATA_JOIN.cd_deleted").eq(0))
     val JOINS = """
-        ${Join.left(CaldavTask.TABLE.`as`(TaskListFragment.CALDAV_METADATA_JOIN), JOIN_CALDAV)}
-        ${Join.left(CaldavCalendar.TABLE, field("${TaskListFragment.CALDAV_METADATA_JOIN}.cd_calendar").eq(CaldavCalendar.UUID))}
+        ${Join.left(CaldavTask.TABLE.`as`(CALDAV_METADATA_JOIN), JOIN_CALDAV)}
+        ${Join.left(CaldavCalendar.TABLE, field("$CALDAV_METADATA_JOIN.cd_calendar").eq(CaldavCalendar.UUID))}
         ${Join.left(CaldavAccount.TABLE, CaldavCalendar.ACCOUNT.eq(CaldavAccount.UUID))}
         ${Join.left(Geofence.TABLE, Geofence.TASK.eq(Task.ID))}
         ${Join.left(Place.TABLE, Place.UID.eq(Geofence.PLACE))}
     """.trimIndent()
     val FIELDS = listOf(
             field("tasks.*"),
-            field("${TaskListFragment.CALDAV_METADATA_JOIN}.*"),
+            field("$CALDAV_METADATA_JOIN.*"),
             field("${CaldavAccount.ACCOUNT_TYPE}").`as`("accountType"),
             field("geofences.*"),
             field("places.*"))

app/src/main/java/org/tasks/data/TaskListQueryNonRecursive.kt

@@ -3,7 +3,6 @@ package org.tasks.data
 import com.todoroo.andlib.sql.Field.Companion.field
 import com.todoroo.andlib.sql.Join
 import com.todoroo.andlib.sql.Query
-import com.todoroo.astrid.activity.TaskListFragment
 import com.todoroo.astrid.api.Filter
 import com.todoroo.astrid.api.PermaSql
 import com.todoroo.astrid.core.SortHelper
@@ -12,13 +11,15 @@ import org.tasks.filters.RecentlyModifiedFilter
 import org.tasks.preferences.QueryPreferences
 
 internal object TaskListQueryNonRecursive {
-    private val JOIN_TAGS = Task.ID.eq(field("${TaskListFragment.TAGS_METADATA_JOIN}.task"))
+    private const val TAGS_METADATA_JOIN = "for_tags"
+
+    private val JOIN_TAGS = Task.ID.eq(field("$TAGS_METADATA_JOIN.task"))
     private val JOINS = """
-        ${Join.left(Tag.TABLE.`as`(TaskListFragment.TAGS_METADATA_JOIN), JOIN_TAGS)}
+        ${Join.left(Tag.TABLE.`as`(TAGS_METADATA_JOIN), JOIN_TAGS)}
         ${TaskListQuery.JOINS}
     """.trimIndent()
     private val TAGS =
-            field("group_concat(distinct(${TaskListFragment.TAGS_METADATA_JOIN}.tag_uid))")
+            field("group_concat(distinct($TAGS_METADATA_JOIN.tag_uid))")
                     .`as`("tags")
     private val FIELDS =
         TaskListQuery.FIELDS.plus(listOf(