Sfoglia il codice sorgente

Merge pull request #1039 from nextcloud/revertDav4jvmVersion

revert dav4jvm to version f2078bc846
Marcel Hibbe 4 anni fa
parent
commit
887b575729

+ 1 - 1
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.5.1'

+ 6 - 6
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;

+ 1 - 1
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

+ 3 - 3
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;

+ 3 - 3
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;

+ 3 - 3
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;

+ 3 - 3
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;

+ 3 - 3
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;

+ 4 - 4
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;

+ 3 - 3
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;