From 2d56506cbbe424e4d0c9af9f89ec93225ddf7a3f Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Thu, 3 Nov 2022 11:55:29 +0100 Subject: [PATCH] wip Signed-off-by: tobiasKaminsky --- app/build.gradle | 5 +---- .../filebrowser/webdav/ReadFilesystemOperationIT.kt | 2 +- .../components/filebrowser/models/BrowserFile.kt | 2 +- .../filebrowser/webdav/ReadFilesystemOperation.java | 12 ++++++------ .../filebrowser/webdav/ReadFolderListingOperation.kt | 2 +- .../talk/upload/chunked/ChunkedFileUploader.kt | 2 +- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3132da757..eadc7f384 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -184,9 +184,6 @@ dependencies { implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' androidTestImplementation "androidx.work:work-testing:${workVersion}" implementation 'com.google.android.flexbox:flexbox:3.0.0' - implementation ('com.gitlab.bitfireAT:dav4jvm:2.1.3', { - exclude group: 'org.ogce', module: 'xpp3' // Android comes with its own XmlPullParser - }) implementation 'org.conscrypt:conscrypt-android:2.5.2' implementation "androidx.camera:camera-core:${androidxCameraVersion}" @@ -312,7 +309,7 @@ dependencies { implementation 'com.github.nextcloud-deps:android-talk-webrtc:110.5481.0' - implementation("com.github.nextcloud:android-library:$androidLibraryVersion") { + api("com.github.nextcloud:android-library:$androidLibraryVersion") { exclude group: 'org.ogce', module: 'xpp3' // unused in Android and brings wrong Junit version } } diff --git a/app/src/androidTest/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperationIT.kt b/app/src/androidTest/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperationIT.kt index 74e75d7e4..792b45ecb 100644 --- a/app/src/androidTest/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperationIT.kt +++ b/app/src/androidTest/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperationIT.kt @@ -23,7 +23,7 @@ class ReadFilesystemOperationIT { this.username = username token = password } - val sut = ReadFilesystemOperation(client, user, "", 1) + val sut = ReadFilesystemOperation(client, user, "/", 1) val data = sut.readRemotePath().data as List assertEquals(1, data.size) } diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.kt b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.kt index 6feb04e15..48812c9f7 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.kt +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.kt @@ -94,7 +94,7 @@ data class BrowserFile( browserFile.modifiedTimestamp = property.lastModified } is GetContentType -> { - browserFile.mimeType = property.type + browserFile.mimeType = property.type?.toString() } is OCSize -> { browserFile.size = property.ocSize 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 28e39b9e0..107c50ae0 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 @@ -36,11 +36,11 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; import at.bitfire.dav4jvm.DavResource; +import at.bitfire.dav4jvm.MultiResponseCallback; 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; @@ -77,10 +77,11 @@ public class ReadFilesystemOperation { final List remoteFiles = new ArrayList<>(); try { - new DavResource(okHttpClient, HttpUrl.parse(url)).propfind(depth, WebdavUtils.getAllPropertiesList(), - new Function2() { + new DavResource(okHttpClient, HttpUrl.parse(url)).propfind(depth, + WebdavUtils.getAllPropertiesList(), + new MultiResponseCallback() { @Override - public Unit invoke(Response response, Response.HrefRelation hrefRelation) { + public void onResponse(@NonNull Response response, @NonNull Response.HrefRelation hrefRelation) { davResponse.setResponse(response); switch (hrefRelation) { case MEMBER: @@ -92,7 +93,6 @@ public class ReadFilesystemOperation { case OTHER: default: } - return Unit.INSTANCE; } }); } catch (IOException | DavException e) { diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFolderListingOperation.kt b/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFolderListingOperation.kt index 819e4df00..9710ba176 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFolderListingOperation.kt +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFolderListingOperation.kt @@ -151,7 +151,7 @@ class ReadFolderListingOperation(okHttpClient: OkHttpClient, currentUser: User, remoteFileBrowserItem.modifiedTimestamp = property.lastModified } is GetContentType -> { - remoteFileBrowserItem.mimeType = property.type + remoteFileBrowserItem.mimeType = property.type?.toString() } is OCSize -> { remoteFileBrowserItem.size = property.ocSize diff --git a/app/src/main/java/com/nextcloud/talk/upload/chunked/ChunkedFileUploader.kt b/app/src/main/java/com/nextcloud/talk/upload/chunked/ChunkedFileUploader.kt index a2f9be77a..561a3fffe 100644 --- a/app/src/main/java/com/nextcloud/talk/upload/chunked/ChunkedFileUploader.kt +++ b/app/src/main/java/com/nextcloud/talk/upload/chunked/ChunkedFileUploader.kt @@ -368,7 +368,7 @@ class ChunkedFileUploader( remoteFileBrowserItem.modifiedTimestamp = property.lastModified } is GetContentType -> { - remoteFileBrowserItem.mimeType = property.type + remoteFileBrowserItem.mimeType = property.type?.toString() } is OCSize -> { remoteFileBrowserItem.size = property.ocSize