Allow duplicate caldav calendar names

pull/848/head
Alex Baker 7 years ago
parent 97d17d23c0
commit 81bd35ecf5

@ -205,20 +205,8 @@ public class CaldavCalendarSettingsActivity extends ThemedInjectingAppCompatActi
String name = getNewName(); String name = getNewName();
boolean failed = false;
if (isEmpty(name)) { if (isEmpty(name)) {
nameLayout.setError(getString(R.string.name_cannot_be_empty)); nameLayout.setError(getString(R.string.name_cannot_be_empty));
failed = true;
} else {
CaldavCalendar calendarByName = caldavDao.getCalendar(caldavAccount.getUuid(), name);
if (calendarByName != null && !calendarByName.equals(caldavCalendar)) {
nameLayout.setError(getString(R.string.duplicate_name));
failed = true;
}
}
if (failed) {
return; return;
} }

@ -70,10 +70,6 @@ public interface CaldavDao {
@Query("SELECT * FROM caldav_lists WHERE cdl_uuid = :uuid LIMIT 1") @Query("SELECT * FROM caldav_lists WHERE cdl_uuid = :uuid LIMIT 1")
CaldavCalendar getCalendar(String uuid); CaldavCalendar getCalendar(String uuid);
@Query(
"SELECT * FROM caldav_lists WHERE cdl_account = :account AND cdl_name = :name COLLATE NOCASE LIMIT 1")
CaldavCalendar getCalendar(String account, String name);
@Query("SELECT cd_object FROM caldav_tasks WHERE cd_calendar = :calendar") @Query("SELECT cd_object FROM caldav_tasks WHERE cd_calendar = :calendar")
List<String> getObjects(String calendar); List<String> getObjects(String calendar);

Loading…
Cancel
Save