gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-10 14:24:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

replace imports due to changed packaging

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-05-06 00:23:23 +02:00
parent 4008f8a9eb
commit 9858860604
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
10 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,12 +36,12 @@ import org.parceler.Parcel;
import java.io.File; import java.io.File;
import java.util.List; import java.util.List;
import at.bitfire.dav4android.Property; import at.bitfire.dav4jvm.Property;
import at.bitfire.dav4android.Response; import at.bitfire.dav4jvm.Response;
import at.bitfire.dav4android.property.DisplayName; import at.bitfire.dav4jvm.property.DisplayName;
import at.bitfire.dav4android.property.GetContentType; import at.bitfire.dav4jvm.property.GetContentType;
import at.bitfire.dav4android.property.GetLastModified; import at.bitfire.dav4jvm.property.GetLastModified;
import at.bitfire.dav4android.property.ResourceType; import at.bitfire.dav4jvm.property.ResourceType;
@JsonObject @JsonObject
@Parcel @Parcel

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; package com.nextcloud.talk.components.filebrowser.models;
import at.bitfire.dav4android.Response; import at.bitfire.dav4jvm.Response;
public class DavResponse { public class DavResponse {
public Response response; public Response response;

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

@ -32,9 +32,9 @@ import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException; import java.io.IOException;
import at.bitfire.dav4android.Property; import at.bitfire.dav4jvm.Property;
import at.bitfire.dav4android.PropertyFactory; import at.bitfire.dav4jvm.PropertyFactory;
import at.bitfire.dav4android.XmlUtils; import at.bitfire.dav4jvm.XmlUtils;
public class NCEncrypted implements Property { public class NCEncrypted implements Property {
public static final Name NAME = new Name(DavUtils.NC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_IS_ENCRYPTED); public static final Name NAME = new Name(DavUtils.NC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_IS_ENCRYPTED);

6
app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPermission.java
View File

@ -34,9 +34,9 @@ import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException; import java.io.IOException;
import at.bitfire.dav4android.Property; import at.bitfire.dav4jvm.Property;
import at.bitfire.dav4android.PropertyFactory; import at.bitfire.dav4jvm.PropertyFactory;
import at.bitfire.dav4android.XmlUtils; import at.bitfire.dav4jvm.XmlUtils;
public class NCPermission implements Property { public class NCPermission implements Property {
public static final Name NAME = new Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_NAME_PERMISSIONS); public static final Name NAME = new Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_NAME_PERMISSIONS);

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

@ -32,9 +32,9 @@ import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException; import java.io.IOException;
import at.bitfire.dav4android.Property; import at.bitfire.dav4jvm.Property;
import at.bitfire.dav4android.PropertyFactory; import at.bitfire.dav4jvm.PropertyFactory;
import at.bitfire.dav4android.XmlUtils; import at.bitfire.dav4jvm.XmlUtils;
public class NCPreview implements Property { public class NCPreview implements Property {
public static final Property.Name NAME = new Property.Name(DavUtils.NC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_HAS_PREVIEW); public static final Property.Name NAME = new Property.Name(DavUtils.NC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_HAS_PREVIEW);

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

@ -32,9 +32,9 @@ import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException; import java.io.IOException;
import at.bitfire.dav4android.Property; import at.bitfire.dav4jvm.Property;
import at.bitfire.dav4android.PropertyFactory; import at.bitfire.dav4jvm.PropertyFactory;
import at.bitfire.dav4android.XmlUtils; import at.bitfire.dav4jvm.XmlUtils;
public class OCFavorite implements Property { public class OCFavorite implements Property {
public static final Property.Name NAME = new Property.Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_FAVORITE); public static final Property.Name NAME = new Property.Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_FAVORITE);

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

@ -32,9 +32,9 @@ import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException; import java.io.IOException;
import at.bitfire.dav4android.Property; import at.bitfire.dav4jvm.Property;
import at.bitfire.dav4android.PropertyFactory; import at.bitfire.dav4jvm.PropertyFactory;
import at.bitfire.dav4android.XmlUtils; import at.bitfire.dav4jvm.XmlUtils;
public class OCId implements Property { public class OCId implements Property {
public static final Name NAME = new Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_NAME_REMOTE_ID); public static final Name NAME = new Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_NAME_REMOTE_ID);

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

@ -32,9 +32,9 @@ import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException; import java.io.IOException;
import at.bitfire.dav4android.Property; import at.bitfire.dav4jvm.Property;
import at.bitfire.dav4android.PropertyFactory; import at.bitfire.dav4jvm.PropertyFactory;
import at.bitfire.dav4android.XmlUtils; import at.bitfire.dav4jvm.XmlUtils;
public class OCSize implements Property { public class OCSize implements Property {
public static final Property.Name NAME = new Property.Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_NAME_SIZE); public static final Property.Name NAME = new Property.Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_NAME_SIZE);

22
app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/DavUtils.java
View File

@ -20,11 +20,12 @@
package com.nextcloud.talk.components.filebrowser.webdav; package com.nextcloud.talk.components.filebrowser.webdav;
import at.bitfire.dav4android.Property; import com.nextcloud.talk.components.filebrowser.models.properties.NCEncrypted;
import at.bitfire.dav4android.PropertyFactory; import com.nextcloud.talk.components.filebrowser.models.properties.NCPermission;
import at.bitfire.dav4android.PropertyRegistry; import com.nextcloud.talk.components.filebrowser.models.properties.NCPreview;
import at.bitfire.dav4android.property.*; import com.nextcloud.talk.components.filebrowser.models.properties.OCFavorite;
import com.nextcloud.talk.components.filebrowser.models.properties.*; 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.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
@ -32,6 +33,17 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; 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 class DavUtils {
public static final String OC_NAMESPACE = "http://owncloud.org/ns"; public static final String OC_NAMESPACE = "http://owncloud.org/ns";
public static final String NC_NAMESPACE = "http://nextcloud.org/ns"; public static final String NC_NAMESPACE = "http://nextcloud.org/ns";

15
app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java
View File

@ -20,23 +20,24 @@
package com.nextcloud.talk.components.filebrowser.webdav; 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.BrowserFile;
import com.nextcloud.talk.components.filebrowser.models.DavResponse; import com.nextcloud.talk.components.filebrowser.models.DavResponse;
import com.nextcloud.talk.dagger.modules.RestModule; import com.nextcloud.talk.dagger.modules.RestModule;
import com.nextcloud.talk.models.database.UserEntity; import com.nextcloud.talk.models.database.UserEntity;
import com.nextcloud.talk.utils.ApiUtils; 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.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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 { public class ReadFilesystemOperation {
private final OkHttpClient okHttpClient; private final OkHttpClient okHttpClient;
private final String url; private final String url;