From 9d694dfbcaf28dd37ae4161fe1a6c15c50f20b18 Mon Sep 17 00:00:00 2001 From: Debajit Ghosh Date: Fri, 18 Sep 2009 17:55:23 -0700 Subject: [PATCH] fix bug where the default reminders get added in onRestore(), rather than once in onCreate(). --- src/com/android/calendar/EditEvent.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/com/android/calendar/EditEvent.java b/src/com/android/calendar/EditEvent.java index 25179ab..a3d94e3 100644 --- a/src/com/android/calendar/EditEvent.java +++ b/src/com/android/calendar/EditEvent.java @@ -598,6 +598,8 @@ public class EditEvent extends Activity implements View.OnClickListener, setContentView(R.layout.edit_event); mAccountManager = AccountManager.get(this); + boolean newEvent = false; + mFirstDayOfWeek = Calendar.getInstance().getFirstDayOfWeek(); mStartTime = new Time(); @@ -645,6 +647,7 @@ public class EditEvent extends Activity implements View.OnClickListener, mInitialValues.put(Events.EVENT_TIMEZONE, timezone); mInitialValues.put(Events.CALENDAR_ID, calendarId); } else { + newEvent = true; // We are creating a new event, so set the default from the // intent (if specified). allDay = intent.getBooleanExtra(EVENT_ALL_DAY, false); @@ -773,6 +776,11 @@ public class EditEvent extends Activity implements View.OnClickListener, prefs.getString(CalendarPreferenceActivity.KEY_DEFAULT_REMINDER, "0"); mDefaultReminderMinutes = Integer.parseInt(durationString); + if (newEvent && mDefaultReminderMinutes != 0) { + addReminder(this, this, mReminderItems, mReminderValues, + mReminderLabels, mDefaultReminderMinutes); + } + long eventId = (mEventCursor == null) ? -1 : mEventCursor.getLong(EVENT_INDEX_ID); ContentResolver cr = getContentResolver(); @@ -1032,12 +1040,6 @@ public class EditEvent extends Activity implements View.OnClickListener, mEndTime.set(startMillis + DateUtils.HOUR_IN_MILLIS); } - // New event - set the default reminder - if (mDefaultReminderMinutes != 0) { - addReminder(this, this, mReminderItems, mReminderValues, - mReminderLabels, mDefaultReminderMinutes); - } - // Hide delete button mDeleteButton.setVisibility(View.GONE); } -- 2.11.0