Fix Google Task sorting

CHANGELOG.md

@@ -1,5 +1,10 @@
 Change Log
 ---
+### 7.2.2 (2019-12-03)
+
+* Fix Google Task sorting
+* Fix crash when deleting 500+ tasks
+
 ### 7.2.1 (2019-11-27)
 
 * Bug fixes and minor improvements

app/build.gradle.kts

@@ -36,8 +36,8 @@ android {
     defaultConfig {
         testApplicationId = "org.tasks.test"
         applicationId = "org.tasks"
-        versionCode = 626
-        versionName = "7.2.1"
+        versionCode = 628
+        versionName = "7.2.2"
         targetSdkVersion(Versions.targetSdk)
         minSdkVersion(Versions.minSdk)
         multiDexEnabled = true

app/src/main/java/com/todoroo/astrid/adapter/TaskAdapterProvider.java

@@ -104,11 +104,11 @@ public class TaskAdapterProvider {
   }
 
   private TaskAdapter createGoogleTaskAdapter(GtasksFilter filter) {
-    String query = GtasksFilter.toManualOrder(filter.getSqlQuery());
-    filter.setFilterQueryOverride(query);
-    return preferences.isManualSort()
-        ? new GoogleTaskManualSortAdapter(taskDao, googleTaskDao)
-        : new GoogleTaskAdapter(taskDao, googleTaskDao, preferences.addGoogleTasksToTop());
+    if (preferences.isManualSort()) {
+      filter.setFilterQueryOverride(GtasksFilter.toManualOrder(filter.getSqlQuery()));
+      return new GoogleTaskManualSortAdapter(taskDao, googleTaskDao);
+    }
+    return new GoogleTaskAdapter(taskDao, googleTaskDao, preferences.addGoogleTasksToTop());
   }
 
   private TaskAdapter createManualFilterTaskAdapter(Filter filter) {

app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java

@@ -70,14 +70,11 @@ public class GtasksFilter extends Filter {
   private static QueryTemplate getQueryTemplate(GoogleTaskList list) {
     return new QueryTemplate()
         .join(Join.left(GoogleTask.TABLE, Task.ID.eq(GoogleTask.TASK)))
-        .where(getCriterion(list));
-  }
-
-  public static Criterion getCriterion(GoogleTaskList list) {
-    return Criterion.and(
-        TaskDao.TaskCriteria.activeAndVisible(),
-        GoogleTask.DELETED.eq(0),
-        GoogleTask.LIST.eq(list.getRemoteId()));
+        .where(
+            Criterion.and(
+                TaskDao.TaskCriteria.activeAndVisible(),
+                GoogleTask.DELETED.eq(0),
+                GoogleTask.LIST.eq(list.getRemoteId())));
   }
 
   private static Map<String, Object> getValuesForNewTasks(GoogleTaskList list) {