From e55abf397ecae177381e3015b2894b5f0ccb2d65 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Tue, 2 Jun 2015 11:09:54 -0500
Subject: [PATCH] Fix check for default calendar

---
 .../java/com/todoroo/astrid/gcal/GCalControlSet.java   |  4 +---
 src/main/java/com/todoroo/astrid/gcal/GCalHelper.java  | 10 ++++++----
 .../java/com/todoroo/astrid/service/TaskCreator.java   |  4 +---
 src/main/res/xml/preferences_defaults.xml              |  2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java b/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java
index 1ff80978c..4383fb874 100644
--- a/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java
+++ b/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java
@@ -141,9 +141,7 @@ public class GCalControlSet extends TaskEditControlSetBase {
             return;
         }
 
-        boolean gcalCreateEventEnabled = gcal.getDefaultCalendar() != null &&
-                                        !gcal.getDefaultCalendar().equals("-1");
-        if ((gcalCreateEventEnabled || calendarSelector.getSelectedItemPosition() != 0) &&
+        if ((gcal.isDefaultCalendarSet() || calendarSelector.getSelectedItemPosition() != 0) &&
                 calendarUri == null) {
 
             try{
diff --git a/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java b/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java
index 0529084d0..edc2730f5 100644
--- a/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java
+++ b/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java
@@ -75,14 +75,16 @@ public class GCalHelper {
         createTaskEventIfEnabled(t, true);
     }
 
-    public String getDefaultCalendar() {
+    public boolean isDefaultCalendarSet() {
+        return getDefaultCalendar() != null && !getDefaultCalendar().equals("-1") && !getDefaultCalendar().equals("0");
+    }
+
+    private String getDefaultCalendar() {
         return preferences.getStringValue(R.string.gcal_p_default);
     }
 
     private void createTaskEventIfEnabled(Task t, boolean deleteEventIfExists) {
-        boolean gcalCreateEventEnabled = getDefaultCalendar() != null
-            && !getDefaultCalendar().equals("-1"); //$NON-NLS-1$
-        if (gcalCreateEventEnabled) {
+        if (isDefaultCalendarSet()) {
             ContentResolver cr = context.getContentResolver();
             Uri calendarUri = createTaskEvent(t, cr, new ContentValues(), deleteEventIfExists);
             if (calendarUri != null) {
diff --git a/src/main/java/com/todoroo/astrid/service/TaskCreator.java b/src/main/java/com/todoroo/astrid/service/TaskCreator.java
index 3bdb53512..11add37a6 100644
--- a/src/main/java/com/todoroo/astrid/service/TaskCreator.java
+++ b/src/main/java/com/todoroo/astrid/service/TaskCreator.java
@@ -40,9 +40,7 @@ public class TaskCreator {
     }
 
     public void addToCalendar(Task task, String title) {
-        boolean gcalCreateEventEnabled = gcalHelper.getDefaultCalendar() != null
-                && !gcalHelper.getDefaultCalendar().equals("-1") && task.hasDueDate(); //$NON-NLS-1$
-
+        boolean gcalCreateEventEnabled = gcalHelper.isDefaultCalendarSet() && task.hasDueDate(); //$NON-NLS-1$
         if (!TextUtils.isEmpty(title) && gcalCreateEventEnabled && TextUtils.isEmpty(task.getCalendarURI())) {
             Uri calendarUri = gcalHelper.createTaskEvent(task,
                     context.getContentResolver(), new ContentValues());
diff --git a/src/main/res/xml/preferences_defaults.xml b/src/main/res/xml/preferences_defaults.xml
index bbbfff79a..3899c9ce6 100644
--- a/src/main/res/xml/preferences_defaults.xml
+++ b/src/main/res/xml/preferences_defaults.xml
@@ -42,7 +42,7 @@
         android:key="@string/p_default_reminders_mode_key"
         android:title="@string/EPr_default_reminders_mode_title" />
     <com.todoroo.astrid.ui.MultilineListPreference
-        android:defaultValue="0"
+        android:defaultValue="-1"
         android:entries="@array/EPr_default_addtocalendar"
         android:entryValues="@array/EPr_default_addtocalendar_values"
         android:key="@string/gcal_p_default"