From 5f2284d5da42ba37aa5419cc74781b314c3c5c30 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Thu, 12 Jul 2012 18:47:11 -0700
Subject: [PATCH] Fixed bugs with the quick add calendar control

---
 .../com/todoroo/astrid/gcal/GCalControlSet.java        | 10 +++++++++-
 astrid/src/com/todoroo/astrid/ui/QuickAddBar.java      |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java
index f3f925b54..eda00d074 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java
@@ -74,7 +74,7 @@ public class GCalControlSet extends PopupControlSet {
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         calendarSelector.setPromptId(title);
         calendarSelector.setAdapter(adapter);
-        calendarSelector.setSelection(calendars.defaultIndex + 1); // plus 1 for the no selection item
+        resetCalendarSelector();
         calendarSelector.setOnItemSelectedListener(new OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> arg0, View arg1,
@@ -115,10 +115,18 @@ public class GCalControlSet extends PopupControlSet {
                 exceptionService.reportError("unable-to-parse-calendar: " +  //$NON-NLS-1$
                         model.getValue(Task.CALENDAR_URI), e);
             }
+        } else {
+            hasEvent = false;
+            calendarUri = null;
         }
         refreshDisplayView();
     }
 
+    public void resetCalendarSelector() {
+        if (calendarSelector != null)
+            calendarSelector.setSelection(calendars.defaultIndex + 1); // plus 1 for the no selection item
+    }
+
     @SuppressWarnings("nls")
     @Override
     protected String writeToModelAfterInitialized(Task task) {
diff --git a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
index 63bff48ba..c78358433 100644
--- a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
+++ b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
@@ -237,6 +237,7 @@ public class QuickAddBar extends LinearLayout implements RecognizerApiListener {
         }
         repeatControl.readFromTask(empty);
         gcalControl.readFromTask(empty);
+        gcalControl.resetCalendarSelector();
         deadlineControl.readFromTask(empty);
         peopleControl.setUpData(empty, fragment.getActiveTagData());
         peopleControl.assignToMe();