Merge branch '3.7'

Conflicts:
	astrid/AndroidManifest.xml
	astrid/build.xml

api/src/com/todoroo/astrid/data/TaskApiDao.java

@@ -138,7 +138,6 @@ public class TaskApiDao extends ContentResolverDao<Task> {
             return true;
 
         if(values.containsKey(Task.DETAILS_DATE.name) &&
-                values.containsKey(Task.DETAILS.name) &&
                 values.size() <= 3)
             return true;
 

api/src/com/todoroo/astrid/sync/SyncMetadataService.java

@@ -95,7 +95,7 @@ abstract public class SyncMetadataService<TYPE extends SyncContainer> {
         TodorooCursor<Task> tasks;
         long lastSyncDate = getUtilities().getLastSyncDate();
         if(lastSyncDate == 0)
-            tasks = taskDao.query(Query.select(Task.ID).orderBy(Order.asc(Task.ID)));
+            tasks = taskDao.query(Query.select(Task.ID).where(Criterion.none));
         else
             tasks = taskDao.query(Query.select(Task.ID).where(Task.MODIFICATION_DATE.
                     gt(lastSyncDate)).orderBy(Order.asc(Task.ID)));

astrid/build.xml

@@ -34,7 +34,6 @@
          should be checked in in Version Control Systems. -->
     <property file="default.properties" />
 
-
     <taskdef resource="net/sf/antcontrib/antlib.xml">
       <classpath>
         <pathelement location="antlib/ant-contrib-1.0b3.jar"/>
@@ -114,7 +113,7 @@
     </target>
 
     <!-- post build: rename apk -->
-    <target name="release" depends="clean, get-version, warnings, updatekeys-release, android_rules.release">
+    <target name="release" depends="clean, get-version, warnings, updatekeys-release, disable-market, android_rules.release">
       <mkdir dir="../release" />
       <property name="out.final.package"
                 location="../release/${ant.project.name}-${manifest.version.code}-${manifest.version.name}-release.apk" />
@@ -165,6 +164,15 @@
       </exec>
     </target>
 
+    <target name="disable-market" if="custom.market.disabled">
+      <echo message="Disabling android market links" />
+      <replace token="market://" value="disabled://" 
+               dir="${source.dir}" />
+      <replaceregexp file="${source.dir}/com/todoroo/astrid/utility/Constants.java"
+                     match="(MARKET_DISABLED.*=).*"
+                     replace="\1 true;" />
+    </target>
+
     <!-- build custom release package with updated version name -->
     <target name="release-custom">
       <fail message="need to set custom.version.name">

astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java

@@ -170,7 +170,6 @@ public class GtasksSyncProvider extends SyncProvider<GtasksTaskContainer> {
         if(Constants.DEBUG)
             Log.e("gtasks-debug", "- -------- SYNC STARTED");
         createdWithoutId = new ArrayList<GtasksTaskContainer>();
-
         try {
             GoogleTaskView taskView = taskService.getTaskView();
             getActiveList(taskView);

astrid/res/layout/widget_initialized.xml

@@ -7,8 +7,8 @@
     android:orientation="vertical"
     android:background="@drawable/widget_frame">
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:paddingLeft="40dp">

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

@@ -92,6 +92,7 @@ import com.todoroo.astrid.timers.TimerControlSet;
 import com.todoroo.astrid.ui.CalendarDialog;
 import com.todoroo.astrid.ui.DeadlineTimePickerDialog;
 import com.todoroo.astrid.ui.DeadlineTimePickerDialog.OnDeadlineTimeSetListener;
+import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.voice.VoiceInputAssistant;
 
 /**
@@ -300,7 +301,7 @@ public final class TaskEditActivity extends TabActivity {
                         controls.add(new TimerControlSet(TaskEditActivity.this, addonsAddons));
                         controls.add(new AlarmControlSet(TaskEditActivity.this, addonsAddons));
 
-                        if(!addOnService.hasPowerPack()) {
+                        if(!Constants.MARKET_DISABLED && !addOnService.hasPowerPack()) {
                             // show add-on help if necessary
                             View addonsEmpty = findViewById(R.id.addons_empty);
                             addonsEmpty.setVisibility(View.VISIBLE);

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

@@ -250,9 +250,11 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
 
         MenuItem item;
 
-        item = menu.add(Menu.NONE, MENU_ADDONS_ID, Menu.NONE,
-                R.string.TLA_menu_addons);
-        item.setIcon(android.R.drawable.ic_menu_set_as);
+        if(!Constants.MARKET_DISABLED) {
+            item = menu.add(Menu.NONE, MENU_ADDONS_ID, Menu.NONE,
+                    R.string.TLA_menu_addons);
+            item.setIcon(android.R.drawable.ic_menu_set_as);
+        }
 
         item = menu.add(Menu.NONE, MENU_SETTINGS_ID, Menu.NONE,
                 R.string.TLA_menu_settings);

astrid/src/com/todoroo/astrid/service/UpgradeService.java

@@ -36,6 +36,7 @@ import com.todoroo.astrid.utility.AstridPreferences;
 
 public final class UpgradeService {
 
+    public static final int V3_7_6 = 182;
     public static final int V3_7_5 = 179;
     public static final int V3_7_4 = 178;
     public static final int V3_7_3 = 175;
@@ -141,7 +142,14 @@ public final class UpgradeService {
             });
         } else {
             // current message
-            if(from < V3_7_5) {
+            if(from < V3_7_6) {
+                newVersionString(changeLog, "3.7.6 (6/13/11)", new String[] {
+                        "Fix for Astrid overwriting Google / Producteev values during sync",
+                        "No more snoozes for old repeating task iterations",
+                        "Fix for some alarms not being cancelled when due date changes",
+                });
+            }
+            if(from >= V3_7_0 && from < V3_7_5) {
                 newVersionString(changeLog, "3.7.5 (5/24/11)", new String[] {
                         "Fix for custom filter not working with tags with apostrophes",
                         "Fix for crashes when rearranging tasks in a Google list",

astrid/src/com/todoroo/astrid/utility/Constants.java

@@ -20,6 +20,11 @@ public final class Constants {
      */
     public static final boolean OEM = false;
 
+    /**
+     * Whether this is an Android Market-disabled build
+     */
+    public static final boolean MARKET_DISABLED = false;
+
     /**
      * Interval to update the widget (in order to detect hidden tasks
      * becoming visible)

astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java

@@ -217,7 +217,7 @@ public class VoiceInputAssistant {
         else
             packageName = "com.google.android.voicesearch";
 
-        // User wants to install voice search, take him to the market
+        // User wants to install voice search, take them to the market
         Intent marketIntent = new Intent(Intent.ACTION_VIEW,
                 Uri.parse("market://search?q=pname:" + packageName)); //$NON-NLS-1$
         try {

build.xml

@@ -31,7 +31,7 @@
 
   <target name="release-all" depends="clean,get-version,release">    
     <!-- custom builds -->
-    <for list="-getjar,.1000,-verizon,-sprint,-orange,-vodafone,-other" param="name">
+    <for list="-getjar,-verizon,-sprint,-orange,-vodafone,-other" param="name">
       <sequential>
         <subant target="release-custom">
           <fileset file="astrid/build.xml" />
@@ -39,6 +39,13 @@
         </subant>
       </sequential>
     </for>
+    <!-- amazon -->
+    <subant>
+      <fileset file="astrid/build.xml" />
+      <property name="custom.version.name" value=".1000" />
+      <property name="custom.market.disabled" value="true" />
+      <target name="release-custom" />
+    </subant>
   </target>
 </project>