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

Logs: show which contact/event/task is being prepared for upload

Browse Source
This commit is contained in:
Ricki Hirner 2016-05-23 14:28:27 +02:00
parent 9886507b7d
commit fd1f59d124
6 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/at/bitfire/davdroid/SSLSocketFactoryCompat.java
View File

@ -75,8 +75,8 @@ public class SSLSocketFactoryCompat extends SSLSocketFactory {
"TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA", "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"); "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA");
List<String> availableCiphers = Arrays.asList(socket.getSupportedCipherSuites()); List<String> availableCiphers = Arrays.asList(socket.getSupportedCipherSuites());
App.log.fine("Available cipher suites: " + TextUtils.join(", ", availableCiphers)); App.log.info("Available cipher suites: " + TextUtils.join(", ", availableCiphers));
App.log.fine("Cipher suites enabled by default: " + TextUtils.join(", ", socket.getEnabledCipherSuites())); App.log.info("Cipher suites enabled by default: " + TextUtils.join(", ", socket.getEnabledCipherSuites()));
// take all allowed ciphers that are available and put them into preferredCiphers // take all allowed ciphers that are available and put them into preferredCiphers
HashSet<String> preferredCiphers = new HashSet<>(allowedCiphers); HashSet<String> preferredCiphers = new HashSet<>(allowedCiphers);

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

@ -96,6 +96,7 @@ public class CalendarSyncManager extends SyncManager {
@Override @Override
protected RequestBody prepareUpload(LocalResource resource) throws IOException, CalendarStorageException { protected RequestBody prepareUpload(LocalResource resource) throws IOException, CalendarStorageException {
LocalEvent local = (LocalEvent)resource; LocalEvent local = (LocalEvent)resource;
App.log.log(Level.FINE, "Preparing upload of event " + local.getFileName(), new Object[] { local.getEvent() });
return RequestBody.create( return RequestBody.create(
DavCalendar.MIME_ICALENDAR, DavCalendar.MIME_ICALENDAR,
local.getEvent().toStream().toByteArray() local.getEvent().toStream().toByteArray()

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

@ -130,6 +130,7 @@ public class ContactsSyncManager extends SyncManager {
@Override @Override
protected RequestBody prepareUpload(LocalResource resource) throws IOException, ContactsStorageException { protected RequestBody prepareUpload(LocalResource resource) throws IOException, ContactsStorageException {
LocalContact local = (LocalContact)resource; LocalContact local = (LocalContact)resource;
App.log.log(Level.FINE, "Preparing upload of contact " + local.getFileName(), new Object[] { local.getContact() });
return RequestBody.create( return RequestBody.create(
hasVCard4 ? DavAddressBook.MIME_VCARD4 : DavAddressBook.MIME_VCARD3_UTF8, hasVCard4 ? DavAddressBook.MIME_VCARD4 : DavAddressBook.MIME_VCARD3_UTF8,
local.getContact().toStream(hasVCard4 ? VCardVersion.V4_0 : VCardVersion.V3_0).toByteArray() local.getContact().toStream(hasVCard4 ? VCardVersion.V4_0 : VCardVersion.V3_0).toByteArray()

1
app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.java
View File

@ -90,6 +90,7 @@ public class TasksSyncManager extends SyncManager {
@Override @Override
protected RequestBody prepareUpload(LocalResource resource) throws IOException, CalendarStorageException { protected RequestBody prepareUpload(LocalResource resource) throws IOException, CalendarStorageException {
LocalTask local = (LocalTask)resource; LocalTask local = (LocalTask)resource;
App.log.log(Level.FINE, "Preparing upload of task " + local.getFileName(), new Object[] { local.getTask() });
return RequestBody.create( return RequestBody.create(
DavCalendar.MIME_ICALENDAR, DavCalendar.MIME_ICALENDAR,
local.getTask().toStream().toByteArray() local.getTask().toStream().toByteArray()

2
ical4android

@ -1 +1 @@
Subproject commit 7577fcaa02d83ea5fbeeefa35511b45f3285ce95 Subproject commit 34a0a838ed2116b8ee2b022749d710a4f3e6a04c

2
vcard4android

@ -1 +1 @@
Subproject commit fda39538a3407f2a6f6a208f06a4ef1dbc1bed40 Subproject commit 1f72dbbea94fb5a6e0a55530266f8b5331793022