Remove remoteId from CaldavTask constructor

app/src/main/java/com/todoroo/astrid/service/TaskCreator.java

@@ -98,7 +98,7 @@ public class TaskCreator {
           new GoogleTask(task.getId(), task.getTransitory(GoogleTask.KEY)),
           preferences.addGoogleTasksToTop());
     } else if (task.hasTransitory(CaldavTask.KEY)) {
-      caldavDao.insert(new CaldavTask(task.getId(), task.getTransitory(CaldavTask.KEY), newUUID()));
+      caldavDao.insert(new CaldavTask(task.getId(), task.getTransitory(CaldavTask.KEY)));
     } else {
       Filter remoteList = defaultFilterProvider.getDefaultRemoteList();
       if (remoteList instanceof GtasksFilter) {
@@ -107,7 +107,7 @@ public class TaskCreator {
             preferences.addGoogleTasksToTop());
       } else if (remoteList instanceof CaldavFilter) {
         caldavDao.insert(
-            new CaldavTask(task.getId(), ((CaldavFilter) remoteList).getUuid(), newUUID()));
+            new CaldavTask(task.getId(), ((CaldavFilter) remoteList).getUuid()));
       }
     }
 

app/src/main/java/com/todoroo/astrid/service/TaskMover.java

@@ -13,7 +13,6 @@ import com.todoroo.astrid.api.GtasksFilter;
 import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.data.SyncFlags;
 import com.todoroo.astrid.data.Task;
-import com.todoroo.astrid.helper.UUIDHelper;
 import java.util.List;
 import javax.inject.Inject;
 import org.tasks.data.CaldavDao;
@@ -123,7 +122,7 @@ public class TaskMover {
       caldavDao.insert(
           transform(
               concat(singletonList(id), transform(googleTaskChildren, GoogleTask::getTask)),
-              _id -> new CaldavTask(_id, listId, UUIDHelper.newUUID())));
+              _id -> new CaldavTask(_id, listId)));
     }
   }
 }

app/src/main/java/org/tasks/data/CaldavTask.java

@@ -1,5 +1,7 @@
 package org.tasks.data;
 
+import static com.todoroo.astrid.helper.UUIDHelper.newUUID;
+
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.Ignore;
@@ -44,8 +46,11 @@ public class CaldavTask {
   public CaldavTask() {}
 
   @Ignore
-  public CaldavTask(long task, String account, String remoteId) {
+  public CaldavTask(long task, String calendar) {
-    this(task, account, remoteId, remoteId + ".ics");
+    this.task = task;
+    this.calendar = calendar;
+    this.remoteId = newUUID();
+    this.object = remoteId + ".ics";
   }
 
   @Ignore