diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.java index c57549951..c52359027 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.java @@ -36,12 +36,12 @@ import org.parceler.Parcel; import java.io.File; import java.util.List; -import at.bitfire.dav4android.Property; -import at.bitfire.dav4android.Response; -import at.bitfire.dav4android.property.DisplayName; -import at.bitfire.dav4android.property.GetContentType; -import at.bitfire.dav4android.property.GetLastModified; -import at.bitfire.dav4android.property.ResourceType; +import at.bitfire.dav4jvm.Property; +import at.bitfire.dav4jvm.Response; +import at.bitfire.dav4jvm.property.DisplayName; +import at.bitfire.dav4jvm.property.GetContentType; +import at.bitfire.dav4jvm.property.GetLastModified; +import at.bitfire.dav4jvm.property.ResourceType; @JsonObject @Parcel diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/DavResponse.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/DavResponse.java index 55d26e608..ff3256cde 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/DavResponse.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/DavResponse.java @@ -20,7 +20,7 @@ package com.nextcloud.talk.components.filebrowser.models; -import at.bitfire.dav4android.Response; +import at.bitfire.dav4jvm.Response; public class DavResponse { public Response response; diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCEncrypted.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCEncrypted.java index 21932245f..457f8b84e 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCEncrypted.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCEncrypted.java @@ -32,9 +32,9 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; -import at.bitfire.dav4android.Property; -import at.bitfire.dav4android.PropertyFactory; -import at.bitfire.dav4android.XmlUtils; +import at.bitfire.dav4jvm.Property; +import at.bitfire.dav4jvm.PropertyFactory; +import at.bitfire.dav4jvm.XmlUtils; public class NCEncrypted implements Property { public static final Name NAME = new Name(DavUtils.NC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_IS_ENCRYPTED); diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPermission.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPermission.java index 92b3e10ea..c40c4b679 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPermission.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPermission.java @@ -34,9 +34,9 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; -import at.bitfire.dav4android.Property; -import at.bitfire.dav4android.PropertyFactory; -import at.bitfire.dav4android.XmlUtils; +import at.bitfire.dav4jvm.Property; +import at.bitfire.dav4jvm.PropertyFactory; +import at.bitfire.dav4jvm.XmlUtils; public class NCPermission implements Property { public static final Name NAME = new Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_NAME_PERMISSIONS); diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPreview.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPreview.java index 0c034ab86..b65bb4121 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPreview.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPreview.java @@ -32,9 +32,9 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; -import at.bitfire.dav4android.Property; -import at.bitfire.dav4android.PropertyFactory; -import at.bitfire.dav4android.XmlUtils; +import at.bitfire.dav4jvm.Property; +import at.bitfire.dav4jvm.PropertyFactory; +import at.bitfire.dav4jvm.XmlUtils; public class NCPreview implements Property { public static final Property.Name NAME = new Property.Name(DavUtils.NC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_HAS_PREVIEW); diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCFavorite.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCFavorite.java index 9ffdb01d0..10dff0e4a 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCFavorite.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCFavorite.java @@ -32,9 +32,9 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; -import at.bitfire.dav4android.Property; -import at.bitfire.dav4android.PropertyFactory; -import at.bitfire.dav4android.XmlUtils; +import at.bitfire.dav4jvm.Property; +import at.bitfire.dav4jvm.PropertyFactory; +import at.bitfire.dav4jvm.XmlUtils; public class OCFavorite implements Property { public static final Property.Name NAME = new Property.Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_FAVORITE); diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCId.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCId.java index a90ac2e04..87f58ce26 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCId.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCId.java @@ -32,9 +32,9 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; -import at.bitfire.dav4android.Property; -import at.bitfire.dav4android.PropertyFactory; -import at.bitfire.dav4android.XmlUtils; +import at.bitfire.dav4jvm.Property; +import at.bitfire.dav4jvm.PropertyFactory; +import at.bitfire.dav4jvm.XmlUtils; public class OCId implements Property { public static final Name NAME = new Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_NAME_REMOTE_ID); diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCSize.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCSize.java index 188fc3c3b..f2a0a2f96 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCSize.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCSize.java @@ -32,9 +32,9 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; -import at.bitfire.dav4android.Property; -import at.bitfire.dav4android.PropertyFactory; -import at.bitfire.dav4android.XmlUtils; +import at.bitfire.dav4jvm.Property; +import at.bitfire.dav4jvm.PropertyFactory; +import at.bitfire.dav4jvm.XmlUtils; public class OCSize implements Property { public static final Property.Name NAME = new Property.Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_NAME_SIZE); diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/DavUtils.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/DavUtils.java index f2193d57d..bb0ffb4f5 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/DavUtils.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/DavUtils.java @@ -20,11 +20,12 @@ package com.nextcloud.talk.components.filebrowser.webdav; -import at.bitfire.dav4android.Property; -import at.bitfire.dav4android.PropertyFactory; -import at.bitfire.dav4android.PropertyRegistry; -import at.bitfire.dav4android.property.*; -import com.nextcloud.talk.components.filebrowser.models.properties.*; +import com.nextcloud.talk.components.filebrowser.models.properties.NCEncrypted; +import com.nextcloud.talk.components.filebrowser.models.properties.NCPermission; +import com.nextcloud.talk.components.filebrowser.models.properties.NCPreview; +import com.nextcloud.talk.components.filebrowser.models.properties.OCFavorite; +import com.nextcloud.talk.components.filebrowser.models.properties.OCId; +import com.nextcloud.talk.components.filebrowser.models.properties.OCSize; import java.lang.reflect.Field; import java.util.ArrayList; @@ -32,6 +33,17 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import at.bitfire.dav4jvm.Property; +import at.bitfire.dav4jvm.PropertyFactory; +import at.bitfire.dav4jvm.PropertyRegistry; +import at.bitfire.dav4jvm.property.CreationDate; +import at.bitfire.dav4jvm.property.DisplayName; +import at.bitfire.dav4jvm.property.GetContentLength; +import at.bitfire.dav4jvm.property.GetContentType; +import at.bitfire.dav4jvm.property.GetETag; +import at.bitfire.dav4jvm.property.GetLastModified; +import at.bitfire.dav4jvm.property.ResourceType; + public class DavUtils { public static final String OC_NAMESPACE = "http://owncloud.org/ns"; public static final String NC_NAMESPACE = "http://nextcloud.org/ns"; diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java index 19ff8f58f..ad8ed5893 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java @@ -20,23 +20,24 @@ package com.nextcloud.talk.components.filebrowser.webdav; -import at.bitfire.dav4android.DavResource; -import at.bitfire.dav4android.Response; -import at.bitfire.dav4android.exception.DavException; import com.nextcloud.talk.components.filebrowser.models.BrowserFile; import com.nextcloud.talk.components.filebrowser.models.DavResponse; import com.nextcloud.talk.dagger.modules.RestModule; import com.nextcloud.talk.models.database.UserEntity; import com.nextcloud.talk.utils.ApiUtils; -import kotlin.Unit; -import kotlin.jvm.functions.Function2; -import okhttp3.HttpUrl; -import okhttp3.OkHttpClient; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import at.bitfire.dav4jvm.DavResource; +import at.bitfire.dav4jvm.Response; +import at.bitfire.dav4jvm.exception.DavException; +import kotlin.Unit; +import kotlin.jvm.functions.Function2; +import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; + public class ReadFilesystemOperation { private final OkHttpClient okHttpClient; private final String url;