From 6d6843a83af14a36fc4a078fc2f06f0974d8958e Mon Sep 17 00:00:00 2001 From: Tim Su Date: Wed, 8 Jun 2011 13:09:19 -0700 Subject: [PATCH 1/5] fill parent for widget header, possible fix for oem issues --- astrid/res/layout/widget_initialized.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/astrid/res/layout/widget_initialized.xml b/astrid/res/layout/widget_initialized.xml index b4f26033b..10d88bdac 100644 --- a/astrid/res/layout/widget_initialized.xml +++ b/astrid/res/layout/widget_initialized.xml @@ -7,8 +7,8 @@ android:orientation="vertical" android:background="@drawable/widget_frame"> - From 30db35fcc1122c9512d5149d0d9811dc0a13f9dc Mon Sep 17 00:00:00 2001 From: Tim Su Date: Wed, 8 Jun 2011 13:10:37 -0700 Subject: [PATCH 2/5] bump --- astrid/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml index 0de0ecf9d..aae11a6db 100644 --- a/astrid/AndroidManifest.xml +++ b/astrid/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionName="3.7.6" + android:versionCode="182"> From 9c1262c8fd13900dd840bda8118f6a9fdd5ceeab Mon Sep 17 00:00:00 2001 From: Tim Su Date: Wed, 8 Jun 2011 17:40:59 -0700 Subject: [PATCH 3/5] Market disable logic for amazon market. --- astrid/build.xml | 12 ++++++++++-- .../todoroo/astrid/activity/TaskEditActivity.java | 3 ++- .../todoroo/astrid/activity/TaskListActivity.java | 8 +++++--- astrid/src/com/todoroo/astrid/utility/Constants.java | 5 +++++ .../todoroo/astrid/voice/VoiceInputAssistant.java | 2 +- build.xml | 9 ++++++++- 6 files changed, 31 insertions(+), 8 deletions(-) diff --git a/astrid/build.xml b/astrid/build.xml index 62bbb8a6a..5a53210d5 100644 --- a/astrid/build.xml +++ b/astrid/build.xml @@ -34,7 +34,6 @@ should be checked in in Version Control Systems. --> - @@ -111,7 +110,7 @@ - + @@ -140,6 +139,15 @@ + + + + + + diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java index c4c3a4100..7b75c6846 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java +++ b/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); diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index 1e4d225b7..fdb12c492 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/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); diff --git a/astrid/src/com/todoroo/astrid/utility/Constants.java b/astrid/src/com/todoroo/astrid/utility/Constants.java index 4b0852128..b41c3941a 100644 --- a/astrid/src/com/todoroo/astrid/utility/Constants.java +++ b/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) diff --git a/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java b/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java index 37285d69d..65bb11879 100644 --- a/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java +++ b/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 { diff --git a/build.xml b/build.xml index d5f2f2823..d9dfe3198 100644 --- a/build.xml +++ b/build.xml @@ -31,7 +31,7 @@ - + @@ -39,6 +39,13 @@ + + + + + + + From 339e5cf344376720f1fac64a9362d4d8f479005b Mon Sep 17 00:00:00 2001 From: Tim Su Date: Sat, 11 Jun 2011 20:06:51 -0700 Subject: [PATCH 4/5] Fix for modified date getting written when details get written mistakenly --- api/src/com/todoroo/astrid/data/TaskApiDao.java | 1 - api/src/com/todoroo/astrid/sync/SyncMetadataService.java | 2 +- .../com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/api/src/com/todoroo/astrid/data/TaskApiDao.java b/api/src/com/todoroo/astrid/data/TaskApiDao.java index 2ad16339e..a00b4c19f 100644 --- a/api/src/com/todoroo/astrid/data/TaskApiDao.java +++ b/api/src/com/todoroo/astrid/data/TaskApiDao.java @@ -138,7 +138,6 @@ public class TaskApiDao extends ContentResolverDao { return true; if(values.containsKey(Task.DETAILS_DATE.name) && - values.containsKey(Task.DETAILS.name) && values.size() <= 3) return true; diff --git a/api/src/com/todoroo/astrid/sync/SyncMetadataService.java b/api/src/com/todoroo/astrid/sync/SyncMetadataService.java index 07eafd971..81c02b5cc 100644 --- a/api/src/com/todoroo/astrid/sync/SyncMetadataService.java +++ b/api/src/com/todoroo/astrid/sync/SyncMetadataService.java @@ -95,7 +95,7 @@ abstract public class SyncMetadataService { TodorooCursor 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))); diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java index fb9ed8638..89a22c63d 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java @@ -212,7 +212,6 @@ public class GtasksSyncProvider extends SyncProvider { if(Constants.DEBUG) Log.e("gtasks-debug", "- -------- SYNC STARTED"); createdWithoutId = new ArrayList(); - try { GoogleTaskView taskView = taskService.getTaskView(); getActiveList(taskView); From d42d44306a19cc45d40dfa9b480bcfd9b934fbc2 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Mon, 13 Jun 2011 13:04:46 -0700 Subject: [PATCH 5/5] changelog --- .../src/com/todoroo/astrid/service/UpgradeService.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java index 08038e19f..2d1e4ee0d 100644 --- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java +++ b/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",