Last-minute tweaks

astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java

@@ -83,7 +83,7 @@ public final class GtasksMetadataService extends SyncMetadataService<GtasksTaskC
 
         TodorooCursor<Metadata> 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));
 

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());

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),

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[] {
+            String[] base = new String[] {
-                    "All new reminders and nudges!",
                     "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<String> stringList = new ArrayList<String>();
+            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) {