wip

Signed-off-by: tobiasKaminsky <[email protected]>
nextcloud · Dec 29, 2022 · 53401af · 53401af
1 parent 2deb17b
commit 53401af
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 14 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -189,9 +189,6 @@ dependencies {
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     androidTestImplementation "androidx.work:work-testing:${workVersion}"
     implementation 'com.google.android:flexbox:2.0.1'
-    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.android-common:ui:0.3.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/...idTest/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperationIT.kt b/...idTest/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<BrowserFile>
         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
@@ -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/...c/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java b/...c/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java
@@ -36,11 +36,11 @@
 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;
 
@@ -75,10 +75,11 @@ public DavResponse readRemotePath() {
         final Response[] rootElement = new Response[1];
 
         try {
-            new DavResource(okHttpClient, HttpUrl.parse(url)).propfind(depth, WebdavUtils.getAllPropertiesList(),
-                                                                       new Function2<Response, Response.HrefRelation, Unit>() {
+            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:
@@ -90,7 +91,6 @@ public Unit invoke(Response response, Response.HrefRelation hrefRelation) {
                                                                                    case OTHER:
                                                                                    default:
                                                                                }
-                                                                               return Unit.INSTANCE;
                                                                            }
                                                                        });
         } catch (IOException | DavException e) {

diff --git a/.../main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFolderListingOperation.kt b/.../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
@@ -367,7 +367,7 @@ class ChunkedFileUploader(
                 remoteFileBrowserItem.modifiedTimestamp = property.lastModified
             }
             is GetContentType -> {
-                remoteFileBrowserItem.mimeType = property.type
+                remoteFileBrowserItem.mimeType = property.type?.toString()
             }
             is OCSize -> {
                 remoteFileBrowserItem.size = property.ocSize