Merge "Create events with event set to confirmed instead of tentative" into jb-dev (735f96ab) · Commits · e / os / android_packages_apps_Etar

src/com/android/calendar/CalendarEventModel.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -252,6 +252,8 @@ public class CalendarEventModel implements Serializable {
		public boolean mOrganizerCanRespond = false;
		public int mCalendarAccessLevel = Calendars.CAL_ACCESS_CONTRIBUTOR;

		public int mEventStatus = Events.STATUS_CONFIRMED;

		// The model can't be updated with a calendar cursor until it has been
		// updated with an event cursor.
		public boolean mModelUpdatedWithEventCursor;
		@@ -411,6 +413,7 @@ public class CalendarEventModel implements Serializable {
		mGuestsCanInviteOthers = false;
		mGuestsCanSeeGuests = false;
		mAccessLevel = 0;
		mEventStatus = Events.STATUS_CONFIRMED;
		mOrganizerCanRespond = false;
		mCalendarAccessLevel = Calendars.CAL_ACCESS_CONTRIBUTOR;
		mModelUpdatedWithEventCursor = false;
		@@ -501,6 +504,7 @@ public class CalendarEventModel implements Serializable {
		result = prime * result + (mAvailability);
		result = prime * result + ((mUri == null) ? 0 : mUri.hashCode());
		result = prime * result + mAccessLevel;
		result = prime * result + mEventStatus;
		return result;
		}

		@@ -831,6 +835,10 @@ public class CalendarEventModel implements Serializable {
		if (mAccessLevel != originalModel.mAccessLevel) {
		return false;
		}

		if (mEventStatus != originalModel.mEventStatus) {
		return false;
		}
		return true;
		}

src/com/android/calendar/event/EditEventHelper.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -82,6 +82,7 @@ public class EditEventHelper {
		Events.ORGANIZER, // 18
		Events.GUESTS_CAN_MODIFY, // 19
		Events.ORIGINAL_ID, // 20
		Events.STATUS, // 21
		};
		protected static final int EVENT_INDEX_ID = 0;
		protected static final int EVENT_INDEX_TITLE = 1;
		@@ -104,6 +105,7 @@ public class EditEventHelper {
		protected static final int EVENT_INDEX_ORGANIZER = 18;
		protected static final int EVENT_INDEX_GUESTS_CAN_MODIFY = 19;
		protected static final int EVENT_INDEX_ORIGINAL_ID = 20;
		protected static final int EVENT_INDEX_EVENT_STATUS = 21;

		public static final String[] REMINDERS_PROJECTION = new String[] {
		Reminders._ID, // 0
		@@ -285,7 +287,7 @@ public class EditEventHelper {
		if (uri == null) {
		// Add hasAttendeeData for a new event
		values.put(Events.HAS_ATTENDEE_DATA, 1);
		values.put(Events.STATUS, Events.STATUS_TENTATIVE);
		values.put(Events.STATUS, Events.STATUS_CONFIRMED);
		eventIdIndex = ops.size();
		ContentProviderOperation.Builder b = ContentProviderOperation.newInsert(
		Events.CONTENT_URI).withValues(values);
		@@ -310,7 +312,7 @@ public class EditEventHelper {
		values.put(Events.ORIGINAL_INSTANCE_TIME, begin);
		boolean allDay = originalModel.mAllDay;
		values.put(Events.ORIGINAL_ALL_DAY, allDay ? 1 : 0);
		values.put(Events.STATUS, Events.STATUS_TENTATIVE);
		values.put(Events.STATUS, originalModel.mEventStatus);

		eventIdIndex = ops.size();
		ContentProviderOperation.Builder b = ContentProviderOperation.newInsert(
		@@ -333,7 +335,7 @@ public class EditEventHelper {
		updatePastEvents(ops, originalModel, model.mOriginalStart);
		}
		eventIdIndex = ops.size();
		values.put(Events.STATUS, Events.STATUS_TENTATIVE);
		values.put(Events.STATUS, originalModel.mEventStatus);
		ops.add(ContentProviderOperation.newInsert(Events.CONTENT_URI).withValues(values)
		.build());
		} else {
		@@ -356,7 +358,7 @@ public class EditEventHelper {

		// Create a new event with the user-modified fields
		eventIdIndex = ops.size();
		values.put(Events.STATUS, Events.STATUS_TENTATIVE);
		values.put(Events.STATUS, originalModel.mEventStatus);
		ops.add(ContentProviderOperation.newInsert(Events.CONTENT_URI).withValues(
		values).build());
		}
		@@ -1043,6 +1045,7 @@ public class EditEventHelper {
		accessLevel--;
		}
		model.mAccessLevel = accessLevel;
		model.mEventStatus = cursor.getInt(EVENT_INDEX_EVENT_STATUS);

		boolean hasRRule = !TextUtils.isEmpty(rRule);

		@@ -1238,6 +1241,7 @@ public class EditEventHelper {
		accessLevel++;
		}
		values.put(Events.ACCESS_LEVEL, accessLevel);
		values.put(Events.STATUS, model.mEventStatus);

		return values;
		}

tests/src/com/android/calendar/AsyncQueryServiceTest.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -414,6 +414,7 @@ public class AsyncQueryServiceTest extends ServiceTestCase<AsyncQueryServiceHelp
		return AsyncQueryServiceTest.class.getPackage().getName();
		}

		@Override
		public ComponentName startService(Intent service) {
		AsyncQueryServiceTest.this.startService(service);
		return service.getComponent();

tests/src/com/android/calendar/event/EditEventHelperTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1486,8 +1486,7 @@ public class EditEventHelperTest extends AndroidTestCase {
		model.mAccessLevel = 2; // This is one less than the values written if >0
		model.mOwnerAccount = "steve@gmail.com";
		model.mHasAttendeeData = true;


		model.mEventStatus = Events.STATUS_CONFIRMED;
		return model;
		}

		@@ -1510,6 +1509,7 @@ public class EditEventHelperTest extends AndroidTestCase {
		values.put(Events.DESCRIPTION, "Evaluating Life, the Universe, and Everything");
		values.put(Events.EVENT_LOCATION, "Earth Mk2");
		values.put(Events.AVAILABILITY, 0);
		values.put(Events.STATUS, Events.STATUS_CONFIRMED);
		values.put(Events.ACCESS_LEVEL, 3); // This is one more than the model if
		// >0