arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-21 03:52:06 +00:00
Code Issues Releases Wiki Activity

don't decode URI pathes (fixes #58), don't expect GET/POST/PUT on collections

Browse Source
This commit is contained in:
rfc2822 2013-11-12 18:38:14 +01:00
parent 5aa77e51a2
commit f8f10be3ba
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/at/bitfire/davdroid/syncadapter/QueryServerDialogFragment.java
View File

@ -115,8 +115,7 @@ public class QueryServerDialogFragment extends DialogFragment implements LoaderC
serverInfo.setCardDAV(base.supportsDAV("addressbook")); serverInfo.setCardDAV(base.supportsDAV("addressbook"));
serverInfo.setCalDAV(base.supportsDAV("calendar-access")); serverInfo.setCalDAV(base.supportsDAV("calendar-access"));
if (!base.supportsMethod("PROPFIND") || !base.supportsMethod("GET") || if (!base.supportsMethod("PROPFIND") || !base.supportsMethod("REPORT") ||
!base.supportsMethod("PUT") || !base.supportsMethod("DELETE") ||
(!serverInfo.isCalDAV() && !serverInfo.isCardDAV())) (!serverInfo.isCalDAV() && !serverInfo.isCardDAV()))
throw new IncapableResourceException(getContext().getString(R.string.neither_caldav_nor_carddav)); throw new IncapableResourceException(getContext().getString(R.string.neither_caldav_nor_carddav));
@ -160,10 +159,10 @@ public class QueryServerDialogFragment extends DialogFragment implements LoaderC
if (homeSetAddressBooks.getMembers() != null) if (homeSetAddressBooks.getMembers() != null)
for (WebDavResource resource : homeSetAddressBooks.getMembers()) for (WebDavResource resource : homeSetAddressBooks.getMembers())
if (resource.isAddressBook()) { if (resource.isAddressBook()) {
Log.i(TAG, "Found address book: " + resource.getLocation().getPath()); Log.i(TAG, "Found address book: " + resource.getLocation().getRawPath());
ServerInfo.ResourceInfo info = new ServerInfo.ResourceInfo( ServerInfo.ResourceInfo info = new ServerInfo.ResourceInfo(
ServerInfo.ResourceInfo.Type.ADDRESS_BOOK, ServerInfo.ResourceInfo.Type.ADDRESS_BOOK,
resource.getLocation().getPath(), resource.getLocation().getRawPath(),
resource.getDisplayName(), resource.getDisplayName(),
resource.getDescription(), resource.getColor() resource.getDescription(), resource.getColor()
); );
@ -182,10 +181,10 @@ public class QueryServerDialogFragment extends DialogFragment implements LoaderC
if (homeSetCalendars.getMembers() != null) if (homeSetCalendars.getMembers() != null)
for (WebDavResource resource : homeSetCalendars.getMembers()) for (WebDavResource resource : homeSetCalendars.getMembers())
if (resource.isCalendar()) { if (resource.isCalendar()) {
Log.i(TAG, "Found calendar: " + resource.getLocation().getPath()); Log.i(TAG, "Found calendar: " + resource.getLocation().getRawPath());
ServerInfo.ResourceInfo info = new ServerInfo.ResourceInfo( ServerInfo.ResourceInfo info = new ServerInfo.ResourceInfo(
ServerInfo.ResourceInfo.Type.CALENDAR, ServerInfo.ResourceInfo.Type.CALENDAR,
resource.getLocation().getPath(), resource.getLocation().getRawPath(),
resource.getDisplayName(), resource.getDisplayName(),
resource.getDescription(), resource.getColor() resource.getDescription(), resource.getColor()
); );