Added the autosync intervals back in--autosync (i.e. automatic BriefMe) for a particular model will happen no more than ever 30 minutes

astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java

@@ -322,8 +322,8 @@ public class TagViewFragment extends TaskListFragment {
         if (!isCurrentTaskListFragment())
             return;
         if (tagData != null) {
-            long lastAutoSync = Preferences.getLong(LAST_FETCH_KEY + tagData.getId(), 0);
-            if(DateUtilities.now() - lastAutoSync > DateUtilities.ONE_HOUR)
+            long pushedAt = tagData.getValue(TagData.PUSHED_AT);
+            if(DateUtilities.now() - pushedAt > DateUtilities.ONE_HOUR / 2)
                 refreshData();
         }
     }

astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java

@@ -48,7 +48,6 @@ import com.todoroo.andlib.sql.Order;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
-import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.ActFmCameraModule;
 import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback;
 import com.todoroo.astrid.actfm.ActFmCameraModule.ClearImageCallback;
@@ -160,14 +159,9 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
         setUpListAdapter();
 
         if(actFmPreferenceService.isLoggedIn()) {
-            if(!task.containsNonNullValue(Task.UUID))
+            long pushedAt = task.getValue(Task.PUSHED_AT);
+            if(DateUtilities.now() - pushedAt > DateUtilities.ONE_HOUR / 2) {
                 refreshData();
-            else {
-                String fetchKey = LAST_FETCH_KEY + task.getId();
-                long lastFetchDate = Preferences.getLong(fetchKey, 0);
-                if(DateUtilities.now() > lastFetchDate + 300000L) {
-                    refreshData();
-                    Preferences.setLong(fetchKey, DateUtilities.now());
             } else {
                 loadingText.setText(R.string.ENA_no_comments);
                 if(items.size() == 0)
@@ -175,7 +169,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
             }
         }
     }
-    }
 
 
 

astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java

@@ -16,6 +16,7 @@ import android.widget.TextView;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
+import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.actfm.sync.ActFmSyncService;
 import com.todoroo.astrid.actfm.sync.ActFmSyncThread;
@@ -182,8 +183,12 @@ public class PersonViewFragment extends TaskListFragment {
     protected void initiateAutomaticSyncImpl() {
         if (!isCurrentTaskListFragment())
             return;
+        if (user != null) {
+            long pushedAt = user.getValue(User.PUSHED_AT);
+            if(DateUtilities.now() - pushedAt > DateUtilities.ONE_HOUR / 2)
                 refreshData();
         }
+    }
 
     private void reloadUserData() {
         user = userDao.fetch(extras.getLong(EXTRA_USER_ID_LOCAL), User.PROPERTIES);
@@ -196,7 +201,6 @@ public class PersonViewFragment extends TaskListFragment {
     }
 
     private void refreshData() {
-        if (user != null) {
         emptyView.setText(R.string.DLG_loading);
         Runnable callback = new Runnable() {
             @Override
@@ -215,7 +219,6 @@ public class PersonViewFragment extends TaskListFragment {
         };
         ActFmSyncThread.getInstance().enqueueMessage(new BriefMe<User>(User.class, user.getValue(User.UUID), user.getValue(User.PUSHED_AT)), callback);
     }
-    }
 
     private String getEmptyDisplayString() {
         String userName = user != null ? user.getDisplayName() : null;

astrid/src/com/todoroo/astrid/helper/SyncActionHelper.java

@@ -33,6 +33,7 @@ import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
+import com.todoroo.astrid.actfm.sync.messages.NameMaps;
 import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.Filter;
@@ -98,8 +99,8 @@ public class SyncActionHelper {
                 || !filter.title.equals(activity.getString(R.string.BFE_Active)))
             return;
 
-        long lastAutoSync = Preferences.getLong(PREF_LAST_AUTO_SYNC, 0);
-        if (DateUtilities.now() - lastAutoSync > DateUtilities.ONE_HOUR) {
+        long tasksPushedAt = Preferences.getLong(NameMaps.PUSHED_AT_TASKS, 0);
+        if (DateUtilities.now() - tasksPushedAt > DateUtilities.ONE_HOUR / 2) {
             performSyncServiceV2Sync(false);
         }
     }