From e4547021504bd517d8a882ffde274c5d1168af9f Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Wed, 24 Feb 2021 21:28:30 +0100 Subject: [PATCH] revert dav4jvm to version f2078bc846 "Share from nextcloud" crashed. version update should be done when okhttp is bumped? https://stackoverflow.com/questions/39545629/noclassdeffounderror-failed-resolution-of-lokhttp3-internal-platform Signed-off-by: Marcel Hibbe --- app/build.gradle | 2 +- .../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 | 6 +++--- .../talk/components/filebrowser/webdav/DavUtils.java | 8 ++++---- .../filebrowser/webdav/ReadFilesystemOperation.java | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a947d806e..eb578f60d 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:2.1.2', { + implementation ('com.gitlab.bitfireAT:dav4jvm:f2078bc846', { exclude group: 'org.ogce', module: 'xpp3' // Android comes with its own XmlPullParser }) implementation 'org.conscrypt:conscrypt-android:2.2.1' 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 ba3198c1e..5fd0e11c8 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.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 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 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 94d10e770..bc2c1ef0e 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.dav4jvm.Response; +import at.bitfire.dav4android.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 7886ee05d..ee69353fd 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.dav4jvm.Property; -import at.bitfire.dav4jvm.PropertyFactory; -import at.bitfire.dav4jvm.XmlUtils; +import at.bitfire.dav4android.Property; +import at.bitfire.dav4android.PropertyFactory; +import at.bitfire.dav4android.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 b9a2c38a4..2d387d4b7 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.dav4jvm.Property; -import at.bitfire.dav4jvm.PropertyFactory; -import at.bitfire.dav4jvm.XmlUtils; +import at.bitfire.dav4android.Property; +import at.bitfire.dav4android.PropertyFactory; +import at.bitfire.dav4android.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 822eec8e4..d1d34fa28 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.dav4jvm.Property; -import at.bitfire.dav4jvm.PropertyFactory; -import at.bitfire.dav4jvm.XmlUtils; +import at.bitfire.dav4android.Property; +import at.bitfire.dav4android.PropertyFactory; +import at.bitfire.dav4android.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 1d17790da..ca5b69b37 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.dav4jvm.Property; -import at.bitfire.dav4jvm.PropertyFactory; -import at.bitfire.dav4jvm.XmlUtils; +import at.bitfire.dav4android.Property; +import at.bitfire.dav4android.PropertyFactory; +import at.bitfire.dav4android.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 fea1881e3..6966131d1 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,9 +21,9 @@ package com.nextcloud.talk.components.filebrowser.models.properties; import android.text.TextUtils; -import at.bitfire.dav4jvm.Property; -import at.bitfire.dav4jvm.PropertyFactory; -import at.bitfire.dav4jvm.XmlUtils; +import at.bitfire.dav4android.Property; +import at.bitfire.dav4android.PropertyFactory; +import at.bitfire.dav4android.XmlUtils; import com.nextcloud.talk.components.filebrowser.webdav.DavUtils; import lombok.Getter; 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 e0a89a5a7..579f726be 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.dav4jvm.Property; -import at.bitfire.dav4jvm.PropertyFactory; -import at.bitfire.dav4jvm.PropertyRegistry; -import at.bitfire.dav4jvm.property.*; +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 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 10ab394d0..19ff8f58f 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.dav4jvm.DavResource; -import at.bitfire.dav4jvm.Response; -import at.bitfire.dav4jvm.exception.DavException; +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;