diff options
author | Michael Chan <mchan@android.com> | 2010-10-13 14:04:56 -0700 |
---|---|---|
committer | Michael Chan <mchan@android.com> | 2010-10-13 14:05:40 -0700 |
commit | 304bf0d244d54c2c8c1799e3d43c54d197a891d8 (patch) | |
tree | ca2b493e3c27aac736a7a06bd9dc035e9f15347b | |
parent | b4bab82dd797bf9371c05b3bb2e5b2f288dc5c91 (diff) | |
download | android_packages_apps_Calendar-304bf0d244d54c2c8c1799e3d43c54d197a891d8.tar.gz android_packages_apps_Calendar-304bf0d244d54c2c8c1799e3d43c54d197a891d8.tar.bz2 android_packages_apps_Calendar-304bf0d244d54c2c8c1799e3d43c54d197a891d8.zip |
Initialize default calendar permission for new events
Change-Id: I6cd8a6a2674b148754c2b0a2e3865f58f07af04f
-rw-r--r-- | src/com/android/calendar/CalendarEventModel.java | 21 | ||||
-rw-r--r-- | src/com/android/calendar/event/EditEventFragment.java | 19 |
2 files changed, 25 insertions, 15 deletions
diff --git a/src/com/android/calendar/CalendarEventModel.java b/src/com/android/calendar/CalendarEventModel.java index b9b531d9..77d1d32a 100644 --- a/src/com/android/calendar/CalendarEventModel.java +++ b/src/com/android/calendar/CalendarEventModel.java @@ -21,6 +21,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.net.Uri; import android.provider.Calendar.Attendees; +import android.provider.Calendar.Calendars; import android.provider.Calendar.Events; import android.text.TextUtils; @@ -122,15 +123,12 @@ public class CalendarEventModel { public boolean mGuestsCanInviteOthers = false; public boolean mGuestsCanSeeGuests = false; -// NEW vvvvvvvvvvvvvvv - // FRAG_TODO update equal/hashcode/clear public boolean mOrganizerCanRespond = false; - public int mCalendarAccessLevel = 0; + public int mCalendarAccessLevel = Calendars.CONTRIBUTOR_ACCESS; // The model can't be updated with a calendar cursor until it has been // updated with an event cursor. public boolean mModelUpdatedWithEventCursor; -// NEW ^^^^^^^^^^^^^ public int mVisibility = 0; public ArrayList<Integer> mReminderMinutes; @@ -258,6 +256,9 @@ public class CalendarEventModel { mGuestsCanInviteOthers = false; mGuestsCanSeeGuests = false; mVisibility = 0; + mOrganizerCanRespond = false; + mCalendarAccessLevel = Calendars.CONTRIBUTOR_ACCESS; + mModelUpdatedWithEventCursor = false; mReminderMinutes = new ArrayList<Integer>(); mAttendeesList.clear(); @@ -297,6 +298,9 @@ public class CalendarEventModel { result = prime * result + (mGuestsCanInviteOthers ? 1231 : 1237); result = prime * result + (mGuestsCanModify ? 1231 : 1237); result = prime * result + (mGuestsCanSeeGuests ? 1231 : 1237); + result = prime * result + (mOrganizerCanRespond ? 1231 : 1237); + result = prime * result + (mModelUpdatedWithEventCursor ? 1231 : 1237); + result = prime * result + mCalendarAccessLevel; result = prime * result + (mHasAlarm ? 1231 : 1237); result = prime * result + (mHasAttendeeData ? 1231 : 1237); result = prime * result + (int) (mId ^ (mId >>> 32)); @@ -384,6 +388,15 @@ public class CalendarEventModel { if (mGuestsCanSeeGuests != other.mGuestsCanSeeGuests) { return false; } + if (mOrganizerCanRespond != other.mOrganizerCanRespond) { + return false; + } + if (mCalendarAccessLevel != other.mCalendarAccessLevel) { + return false; + } + if (mModelUpdatedWithEventCursor != other.mModelUpdatedWithEventCursor) { + return false; + } if (mHasAlarm != other.mHasAlarm) { return false; } diff --git a/src/com/android/calendar/event/EditEventFragment.java b/src/com/android/calendar/event/EditEventFragment.java index b8d0b4a5..b7026b92 100644 --- a/src/com/android/calendar/event/EditEventFragment.java +++ b/src/com/android/calendar/event/EditEventFragment.java @@ -475,18 +475,15 @@ public class EditEventFragment extends Fragment implements EventHandler { if ((mCode & Utils.DONE_SAVE) != 0 && mModel != null && (EditEventHelper.canRespond(mModel) || EditEventHelper - .canModifyEvent(mModel))) { - if (mModel != null && !mModel.equals(mOriginalModel)) { - if (mHelper.saveEvent(mModel, mOriginalModel, mModification)) { - if (mModel.mUri != null) { - Toast.makeText(mContext, R.string.saving_event, Toast.LENGTH_SHORT) - .show(); - } else { - Toast.makeText(mContext, R.string.creating_event, - Toast.LENGTH_SHORT).show(); - } - } + .canModifyEvent(mModel)) && !mModel.equals(mOriginalModel) + && mHelper.saveEvent(mModel, mOriginalModel, mModification)) { + int stringResource; + if (mModel.mUri != null) { + stringResource = R.string.saving_event; + } else { + stringResource = R.string.creating_event; } + Toast.makeText(mContext, stringResource, Toast.LENGTH_SHORT).show(); } if ((mCode & Utils.DONE_DELETE) != 0 && mModel != null |