diff --git a/app/build.gradle b/app/build.gradle index a2613c7a..04cd740c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -80,6 +80,7 @@ dependencies { compile 'com.github.yukuku:ambilwarna:2.0.1' compile 'com.squareup.okhttp3:logging-interceptor:3.5.0' + compile 'commons-io:commons-io:2.5' compile 'dnsjava:dnsjava:2.1.7' compile 'org.apache.commons:commons-lang3:3.4' compile 'org.apache.commons:commons-collections4:4.1' 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 7ef9a5f6..6ac1bcec 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java +++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java @@ -25,6 +25,7 @@ import android.text.TextUtils; import org.apache.commons.codec.Charsets; import org.apache.commons.collections4.SetUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import java.io.ByteArrayInputStream; @@ -67,7 +68,6 @@ import at.bitfire.vcard4android.Contact; import at.bitfire.vcard4android.ContactsStorageException; import at.bitfire.vcard4android.GroupMethod; import ezvcard.VCardVersion; -import ezvcard.util.IOUtils; import lombok.Cleanup; import lombok.RequiredArgsConstructor; import okhttp3.HttpUrl; diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java index 242f0cfa..08fa2ae7 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java +++ b/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java @@ -30,6 +30,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.time.DateFormatUtils; import java.io.IOException; @@ -40,7 +41,6 @@ import at.bitfire.davdroid.App; import at.bitfire.davdroid.BuildConfig; import at.bitfire.davdroid.R; import ezvcard.Ezvcard; -import ezvcard.util.IOUtils; import lombok.Cleanup; import lombok.RequiredArgsConstructor; diff --git a/vcard4android b/vcard4android index 20733b17..628ef73f 160000 --- a/vcard4android +++ b/vcard4android @@ -1 +1 @@ -Subproject commit 20733b17bce7ec08f978a58d0204119f844b1a28 +Subproject commit 628ef73fa72bde2d8e4a3326b9683b58bbe11c8b