Hiding the sync interval until we restore BG sync. Cleaned up the UI a litle bit.

astrid/common-src/com/todoroo/andlib/utility/AndroidUtilities.java

@@ -29,6 +29,24 @@ import com.todoroo.andlib.service.ExceptionService;
  */
 public class AndroidUtilities {
 
+    // --- activity management
+
+    private static Activity currentlyActive = null;
+
+    public static void setCurrentlyActive(Activity currentlyActive) {
+        AndroidUtilities.currentlyActive = currentlyActive;
+    }
+
+    /**
+     * @return our best-guess currently active activity. Maybe null, may
+     * be out of view already.
+     */
+    public static Activity getCurrentlyActiveActivity() {
+        return currentlyActive;
+    }
+
+    // --- utility methods
+
     private static class ExceptionHelper {
         @Autowired
         public ExceptionService exceptionService;

astrid/plugin-src/com/todoroo/astrid/rmilk/MilkPreferences.java

@@ -35,6 +35,14 @@ public class MilkPreferences extends TodorooPreferences {
         return R.xml.preferences_rmilk;
     }
 
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        if(hasFocus)
+            AndroidUtilities.setCurrentlyActive(this);
+    }
+
+
     /**
      *
      * @param resource
@@ -72,6 +80,7 @@ public class MilkPreferences extends TodorooPreferences {
                 preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
                     public boolean onPreferenceClick(Preference p) {
                         new RTMSyncProvider().synchronize(MilkPreferences.this);
+                        finish();
                         return true;
                     }
                 });
@@ -106,6 +115,7 @@ public class MilkPreferences extends TodorooPreferences {
                 preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
                     public boolean onPreferenceClick(Preference p) {
                         new RTMSyncProvider().synchronize(MilkPreferences.this);
+                        finish();
                         return true;
                     }
                 });
@@ -124,6 +134,7 @@ public class MilkPreferences extends TodorooPreferences {
             preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
                 public boolean onPreferenceClick(Preference p) {
                     new RTMSyncProvider().synchronize(MilkPreferences.this);
+                    finish();
                     return true;
                 }
             });
@@ -152,4 +163,5 @@ public class MilkPreferences extends TodorooPreferences {
                 preference.setEnabled(false);
         }
     }
+
 }

astrid/plugin-src/com/todoroo/astrid/rmilk/sync/RTMSyncProvider.java

@@ -5,6 +5,7 @@ package com.todoroo.astrid.rmilk.sync;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -468,8 +469,9 @@ public class RTMSyncProvider extends SynchronizationProvider<RTMTaskContainer> {
         }
 
         task.setValue(Task.NOTES, ""); //$NON-NLS-1$
-        if(rtmTaskSeries.getNotes() != null) {
+        if(rtmTaskSeries.getNotes() != null && rtmTaskSeries.getNotes().getNotes().size() > 0) {
             boolean firstNote = true;
+            Collections.reverse(rtmTaskSeries.getNotes().getNotes()); // reverse so oldest is first
             for(RtmTaskNote note : rtmTaskSeries.getNotes().getNotes()) {
                 if(firstNote) {
                     firstNote = false;

astrid/res/xml/preferences_rmilk.xml

@@ -13,7 +13,7 @@
         
     </PreferenceCategory>
             
-    <PreferenceCategory
+    <!-- PreferenceCategory
         android:title="@string/rmilk_MPr_group_options">
     
         <ListPreference  
@@ -22,7 +22,7 @@
             android:entryValues="@array/rmilk_MPr_interval_values"  
             android:title="@string/rmilk_MPr_interval_title" />
             
-    </PreferenceCategory>
+    </PreferenceCategory -->
     
     <PreferenceCategory
         android:title="@string/rmilk_MPr_group_actions">

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

@@ -401,6 +401,8 @@ public class TaskListActivity extends ListActivity implements OnScrollListener {
     @Override
     public void onWindowFocusChanged(boolean hasFocus) {
         super.onWindowFocusChanged(hasFocus);
+        if(hasFocus)
+            AndroidUtilities.setCurrentlyActive(this);
     }
 
     @Override