diff --git a/app/build.gradle b/app/build.gradle index 297dbfc6..4645c468 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -58,7 +58,7 @@ dependencies { compile 'dnsjava:dnsjava:2.1.7' compile 'org.apache.commons:commons-lang3:3.4' provided 'org.projectlombok:lombok:1.16.6' - compile('org.slf4j:slf4j-android:1.7.13') + compile 'org.slf4j:slf4j-android:1.7.13' compile project(':dav4android') compile project(':ical4android') @@ -66,5 +66,5 @@ dependencies { compile project(':MemorizingTrustManager') - androidTestCompile 'com.squareup.okhttp:mockwebserver:2.6.0' + androidTestCompile 'com.squareup.okhttp:mockwebserver:2.7.1' } diff --git a/app/src/main/java/at/bitfire/davdroid/resource/DavResourceFinder.java b/app/src/main/java/at/bitfire/davdroid/resource/DavResourceFinder.java index fa370150..ec2c668f 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/DavResourceFinder.java +++ b/app/src/main/java/at/bitfire/davdroid/resource/DavResourceFinder.java @@ -110,7 +110,7 @@ public class DavResourceFinder { 1. user-given URL is a calendar 2. user-given URL has a calendar-home-set property (i.e. is a principal URL) */ - log.info("Check whether user-given URL is a calendar collection and/or contains and/or has "); + log.info("Check whether user-given URL is a calendar collection and/or contains home-set and/or has current-user-principal"); DavResource davBase = new DavResource(log, httpClient, userURL); try { if (service == Service.CALDAV) { diff --git a/dav4android b/dav4android index ea03135d..f060f00f 160000 --- a/dav4android +++ b/dav4android @@ -1 +1 @@ -Subproject commit ea03135d7dd194832fdcc8b47bd041b87d918edb +Subproject commit f060f00fe6ccf5e8a79690c8707cf2b1d98a3d17 diff --git a/ical4android b/ical4android index 46d23fb4..652eac6f 160000 --- a/ical4android +++ b/ical4android @@ -1 +1 @@ -Subproject commit 46d23fb4ff276f4efb317069b7c072d5c29ba4d2 +Subproject commit 652eac6f3f9fe5adb94e6142d1bad5761b468feb