diff options
Diffstat (limited to 'src/com/android/calendar/event/EditEventView.java')
-rw-r--r-- | src/com/android/calendar/event/EditEventView.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/com/android/calendar/event/EditEventView.java b/src/com/android/calendar/event/EditEventView.java index 57d56b14..c6f49542 100644 --- a/src/com/android/calendar/event/EditEventView.java +++ b/src/com/android/calendar/event/EditEventView.java @@ -1415,14 +1415,21 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa String defaultCalendar = Utils.getSharedPreference( mActivity, GeneralPreferences.KEY_DEFAULT_CALENDAR, (String) null); - if (defaultCalendar == null) { - return 0; - } int calendarsOwnerColumn = calendarsCursor.getColumnIndexOrThrow(Calendars.OWNER_ACCOUNT); + int accountNameIndex = calendarsCursor.getColumnIndexOrThrow(Calendars.ACCOUNT_NAME); int position = 0; calendarsCursor.moveToPosition(-1); while (calendarsCursor.moveToNext()) { - if (defaultCalendar.equals(calendarsCursor.getString(calendarsOwnerColumn))) { + String calendarOwner = calendarsCursor.getString(calendarsOwnerColumn); + if (defaultCalendar == null) { + // There is no stored default upon the first time running. Use a primary + // calendar in this case. + if (calendarOwner != null && + calendarOwner.equals(calendarsCursor.getString(accountNameIndex))) { + return position; + } + } else if (defaultCalendar.equals(calendarOwner)) { + // Found the default calendar. return position; } position++; |