Merge remote-tracking branch 'sbosley/110824_sb_gtasks_resets_reminders'

astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncProvider.java

@@ -225,7 +225,7 @@ public class ActFmSyncProvider extends SyncProvider<ActFmTaskContainer> {
      * @throws JSONException */
     private ActFmTaskContainer parseRemoteTask(JSONObject remoteTask) throws JSONException {
         Task task = new Task();
-        TaskDao.setDefaultReminders(task);
+
         ArrayList<Metadata> metadata = new ArrayList<Metadata>();
 
         JsonHelper.taskFromJson(remoteTask, task, metadata);
@@ -299,6 +299,8 @@ public class ActFmSyncProvider extends SyncProvider<ActFmTaskContainer> {
             Task local = PluginServices.getTaskService().fetchById(task.task.getId(), Task.COMPLETION_DATE);
             if(task.task.isCompleted() && !local.isCompleted())
                 StatisticsService.reportEvent("actfm-task-completed"); //$NON-NLS-1$
+        } else { // Set default reminders for remotely created tasks
+            TaskDao.setDefaultReminders(task.task);
         }
         actFmDataService.saveTaskAndMetadata(task);
     }

astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java

@@ -537,7 +537,6 @@ public class GtasksSyncProvider extends SyncProvider<GtasksTaskContainer> {
      * @throws JSONException */
     private GtasksTaskContainer parseRemoteTask(com.google.api.services.tasks.v1.model.Task remoteTask) {
         Task task = new Task();
-        TaskDao.setDefaultReminders(task);
 
         ArrayList<Metadata> metadata = new ArrayList<Metadata>();
 
@@ -609,6 +608,8 @@ public class GtasksSyncProvider extends SyncProvider<GtasksTaskContainer> {
             mergeDates(task.task, local);
             if(task.task.isCompleted() && !local.isCompleted())
                 StatisticsService.reportEvent("gtasks-task-completed"); //$NON-NLS-1$
+        } else { // Set default reminders for remotely created tasks
+            TaskDao.setDefaultReminders(task.task);
         }
         gtasksMetadataService.saveTaskAndMetadata(task);
     }

astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java

@@ -367,7 +367,7 @@ public class ProducteevSyncProvider extends SyncProvider<ProducteevTaskContainer
      * @throws JSONException */
     private ProducteevTaskContainer parseRemoteTask(JSONObject remoteTask) throws JSONException {
         Task task = new Task();
-        TaskDao.setDefaultReminders(task);
+
         ArrayList<Metadata> metadata = new ArrayList<Metadata>();
 
         if(remoteTask.has("task"))
@@ -611,6 +611,8 @@ public class ProducteevSyncProvider extends SyncProvider<ProducteevTaskContainer
             task.task.setFlag(Task.FLAGS, Task.FLAG_REPEAT_AFTER_COMPLETION, local.getFlag(Task.FLAGS, Task.FLAG_REPEAT_AFTER_COMPLETION));
             if(task.task.isCompleted() && !local.isCompleted())
                 StatisticsService.reportEvent("pdv-task-completed"); //$NON-NLS-1$
+        } else { // Set default reminders for remotely created tasks
+            TaskDao.setDefaultReminders(task.task);
         }
         dataService.saveTaskAndMetadata(task);
     }