diff --git a/app/src/main/java/at/bitfire/davdroid/SSLSocketFactoryCompat.java b/app/src/main/java/at/bitfire/davdroid/SSLSocketFactoryCompat.java index be5d84a6..5c96e277 100644 --- a/app/src/main/java/at/bitfire/davdroid/SSLSocketFactoryCompat.java +++ b/app/src/main/java/at/bitfire/davdroid/SSLSocketFactoryCompat.java @@ -75,8 +75,8 @@ public class SSLSocketFactoryCompat extends SSLSocketFactory { "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA", "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"); List availableCiphers = Arrays.asList(socket.getSupportedCipherSuites()); - App.log.fine("Available cipher suites: " + TextUtils.join(", ", availableCiphers)); - App.log.fine("Cipher suites enabled by default: " + TextUtils.join(", ", socket.getEnabledCipherSuites())); + App.log.info("Available cipher suites: " + TextUtils.join(", ", availableCiphers)); + App.log.info("Cipher suites enabled by default: " + TextUtils.join(", ", socket.getEnabledCipherSuites())); // take all allowed ciphers that are available and put them into preferredCiphers HashSet preferredCiphers = new HashSet<>(allowedCiphers); diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.java index dde2904c..488ac52e 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.java +++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.java @@ -96,6 +96,7 @@ public class CalendarSyncManager extends SyncManager { @Override protected RequestBody prepareUpload(LocalResource resource) throws IOException, CalendarStorageException { LocalEvent local = (LocalEvent)resource; + App.log.log(Level.FINE, "Preparing upload of event " + local.getFileName(), new Object[] { local.getEvent() }); return RequestBody.create( DavCalendar.MIME_ICALENDAR, local.getEvent().toStream().toByteArray() diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java index 57041a81..06f2474c 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java +++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java @@ -130,6 +130,7 @@ public class ContactsSyncManager extends SyncManager { @Override protected RequestBody prepareUpload(LocalResource resource) throws IOException, ContactsStorageException { LocalContact local = (LocalContact)resource; + App.log.log(Level.FINE, "Preparing upload of contact " + local.getFileName(), new Object[] { local.getContact() }); return RequestBody.create( hasVCard4 ? DavAddressBook.MIME_VCARD4 : DavAddressBook.MIME_VCARD3_UTF8, local.getContact().toStream(hasVCard4 ? VCardVersion.V4_0 : VCardVersion.V3_0).toByteArray() diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.java index 759abdd0..518d365a 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.java +++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.java @@ -90,6 +90,7 @@ public class TasksSyncManager extends SyncManager { @Override protected RequestBody prepareUpload(LocalResource resource) throws IOException, CalendarStorageException { LocalTask local = (LocalTask)resource; + App.log.log(Level.FINE, "Preparing upload of task " + local.getFileName(), new Object[] { local.getTask() }); return RequestBody.create( DavCalendar.MIME_ICALENDAR, local.getTask().toStream().toByteArray() diff --git a/ical4android b/ical4android index 7577fcaa..34a0a838 160000 --- a/ical4android +++ b/ical4android @@ -1 +1 @@ -Subproject commit 7577fcaa02d83ea5fbeeefa35511b45f3285ce95 +Subproject commit 34a0a838ed2116b8ee2b022749d710a4f3e6a04c diff --git a/vcard4android b/vcard4android index fda39538..1f72dbbe 160000 --- a/vcard4android +++ b/vcard4android @@ -1 +1 @@ -Subproject commit fda39538a3407f2a6f6a208f06a4ef1dbc1bed40 +Subproject commit 1f72dbbea94fb5a6e0a55530266f8b5331793022