Fixed some bugs with syncing filter order

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

@@ -676,8 +676,8 @@ public final class ActFmSyncService {
         if (order == null || "null".equals(order))
             order = "[]";
 
-        params.add("filter_id"); params.add(filterId);
+        params.add("filter"); params.add(filterId);
-        params.add("order"); params.add(order);
+        params.add("order"); params.add(SubtasksHelper.convertTreeToRemoteIds(order));
         params.add("token"); params.add(token);
 
         try {
@@ -704,8 +704,8 @@ public final class ActFmSyncService {
         try {
             JSONObject result = actFmInvoker.invoke("list_order", params.toArray(new Object[params.size()]));
             String order = result.optString("order");
-            if (!TextUtils.isEmpty(order))
+            if (!TextUtils.isEmpty(order) && !"null".equals(order))
-                Preferences.setString(localFilterId, order);
+                Preferences.setString(localFilterId, SubtasksHelper.convertTreeToLocalIds(order));
         } catch (IOException e) {
             handleException("fetch-filter-order", e);
         }

astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java

@@ -17,6 +17,7 @@ public class SubtasksFilterUpdater extends SubtasksUpdater<String> {
     @Override
     protected void writeSerialization(String list, String serialized) {
         Preferences.setString(list, serialized);
+        actFmSyncService.pushFilterOrderingOnSave(list);
     }
 
 }

astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksListFragment.java

@@ -86,4 +86,9 @@ public class SubtasksListFragment extends TaskListFragment {
         return helper.createTaskAdapter(cursor, sqlQueryTemplate);
     }
 
+    @Override
+    protected void refresh() {
+        setUpTaskList();
+    }
+
 }