Fixed upgrade test, disabled xml exporter for now, fixed up filter list activity not to be so resistant to change

astrid/AndroidManifest.xml

@@ -79,8 +79,6 @@
     </activity>
     <!-- Activity that displays filter list -->
     <activity android:name="com.todoroo.astrid.activity.FilterListActivity"
-              android:launchMode="singleInstance"
-              android:allowTaskReparenting="true"
               android:theme="@style/Theme">
       <intent-filter>
         <action android:name="android.intent.action.SEARCH" />

astrid/src-legacy/com/timsu/astrid/utilities/TasksXmlExporter.java

@@ -14,7 +14,6 @@ import org.xmlpull.v1.XmlSerializer;
 import android.content.Context;
 import android.database.Cursor;
 import android.os.Environment;
-import android.os.Looper;
 import android.util.Log;
 import android.util.Xml;
 import android.widget.Toast;
@@ -38,7 +37,7 @@ public class TasksXmlExporter {
     private SyncDataController syncDataController;
     private Context ctx;
     private String output;
-    private boolean isService;
+    private final boolean isService;
     private int exportCount;
     private XmlSerializer xml;
     private HashMap<TagIdentifier, TagModelForView> tagMap;
@@ -240,15 +239,15 @@ public class TasksXmlExporter {
        this.output = file;
     }
 
-    private Runnable doBackgroundExport = new Runnable() {
+    private final Runnable doBackgroundExport = new Runnable() {
         public void run() {
-            Looper.prepare();
+            /*Looper.prepare();
             try {
                 doTasksExport();
             } catch (IOException e) {
                 Log.e("TasksXmlExporter", "IOException in doTasksExport " + e.getMessage());
             }
-            Looper.loop();
+            Looper.loop();*/
         }
     };
 

astrid/src/com/todoroo/astrid/activity/FilterListActivity.java

@@ -242,7 +242,7 @@ public class FilterListActivity extends ExpandableListActivity {
     /**
      * Broadcast a request for lists. The request is sent to every
      * application registered to listen for this broadcast. Each application
-     * can then add lists to the
+     * can then add lists to this activity
      */
     protected void getLists() {
         Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_REQUEST_FILTERS);

astrid/src/com/todoroo/astrid/activity/TaskListActivity.java

@@ -463,8 +463,8 @@ public class TaskListActivity extends ListActivity implements OnScrollListener {
 
         if(requery) {
             taskCursor.requery();
-            taskAdapter.notifyDataSetChanged();
             taskAdapter.flushDetailCache();
+            taskAdapter.notifyDataSetChanged();
         }
         startManagingCursor(taskCursor);
 

astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java

@@ -13,9 +13,9 @@ import android.widget.AbsListView;
 import android.widget.BaseExpandableListAdapter;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.ImageView.ScaleType;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.ImageView.ScaleType;
 
 import com.timsu.astrid.R;
 import com.todoroo.astrid.api.FilterCategory;
@@ -41,6 +41,10 @@ public class FilterAdapter extends BaseExpandableListAdapter {
         items.add(item);
     }
 
+    public void clear() {
+        items.clear();
+    }
+
     /* ======================================================================
      * ========================================================== child nodes
      * ====================================================================== */

tests/src/com/todoroo/astrid/upgrade/Astrid2To3UpgradeTests.java

@@ -145,8 +145,8 @@ public class Astrid2To3UpgradeTests extends DatabaseTestCase {
         assertEquals(2, taskController.getAllTaskIdentifiers().size());
 
         // upgrade
+        Date upgradeTime = new Date();
         upgrade2To3();
-        Date createdDate = new Date();
 
         // verify that data exists in our new table
         database.openForReading();
@@ -175,8 +175,10 @@ public class Astrid2To3UpgradeTests extends DatabaseTestCase {
                 new RRule(task.getValue(Task.RECURRENCE)).getFreq());
         assertEquals(guti.getElapsedSeconds(), task.getValue(Task.ELAPSED_SECONDS));
         assertEquals(guti.getNotificationIntervalSeconds() * 1000L, (long)task.getValue(Task.REMINDER_PERIOD));
-        assertDatesEqual(createdDate, task.getValue(Task.CREATION_DATE));
+        assertTrue(task.getValue(Task.CREATION_DATE) > 0);
-        assertDatesEqual(createdDate, task.getValue(Task.MODIFICATION_DATE));
+        assertTrue(task.getValue(Task.MODIFICATION_DATE) > 0);
+        assertTrue(task.getValue(Task.CREATION_DATE) <= upgradeTime.getTime());
+        assertTrue(task.getValue(Task.MODIFICATION_DATE) <= upgradeTime.getTime());
     }
 
     /**
@@ -321,17 +323,26 @@ public class Astrid2To3UpgradeTests extends DatabaseTestCase {
      * Test basic upgrading of the sync mapping table
      */
     public void testSyncTableUpgrade() {
+        TaskController taskController = new TaskController(getContext());
+        taskController.open();
         SyncDataController syncController = new SyncDataController(getContext());
         syncController.open();
 
         // create some ish
+        TaskModelForEdit christmas = new TaskModelForEdit();
+        christmas.setName("christmas");
+        taskController.saveTask(christmas, false);
         String remoteId = "123|456|789000";
-        SyncMapping mapping = new SyncMapping(new TaskIdentifier(1), 1, remoteId);
+        SyncMapping mapping = new SyncMapping(christmas.getTaskIdentifier(), 1, remoteId);
         syncController.saveSyncMapping(mapping);
-        syncController.addToUpdatedList(new TaskIdentifier(2));
+
+        christmas = new TaskModelForEdit();
+        christmas.setName("july");
+        taskController.saveTask(christmas, false);
+        syncController.addToUpdatedList(christmas.getTaskIdentifier());
 
         // assert created
-        assertEquals(1, syncController.getSyncMappings(1));
+        assertEquals(1, syncController.getSyncMappings(1).size());
 
         // upgrade
         upgrade2To3();