From 33a505ff714f897a51f577e92eb9996d275705c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 15:49:53 +0000 Subject: [PATCH 1/2] Bump dav4jvm from f2078bc846 to 2.1.2 Bumps dav4jvm from f2078bc846 to 2.1.2. Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 95cfaea95..95d1c6bbf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -152,7 +152,7 @@ dependencies { implementation "android.arch.work:work-rxjava2:${workVersion}" implementation 'com.google.android:flexbox:1.1.0' androidTestImplementation "android.arch.work:work-testing:${workVersion}" - implementation ('com.gitlab.bitfireAT:dav4jvm:f2078bc846', { + implementation ('com.gitlab.bitfireAT:dav4jvm:2.1.2', { exclude group: 'org.ogce', module: 'xpp3' // Android comes with its own XmlPullParser }) implementation 'org.conscrypt:conscrypt-android:2.2.1' From 510e555eb58b11fb87f3e6fc528512fe9de1a2c0 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Wed, 24 Feb 2021 17:07:25 +0100 Subject: [PATCH 2/2] update imports for dav4jvm Signed-off-by: Marcel Hibbe --- .../components/filebrowser/models/BrowserFile.java | 12 ++++++------ .../components/filebrowser/models/DavResponse.java | 2 +- .../filebrowser/models/properties/NCEncrypted.java | 6 +++--- .../filebrowser/models/properties/NCPreview.java | 6 +++--- .../filebrowser/models/properties/OCFavorite.java | 6 +++--- .../filebrowser/models/properties/OCId.java | 6 +++--- .../filebrowser/models/properties/OCSize.java | 7 ++++--- .../talk/components/filebrowser/webdav/DavUtils.java | 8 ++++---- .../filebrowser/webdav/ReadFilesystemOperation.java | 6 +++--- 9 files changed, 30 insertions(+), 29 deletions(-) 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 5fd0e11c8..ba3198c1e 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 @@ -22,12 +22,12 @@ package com.nextcloud.talk.components.filebrowser.models; import android.net.Uri; import android.text.TextUtils; -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; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.components.filebrowser.models.properties.*; import lombok.Data; 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 bc2c1ef0e..94d10e770 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; import lombok.Data; @Data 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 ee69353fd..7886ee05d 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 @@ -21,9 +21,9 @@ package com.nextcloud.talk.components.filebrowser.models.properties; import android.text.TextUtils; -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; import com.nextcloud.talk.components.filebrowser.webdav.DavUtils; import lombok.Getter; import lombok.Setter; 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 2d387d4b7..b9a2c38a4 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 @@ -21,9 +21,9 @@ package com.nextcloud.talk.components.filebrowser.models.properties; import android.text.TextUtils; -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; import com.nextcloud.talk.components.filebrowser.webdav.DavUtils; import lombok.Getter; import lombok.Setter; 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 d1d34fa28..822eec8e4 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 @@ -21,9 +21,9 @@ package com.nextcloud.talk.components.filebrowser.models.properties; import android.text.TextUtils; -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; import com.nextcloud.talk.components.filebrowser.webdav.DavUtils; import lombok.Getter; import lombok.Setter; 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 ca5b69b37..1d17790da 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 @@ -21,9 +21,9 @@ package com.nextcloud.talk.components.filebrowser.models.properties; import android.text.TextUtils; -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; import com.nextcloud.talk.components.filebrowser.webdav.DavUtils; import lombok.Getter; import lombok.Setter; 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 26b5e4dd4..fea1881e3 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 @@ -21,10 +21,11 @@ package com.nextcloud.talk.components.filebrowser.models.properties; import android.text.TextUtils; -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; import com.nextcloud.talk.components.filebrowser.webdav.DavUtils; + import lombok.Getter; import lombok.Setter; import org.jetbrains.annotations.NotNull; 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 579f726be..e0a89a5a7 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,10 +20,10 @@ 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 at.bitfire.dav4jvm.Property; +import at.bitfire.dav4jvm.PropertyFactory; +import at.bitfire.dav4jvm.PropertyRegistry; +import at.bitfire.dav4jvm.property.*; import com.nextcloud.talk.components.filebrowser.models.properties.*; import java.lang.reflect.Field; 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..10ab394d0 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,9 +20,9 @@ package com.nextcloud.talk.components.filebrowser.webdav; -import at.bitfire.dav4android.DavResource; -import at.bitfire.dav4android.Response; -import at.bitfire.dav4android.exception.DavException; +import at.bitfire.dav4jvm.DavResource; +import at.bitfire.dav4jvm.Response; +import at.bitfire.dav4jvm.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;