mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-22 21:15:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1039 from nextcloud/revertDav4jvmVersion

Browse source 
revert dav4jvm to version f2078bc846
This commit is contained in:
Marcel Hibbe 2021-02-24 21:37:07 +01:00 committed by GitHub
commit 887b575729
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -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'

12
app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.java
View file

@ -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;

2
app/src/main/java/com/nextcloud/talk/components/filebrowser/models/DavResponse.java
View file

@ -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

6
app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCEncrypted.java
View file

@ -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;

6
app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPreview.java
View file

@ -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;

6
app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCFavorite.java
View file

@ -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;

6
app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCId.java
View file

@ -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;

6
app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCSize.java
View file

@ -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;

8
app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/DavUtils.java
View file

@ -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;

6
app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java
View file

@ -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;