wip

Signed-off-by: tobiasKaminsky <[email protected]>

Author: tobiasKaminsky

app/build.gradle

@@ -311,6 +311,10 @@ dependencies {
     // implementation 'androidx.activity:activity-ktx:1.4.0'
 
     implementation 'com.github.nextcloud.android-common:ui:0.3.0'
+
+    implementation("com.github.nextcloud:android-library:$androidLibraryVersion") {
+        exclude group: 'org.ogce', module: 'xpp3' // unused in Android and brings wrong Junit version
+    }
 }
 
 task installGitHooks(type: Copy, group: "development") {

app/src/androidTest/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperationIT.kt

@@ -0,0 +1,30 @@
+package com.nextcloud.talk.components.filebrowser.webdav
+
+import android.net.Uri
+import androidx.test.platform.app.InstrumentationRegistry
+import com.nextcloud.talk.components.filebrowser.models.BrowserFile
+import com.nextcloud.talk.data.user.model.User
+import junit.framework.Assert.assertEquals
+import okhttp3.OkHttpClient
+import org.junit.Test
+
+class ReadFilesystemOperationIT {
+    @Test
+    fun showContent() {
+        val arguments = InstrumentationRegistry.getArguments()
+        val url = Uri.parse(arguments.getString("TEST_SERVER_URL"))
+        val username = arguments.getString("TEST_SERVER_USERNAME")
+        val password = arguments.getString("TEST_SERVER_PASSWORD")
+
+        val client = OkHttpClient()
+        val user = User().apply {
+            baseUrl = url.toString()
+            userId = username
+            this.username = username
+            token = password
+        }
+        val sut = ReadFilesystemOperation(client, user, "", 1)
+        val data = sut.readRemotePath().data as List<BrowserFile>
+        assertEquals(1, data.size)
+    }
+}

app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt

@@ -50,7 +50,6 @@ import coil.decode.SvgDecoder
 import coil.memory.MemoryCache
 import coil.util.DebugLogger
 import com.nextcloud.talk.BuildConfig
-import com.nextcloud.talk.components.filebrowser.webdav.DavUtils
 import com.nextcloud.talk.dagger.modules.BusModule
 import com.nextcloud.talk.dagger.modules.ContextModule
 import com.nextcloud.talk.dagger.modules.DatabaseModule
@@ -69,6 +68,7 @@ import com.nextcloud.talk.utils.database.arbitrarystorage.ArbitraryStorageModule
 import com.nextcloud.talk.utils.database.user.UserModule
 import com.nextcloud.talk.utils.preferences.AppPreferences
 import com.nextcloud.talk.webrtc.MagicWebRTCUtils
+import com.owncloud.android.lib.common.network.WebdavUtils
 import com.vanniktech.emoji.EmojiManager
 import com.vanniktech.emoji.google.GoogleEmojiProvider
 import de.cotech.hw.SecurityKeyManager
@@ -163,7 +163,7 @@ class NextcloudTalkApplication : MultiDexApplication(), LifecycleObserver {
 
         initializeWebRtc()
         buildComponent()
-        DavUtils.registerCustomFactories()
+        WebdavUtils.registerCustomFactories()
 
         componentApplication.inject(this)
 

app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.kt

@@ -30,13 +30,13 @@ import at.bitfire.dav4jvm.property.GetLastModified
 import at.bitfire.dav4jvm.property.ResourceType
 import at.bitfire.dav4jvm.property.ResourceType.Companion.COLLECTION
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import com.nextcloud.talk.components.filebrowser.models.properties.NCEncrypted
-import com.nextcloud.talk.components.filebrowser.models.properties.NCPermission
-import com.nextcloud.talk.components.filebrowser.models.properties.NCPreview
-import com.nextcloud.talk.components.filebrowser.models.properties.OCFavorite
 import com.nextcloud.talk.components.filebrowser.models.properties.OCId
 import com.nextcloud.talk.components.filebrowser.models.properties.OCSize
 import com.nextcloud.talk.utils.Mimetype.FOLDER
+import com.owncloud.android.lib.resources.files.webdav.NCEncrypted
+import com.owncloud.android.lib.resources.files.webdav.NCFavorite
+import com.owncloud.android.lib.resources.files.webdav.NCPermissions
+import com.owncloud.android.lib.resources.files.webdav.NCPreview
 import kotlinx.android.parcel.Parcelize
 import java.io.File
 
@@ -101,7 +101,7 @@ data class BrowserFile(
                 is NCPreview -> {
                     browserFile.hasPreview = property.isNcPreview
                 }
-                is OCFavorite -> {
+                is NCFavorite -> {
                     browserFile.isFavorite = property.isOcFavorite
                 }
                 is DisplayName -> {
@@ -110,8 +110,8 @@ data class BrowserFile(
                 is NCEncrypted -> {
                     browserFile.isEncrypted = property.isNcEncrypted
                 }
-                is NCPermission -> {
-                    browserFile.permissions = property.ncPermission
+                is NCPermissions -> {
+                    browserFile.permissions = property.permissions
                 }
             }
         }