arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-11-23 00:18:19 +00:00
Code Issues Releases Wiki Activity

Minor bug fixes and improvements

Browse Source 
* Contacts sync: if REPORT addressbook-query doesn't work, don't ignore other exceptions than HTTP 40x errors
* dav4android: Digest auth improvements (e.g. for OS X Calendar Server)
* vcard4android: better support for exotic IMPP handles and names
This commit is contained in:
Ricki Hirner 2015-10-21 02:06:29 +02:00
parent 6f429328ef
commit 81d13576e8
No known key found for this signature in database
GPG Key ID: C4A212CF0B2B4566
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.java
View File

@ -117,10 +117,10 @@ public class CalendarSyncManager extends SyncManager {
// fetch list of remote VEVENTs and build hash table to index file name // fetch list of remote VEVENTs and build hash table to index file name
davCalendar().calendarQuery("VEVENT"); davCalendar().calendarQuery("VEVENT");
remoteResources = new HashMap<>(davCollection.members.size()); remoteResources = new HashMap<>(davCollection.members.size());
for (DavResource vCard : davCollection.members) { for (DavResource iCal : davCollection.members) {
String fileName = vCard.fileName(); String fileName = iCal.fileName();
log.debug("Found remote VEVENT: " + fileName); log.debug("Found remote VEVENT: " + fileName);
remoteResources.put(fileName, vCard); remoteResources.put(fileName, iCal);
} }
} }

6
app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java
View File

@ -118,9 +118,11 @@ public class ContactsSyncManager extends SyncManager {
davAddressBook().addressbookQuery(); davAddressBook().addressbookQuery();
} catch(HttpException e) { } catch(HttpException e) {
if (e.status/100 == 4) { if (e.status/100 == 4) {
log.warn("Server error on REPORT addressbook query, falling back to PROPFIND", e); log.warn("Server error on REPORT addressbook-query, falling back to PROPFIND", e);
davAddressBook().propfind(1, GetETag.NAME); davAddressBook().propfind(1, GetETag.NAME);
} } else
// no defined fallback, pass through exception
throw e;
} }
remoteResources = new HashMap<>(davCollection.members.size()); remoteResources = new HashMap<>(davCollection.members.size());

2
app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java
View File

@ -437,7 +437,7 @@ abstract public class SyncManager {
// add all unseen (= remotely added) remote contacts // add all unseen (= remotely added) remote contacts
if (!remoteResources.isEmpty()) { if (!remoteResources.isEmpty()) {
log.info("New VCards have been found on the server: " + TextUtils.join(", ", remoteResources.keySet())); log.info("New resources have been found on the server: " + TextUtils.join(", ", remoteResources.keySet()));
toDownload.addAll(remoteResources.values()); toDownload.addAll(remoteResources.values());
} }
} }

2
dav4android

@ -1 +1 @@
Subproject commit 8064d17d934345adf4dbec66b73c5c8fdb8046c1 Subproject commit f254b6e0faf10dc74d7849b77281cffcacb7774d

2
vcard4android

@ -1 +1 @@
Subproject commit 1077033b256aade6e6f66931878f908cd13067a5 Subproject commit 0d84afa1680c1ef35db52d63c4eee0b23607dd2b