Check to make sure local task is non-null when saving during gtasks sync

13 years ago · efa502be7d
parent 7a731a190a
commit efa502be7d
1 changed files with 7 additions and 3 deletions
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
@ -258,9 +258,13 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
        //  merge astrid dates with google dates
        if(task.task.isSaved()) {
            Task local = PluginServices.getTaskService().fetchById(task.task.getId(), Task.DUE_DATE, Task.COMPLETION_DATE);
-            mergeDates(task.task, local);
-            if(task.task.isCompleted() && !local.isCompleted())
-                StatisticsService.reportEvent(StatisticsConstants.GTASKS_TASK_COMPLETED);
+            if (local == null) {
+                task.task.clearValue(Task.ID);
+            } else {
+                mergeDates(task.task, local);
+                if(task.task.isCompleted() && !local.isCompleted())
+                    StatisticsService.reportEvent(StatisticsConstants.GTASKS_TASK_COMPLETED);
+            }
        } else { // Set default reminders for remotely created tasks
            TaskDao.setDefaultReminders(task.task);
        }