Fix setting caldav icon on new list

app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java

@@ -197,8 +197,8 @@ public class CaldavCalendarSettingsActivity extends BaseListSettingsActivity {
     caldavCalendar.setUrl(url);
     caldavCalendar.setName(getNewName());
     caldavCalendar.setColor(selectedTheme);
-    caldavCalendar.setId(caldavDao.insert(caldavCalendar));
     caldavCalendar.setIcon(selectedIcon);
+    caldavDao.insert(caldavCalendar);
     setResult(
         RESULT_OK,
         new Intent().putExtra(MainActivity.OPEN_FILTER, new CaldavFilter(caldavCalendar)));

app/src/main/java/org/tasks/caldav/CaldavSynchronizer.java

@@ -145,7 +145,7 @@ public class CaldavSynchronizer {
         calendar.setAccount(account.getUuid());
         calendar.setUrl(url);
         calendar.setUuid(UUIDHelper.newUUID());
-        calendar.setId(caldavDao.insert(calendar));
+        caldavDao.insert(calendar);
       }
       sync(calendar, resource, caldavClient.getHttpClient());
     }

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

@@ -38,8 +38,12 @@ public abstract class CaldavDao {
   @Update
   public abstract void update(CaldavAccount caldavAccount);
 
+  public void insert(CaldavCalendar caldavCalendar) {
+    caldavCalendar.setId(insertInternal(caldavCalendar));
+  }
+
   @Insert
-  public abstract long insert(CaldavCalendar caldavCalendar);
+  abstract long insertInternal(CaldavCalendar caldavCalendar);
 
   @Update
   public abstract void update(CaldavCalendar caldavCalendar);