Add CalendarEventProvider.hasEvent(Uri)

src/main/java/com/todoroo/astrid/gcal/GCalHelper.java

@@ -20,7 +20,6 @@ import com.todoroo.astrid.service.TaskService;
 import org.tasks.R;
 import org.tasks.calendars.AndroidCalendarEvent;
 import org.tasks.calendars.CalendarEventProvider;
-import org.tasks.calendars.CalendarProvider;
 import org.tasks.injection.ForApplication;
 import org.tasks.preferences.PermissionChecker;
 import org.tasks.preferences.Preferences;
@@ -38,18 +37,15 @@ public class GCalHelper {
 
     private final TaskService taskService;
     private final Preferences preferences;
-    private final CalendarProvider calendarProvider;
     private final PermissionChecker permissionChecker;
     private final CalendarEventProvider calendarEventProvider;
     private final ContentResolver cr;
 
     @Inject
     public GCalHelper(@ForApplication Context context, TaskService taskService, Preferences preferences,
-                      CalendarProvider calendarProvider, PermissionChecker permissionChecker,
+                      PermissionChecker permissionChecker, CalendarEventProvider calendarEventProvider) {
-                      CalendarEventProvider calendarEventProvider) {
         this.taskService = taskService;
         this.preferences = preferences;
-        this.calendarProvider = calendarProvider;
         this.permissionChecker = permissionChecker;
         this.calendarEventProvider = calendarEventProvider;
         cr = context.getContentResolver();
@@ -165,7 +161,7 @@ public class GCalHelper {
         if(!TextUtils.isEmpty(uri)) {
             try {
                 Uri calendarUri = Uri.parse(uri);
-                if (calendarProvider.getCalendar(calendarUri) != null) {
+                if (calendarEventProvider.hasEvent(calendarUri)) {
                     cr.delete(calendarUri, null, null);
                     eventDeleted = true;
                 }

src/main/java/org/tasks/calendars/CalendarEventProvider.java

@@ -55,6 +55,10 @@ public class CalendarEventProvider {
         return events.isEmpty() ? null : events.get(0);
     }
 
+    public boolean hasEvent(Uri eventUri) {
+        return getEvent(eventUri) != null;
+    }
+
     public List<AndroidCalendarEvent> getEventsBetween(long start, long end) {
         return getCalendarEvents(
                 CalendarContract.Events.CONTENT_URI,

src/main/java/org/tasks/calendars/CalendarProvider.java

@@ -44,16 +44,7 @@ public class CalendarProvider {
 
     @Nullable
     public AndroidCalendar getCalendar(String id) {
-        return getCalendar(CalendarContract.Calendars.CONTENT_URI, CAN_MODIFY + " AND Calendars._id=" + id);
+        List<AndroidCalendar> calendars = getCalendars(CalendarContract.Calendars.CONTENT_URI, CAN_MODIFY + " AND Calendars._id=" + id);
-    }
-
-    @Nullable
-    public AndroidCalendar getCalendar(Uri uri) {
-        return getCalendar(uri, CAN_MODIFY);
-    }
-
-    private AndroidCalendar getCalendar(Uri uri, String selection) {
-        List<AndroidCalendar> calendars = getCalendars(uri, selection);
         return calendars.isEmpty() ? null : calendars.get(0);
     }