Sync doesn't reset reminder settings anymore

pull/14/head
Sam Bosley 15 years ago
parent dc1c14a5b7
commit 5c22c0ed7a

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

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

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

Loading…
Cancel
Save