Fixed an off-by-one error in the gcal default calendar selection

astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java

@@ -143,7 +143,7 @@ public class Calendars {
 				row++;
 			}
 
-			if (result.defaultIndex == -1 || result.defaultIndex >= calendarCount) {
+			if (result.defaultIndex >= calendarCount) {
 			    result.defaultIndex = 0;
 			}
 

astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java

@@ -76,7 +76,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);
+        calendarSelector.setSelection(calendars.defaultIndex + 1); // plus 1 for the no selection item
         calendarSelector.setOnItemSelectedListener(new OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> arg0, View arg1,
@@ -207,7 +207,9 @@ public class GCalControlSet extends PopupControlSet {
     @Override
     protected void refreshDisplayView() {
         TextView calendar = (TextView) getDisplayView().findViewById(R.id.calendar_display_which);
-        if (calendarSelector.getSelectedItemPosition() != 0) {
+        if (hasEvent) {
+            calendar.setText(R.string.gcal_TEA_has_event);
+        } else if (calendarSelector.getSelectedItemPosition() != 0) {
             calendar.setText((String)calendarSelector.getSelectedItem());
         } else {
             calendar.setText(R.string.gcal_TEA_none_selected);

astrid/res/values/strings-gcal.xml

@@ -29,6 +29,8 @@
   
   <string name="gcal_TEA_none_selected">Add to cal...</string>
   
+  <string name="gcal_TEA_has_event">Cal event</string>
+  
   <!-- ======================================================== Calendars == -->
   
   <!-- Calendar event name when task is completed (%s => task title) -->