code cleanup (1104cfd6) · Commits · e / os / android_packages_apps_Etar

app/src/main/java/com/android/calendar/CalendarEventModel.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ public class CalendarEventModel implements Serializable {
		public String mDescription = null;
		public String mUrl = null;
		public String mRrule = null;
		public String exdate = null;
		public String mExDate = null;
		public String mOrganizer = null;
		public String mOrganizerDisplayName = null;
		/**

app/src/main/java/com/android/calendar/event/EditEventFragment.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -752,16 +752,14 @@ public class EditEventFragment extends Fragment implements EventHandler, OnColor
		setModelIfDone(TOKEN_REMINDERS);
		}

		// disable non-synced calendars for recurring events
		// disable all calendars for recurring events and sdk<30
		final String selection;
		final String[] selectionArgs;
		if (!TextUtils.isEmpty(mModel.mRrule)
		&& Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
		final boolean isRecurring = !TextUtils.isEmpty(mModel.mRrule);
		if (isRecurring && Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
		// recurring event, api level < 30. disable changing calendars.
		selection = EditEventHelper.CALENDARS_WHERE;
		selectionArgs = new String[] { Long.toString(mModel.mCalendarId) };
		} else if (!TextUtils.isEmpty(mModel.mRrule)) {
		} else if (isRecurring) {
		// recurring event, api level >= 30. enable changing calendars to synced calendars.
		selection = EditEventHelper.CALENDARS_WHERE_SYNCED_WRITEABLE_VISIBLE;
		selectionArgs = null;

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -525,7 +525,9 @@ public class EditEventHelper {
		}
		ops.add(b.build());
		}
		} else if (hasAttendeeData && model.mSelfAttendeeStatus != originalModel.mSelfAttendeeStatus) {
		} else if (hasAttendeeData &&
		model.mSelfAttendeeStatus != originalModel.mSelfAttendeeStatus &&
		model.mOwnerAttendeeId != -1) {
		if (DEBUG) {
		Log.d(TAG, "Setting attendee status to " + model.mSelfAttendeeStatus);
		}
		@@ -563,6 +565,7 @@ public class EditEventHelper {
		// new events (being inserted into the Events table) won't
		// have any existing attendees.
		if (!newEvent) {
		removedAttendees.clear();
		HashMap<String, Attendee> originalAttendees = originalModel.mAttendeesList;
		for (String originalEmail : originalAttendees.keySet()) {
		if (newAttendees.containsKey(originalEmail)) {
		@@ -1173,7 +1176,7 @@ public class EditEventHelper {
		}
		String rRule = cursor.getString(EVENT_INDEX_RRULE);
		model.mRrule = rRule;
		model.exdate = cursor.getString(EVENT_INDEX_EXDATE);
		model.mExDate = cursor.getString(EVENT_INDEX_EXDATE);
		model.mSyncId = cursor.getString(EVENT_INDEX_SYNC_ID);
		model.mSyncAccountName = cursor.getString(EVENT_INDEX_ACCOUNT_NAME);
		model.mSyncAccountType = cursor.getString(EVENT_INDEX_ACCOUNT_TYPE);
		@@ -1363,7 +1366,7 @@ public class EditEventHelper {
		values.put(Events.TITLE, title);
		values.put(Events.ALL_DAY, isAllDay ? 1 : 0);
		values.put(Events.DTSTART, startMillis);
		values.put(Events.EXDATE, model.exdate);
		values.put(Events.EXDATE, model.mExDate);
		values.put(Events.RRULE, rrule);
		if (!TextUtils.isEmpty(rrule)) {
		addRecurrenceRule(values, model);