From 738b1b165bd1126661de370984e3880dd8ef969a Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Tue, 8 Nov 2011 14:15:09 -0800 Subject: [PATCH] Last-minute tweaks --- .../astrid/gtasks/GtasksMetadataService.java | 2 +- .../todoroo/astrid/gtasks/api/GtasksService.java | 1 - .../com/todoroo/astrid/adapter/FilterAdapter.java | 2 +- .../com/todoroo/astrid/service/UpgradeService.java | 14 +++++++++++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java index c271ef76f..f42d85e14 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java @@ -83,7 +83,7 @@ public final class GtasksMetadataService extends SyncMetadataService metadata = metadataDao.query(Query.select(Metadata.TASK).where( Criterion.and(MetadataCriteria.withKey(GtasksSyncMetadata.METADATA_KEY), - GtasksSyncMetadata.LAST_SYNC.lt(lastSyncDate)))); + GtasksSyncMetadata.LAST_SYNC.gt(lastSyncDate)))); for(metadata.moveToFirst(); !metadata.isAfterLast(); metadata.moveToNext()) taskIds.remove(metadata.get(Metadata.TASK)); diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksService.java index fbd250bd7..12d61c930 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksService.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksService.java @@ -74,7 +74,6 @@ public class GtasksService { final Context context = ContextManager.getContext(); String message = context.getString(R.string.gtasks_error_backend); exceptionService.reportError(message, h); - throw h; } else if (statusCode == 400 || statusCode == 500) { System.err.println("Encountered " + statusCode + " error"); System.err.println(h.getResponse().getStatusMessage()); diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java index 5e4eb4c5b..d9769445e 100644 --- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java @@ -320,8 +320,8 @@ public class FilterAdapter extends BaseExpandableListAdapter { Bundle extras = intent.getExtras(); extras.setClassLoader(FilterListHeader.class.getClassLoader()); final Parcelable[] filters = extras.getParcelableArray(AstridApiConstants.EXTRAS_RESPONSE); - shouldUseBladeFilter = false; populateFiltersToAdapter(filters); + shouldUseBladeFilter = false; } catch (Exception e) { Log.e("receive-filter-" + //$NON-NLS-1$ intent.getStringExtra(AstridApiConstants.EXTRAS_ADDON), diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java index 58e027410..79088d4e0 100644 --- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java +++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java @@ -80,6 +80,8 @@ public final class UpgradeService { @Autowired ABChooser abChooser; + @Autowired AddOnService addOnService; + public UpgradeService() { DependencyInjectionService.getInstance().inject(this); } @@ -157,13 +159,19 @@ public final class UpgradeService { // current message if (from < V3_8_5) { - newVersionString(changeLog, "3.8.5 (10/27/11)", new String[] { - "All new reminders and nudges!", + String[] base = new String[] { "Share lists and tasks with iPhone users!", "Better sync with Chrome App and Astrid.com", + "All new reminders and nudges!", + "Improvements to error recovery in Google Tasks sync", "Numerous bugs destroyed", "Have a spectacular day!", - }); + }; + ArrayList stringList = new ArrayList(); + Collections.addAll(stringList, base); + if (!addOnService.hasPowerPack()) + stringList.add(0, "Buy the Power Pack or get it free by sharing with friends!"); + newVersionString(changeLog, "3.8.5 (11/08/11)", stringList.toArray(new String[stringList.size()])); } if (from >= V3_8_4 && from < V3_8_4_3) {