Backported some changes made in the wimm project

api/src/com/todoroo/astrid/core/SortHelper.java

@@ -45,8 +45,31 @@ public class SortHelper {
         if(originalSql == null)
             originalSql = "";
         if(!originalSql.toUpperCase().contains("ORDER BY")) {
+            Order order = orderForSortType(sort);
+
+            if((flags & FLAG_REVERSE_SORT) > 0)
+                order = order.reverse();
+            originalSql += " ORDER BY " + order;
+        }
+
+        // flags
+        if((flags & FLAG_SHOW_COMPLETED) > 0)
+            originalSql = originalSql.replace(Task.COMPLETION_DATE.eq(0).toString(),
+                    Criterion.all.toString());
+        if((flags & FLAG_SHOW_HIDDEN) > 0)
+            originalSql = originalSql.replace(TaskCriteria.isVisible().toString(),
+                    Criterion.all.toString());
+        if((flags & FLAG_SHOW_DELETED) > 0)
+            originalSql = originalSql.replace(Task.DELETION_DATE.eq(0).toString(),
+                    Criterion.all.toString());
+
+        return originalSql;
+    }
+
+
+    public static Order orderForSortType(int sortType) {
         Order order;
-            switch(sort) {
+        switch(sortType) {
         case SORT_ALPHA:
             order = Order.asc(Functions.upper(Task.TITLE));
             break;
@@ -67,27 +90,9 @@ public class SortHelper {
         default:
             order = defaultTaskOrder();
         }
-
-            if((flags & FLAG_REVERSE_SORT) > 0)
-                order = order.reverse();
-            originalSql += " ORDER BY " + order;
-        }
-
-        // flags
-        if((flags & FLAG_SHOW_COMPLETED) > 0)
-            originalSql = originalSql.replace(Task.COMPLETION_DATE.eq(0).toString(),
-                    Criterion.all.toString());
-        if((flags & FLAG_SHOW_HIDDEN) > 0)
-            originalSql = originalSql.replace(TaskCriteria.isVisible().toString(),
-                    Criterion.all.toString());
-        if((flags & FLAG_SHOW_DELETED) > 0)
-            originalSql = originalSql.replace(Task.DELETION_DATE.eq(0).toString(),
-                    Criterion.all.toString());
-
-        return originalSql;
+        return order;
     }
 
-
     /**
      * Returns SQL task ordering that is astrid's default algorithm
      * @return

astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java

@@ -162,8 +162,17 @@ public class ActFmInvoker {
         params.add(new Pair<String, Object>("app_id", APP_ID));
         params.add(new Pair<String, Object>("time", System.currentTimeMillis() / 1000L));
         params.add(new Pair<String, Object>("api", API_VERSION));
-        if(token != null)
+        if(token != null) {
+            boolean foundTokenKey = false;
+            for (Pair<String, Object> curr : params) {
+                if (curr.getLeft().equals("token")) {
+                    foundTokenKey = true;
+                    break;
+                }
+            }
+            if (!foundTokenKey)
                 params.add(new Pair<String, Object>("token", token));
+        }
 
         Collections.sort(params, new Comparator<Pair<String, Object>>() {
             @Override