From 1355975e8d515f7e477f385a15eb921e9e15d2cf Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Mon, 11 Jun 2012 20:02:06 -0700
Subject: [PATCH] Don't try and push attachments if you're not a premium user

---
 .../astrid/actfm/sync/ActFmSyncService.java   |  5 +++++
 .../actfm/sync/ActFmSyncV2Provider.java       | 19 ++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
index f34ed0015..a4d489c61 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
@@ -609,6 +609,8 @@ public final class ActFmSyncService {
     }
 
     public void pushAttachmentInBackground(final Metadata fileMetadata) {
+        if (!ActFmPreferenceService.isPremiumUser())
+            return;
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -637,6 +639,9 @@ public final class ActFmSyncService {
      * @param fileMetadata
      */
     public void pushAttachment(long remoteTaskId, Metadata fileMetadata) {
+        if (!ActFmPreferenceService.isPremiumUser())
+            return;
+
         if (!fileMetadata.containsNonNullValue(FileMetadata.FILE_PATH) || remoteTaskId <= 0)
             return;
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
index 71547afee..febd5ed7f 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
@@ -306,16 +306,17 @@ public class ActFmSyncV2Provider extends SyncV2Provider {
             taskCursor.close();
         }
 
-        TodorooCursor<Metadata> filesCursor = metadataService.query(Query.select(Metadata.PROPERTIES)
-                .where(Criterion.and(
-                        MetadataCriteria.withKey(FileMetadata.METADATA_KEY),
-                        Criterion.or(FileMetadata.REMOTE_ID.eq(0), FileMetadata.DELETION_DATE.gt(0)))));
-        try {
-            pushQueued(callback, finisher, filesCursor, false, filesPusher);
-        } finally {
-            filesCursor.close();
+        if (ActFmPreferenceService.isPremiumUser()) {
+            TodorooCursor<Metadata> filesCursor = metadataService.query(Query.select(Metadata.PROPERTIES)
+                    .where(Criterion.and(
+                            MetadataCriteria.withKey(FileMetadata.METADATA_KEY),
+                            Criterion.or(FileMetadata.REMOTE_ID.eq(0), FileMetadata.DELETION_DATE.gt(0)))));
+            try {
+                pushQueued(callback, finisher, filesCursor, false, filesPusher);
+            } finally {
+                filesCursor.close();
+            }
         }
-
     }
 
     private void pushQueuedTags(final SyncResultCallback callback,