Refactoring (34399181) · Commits · e / os / AccountManager

app/src/main/java/at/bitfire/davdroid/resource/Event.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -293,8 +293,6 @@ public class Event extends iCalendar {
		event.getProperties().add(forPublic ? Clazz.PUBLIC : Clazz.PRIVATE);

		event.getAlarms().addAll(alarms);

		props.add(new LastModified());
		return event;
		}

app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java

+16 −14

Original line number	Diff line number	Diff line
		@@ -425,7 +425,8 @@ public class LocalCalendar extends LocalCollection<Event> {
		// availability
		e.opaque = values.getAsInteger(Events.AVAILABILITY) != Events.AVAILABILITY_FREE;

		// set ORGANIZER
		// set ORGANIZER if there's attendee data
		if (values.getAsInteger(Events.HAS_ATTENDEE_DATA) != 0)
		try {
		e.organizer = new Organizer(new URI("mailto", values.getAsString(Events.ORGANIZER), null));
		} catch (URISyntaxException ex) {
		@@ -553,8 +554,8 @@ public class LocalCalendar extends LocalCollection<Event> {
		.withValue(entryColumnETag(), event.getETag())
		.withValue(entryColumnUID(), event.getUid());
		} else {
		// event is an exception
		builder.withValue(Events.ORIGINAL_SYNC_ID, event.getName());

		// ORIGINAL_INSTANCE_TIME and ORIGINAL_ALL_DAY is set in buildExceptions.
		// It's not possible to use only the RECURRENCE-ID to calculate
		// ORIGINAL_INSTANCE_TIME and ORIGINAL_ALL_DAY because iCloud sends DATE-TIME
		@@ -616,7 +617,6 @@ public class LocalCalendar extends LocalCollection<Event> {
		builder.withValue(Events.ORGANIZER, email != null ? email : uri.toString());
		}

		//Status status = event.getStatus();
		if (event.status!= null) {
		int statusCode = Events.STATUS_TENTATIVE;
		if (event.status == Status.VEVENT_CONFIRMED)
		@@ -639,15 +639,15 @@ public class LocalCalendar extends LocalCollection<Event> {
		protected void addDataRows(Resource resource, long localID, int backrefIdx) {
		final Event event = (Event)resource;

		// add exceptions
		for (Event exception : event.getExceptions())
		pendingOperations.add(buildException(newDataInsertBuilder(Events.CONTENT_URI, Events.ORIGINAL_ID, localID, backrefIdx), event, exception).build());
		// add attendees
		for (Attendee attendee : event.getAttendees())
		pendingOperations.add(buildAttendee(newDataInsertBuilder(Attendees.CONTENT_URI, Attendees.EVENT_ID, localID, backrefIdx), attendee).build());
		// add reminders
		for (VAlarm alarm : event.getAlarms())
		pendingOperations.add(buildReminder(newDataInsertBuilder(Reminders.CONTENT_URI, Reminders.EVENT_ID, localID, backrefIdx), alarm).build());
		// add exceptions
		for (Event exception : event.getExceptions())
		pendingOperations.add(buildException(newDataInsertBuilder(Events.CONTENT_URI, Events.ORIGINAL_ID, localID, backrefIdx), event, exception).build());
		}

		@Override
		@@ -668,7 +668,6 @@ public class LocalCalendar extends LocalCollection<Event> {

		protected Builder buildException(Builder builder, Event master, Event exception) {
		buildEntry(builder, exception, false);
		builder.withValue(Events.ORIGINAL_SYNC_ID, exception.getName());

		final boolean originalAllDay = master.isAllDay();

		@@ -685,12 +684,16 @@ public class LocalCalendar extends LocalCollection<Event> {

		builder.withValue(Events.ORIGINAL_INSTANCE_TIME, date.getTime());
		builder.withValue(Events.ORIGINAL_ALL_DAY, originalAllDay ? 1 : 0);

		/* TODO reminders and attendees for exceptions are currently not built because
		* there's no backref index available */

		return builder;
		}

		@SuppressLint("InlinedApi")
		protected Builder buildAttendee(Builder builder, Attendee attendee) {
		final Uri member = Uri.parse(attendee.getValue());
		final URI member = attendee.getCalAddress();
		if ("mailto".equalsIgnoreCase(member.getScheme()))
		// attendee identified by email
		builder = builder.withValue(Attendees.ATTENDEE_EMAIL, member.getSchemeSpecificPart());
		@@ -760,7 +763,6 @@ public class LocalCalendar extends LocalCollection<Event> {
		}

		Log.d(TAG, "Adding alarm " + minutes + " minutes before");

		return builder
		.withValue(Reminders.METHOD, Reminders.METHOD_ALERT)
		.withValue(Reminders.MINUTES, minutes);

app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import at.bitfire.davdroid.resource.Resource;
		import at.bitfire.davdroid.resource.WebDavCollection;
		import at.bitfire.davdroid.webdav.ConflictException;
		import at.bitfire.davdroid.webdav.DavException;
		import at.bitfire.davdroid.webdav.ForbiddenException;
		import at.bitfire.davdroid.webdav.HttpException;
		import at.bitfire.davdroid.webdav.NotFoundException;
		import at.bitfire.davdroid.webdav.PreconditionFailedException;
		@@ -119,11 +120,10 @@ public class SyncManager {
		remote.delete(res);
		} catch(NotFoundException e) {
		Log.i(TAG, "Locally-deleted resource has already been removed from server");
		} catch(PreconditionFailedException e) {
		} catch(PreconditionFailedException\|ConflictException e) {
		Log.i(TAG, "Locally-deleted resource has been changed on the server in the meanwhile");
		}

		// always delete locally so that the record with the DELETED flag doesn't cause another deletion attempt
		local.delete(res);

		count++;
		@@ -149,7 +149,7 @@ public class SyncManager {
		local.updateETag(res, eTag);
		local.clearDirty(res);
		count++;
		} catch (PreconditionFailedException\|ConflictException e) {
		} catch (ConflictException\|PreconditionFailedException e) {
		Log.i(TAG, "Didn't overwrite existing resource with other content");
		} catch (RecordNotFoundException e) {
		Log.wtf(TAG, "Couldn't read new record", e);
		@@ -173,8 +173,10 @@ public class SyncManager {
		local.updateETag(res, eTag);
		local.clearDirty(res);
		count++;
		} catch (PreconditionFailedException\|ConflictException e) {
		Log.i(TAG, "Locally changed resource has been changed on the server in the meanwhile");
		} catch (ForbiddenException e) {
		Log.w(TAG, "Server has rejected local changes, server wins", e);
		} catch (ConflictException\|PreconditionFailedException e) {
		Log.i(TAG, "Locally changed resource has been changed on the server in the meanwhile", e);
		} catch (RecordNotFoundException e) {
		Log.e(TAG, "Couldn't read dirty record", e);
		}

app/src/main/java/at/bitfire/davdroid/webdav/ForbiddenException.java

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
		* All rights reserved. This program and the accompanying materials
		* are made available under the terms of the GNU Public License v3.0
		* which accompanies this distribution, and is available at
		* http://www.gnu.org/licenses/gpl.html
		*/

		package at.bitfire.davdroid.webdav;

		import org.apache.http.HttpStatus;

		public class ForbiddenException extends HttpException {
		private static final long serialVersionUID = 102282229174086113L;

		public ForbiddenException(String reason) {
		super(HttpStatus.SC_FORBIDDEN, reason);
		}
		}

app/src/main/java/at/bitfire/davdroid/webdav/WebDavResource.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -345,6 +345,8 @@ public class WebDavResource {
		switch (code) {
		case HttpStatus.SC_UNAUTHORIZED:
		throw new NotAuthorizedException(reason);
		case HttpStatus.SC_FORBIDDEN:
		throw new ForbiddenException(reason);
		case HttpStatus.SC_NOT_FOUND:
		throw new NotFoundException(reason);
		case HttpStatus.SC_CONFLICT: