From 2374f296bac5355775013e99199cb8469a92828b Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 1 Sep 2023 09:44:42 +0200
Subject: [PATCH] wip

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .idea/codeStyles/Project.xml                  |  4 +-
 .../java/com/owncloud/android/Dav4JVM.kt      | 73 ++++++++-----------
 .../lib/common/network/WebdavUtils.java       |  5 +-
 .../lib/common/utils/WebDavFileUtils.java     |  6 +-
 .../lib/resources/files/model/RemoteFile.java | 30 +++++++-
 .../lib/resources/files/webdav/NCFavorite.kt  |  4 +-
 .../files/webdav/NCGetLastModified.kt         | 55 ++++++++++++++
 7 files changed, 121 insertions(+), 56 deletions(-)
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/files/webdav/NCGetLastModified.kt

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index c7699d0bae..f9fc0166c8 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -6,8 +6,6 @@
           <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
         </value>
       </option>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <MarkdownNavigatorCodeStyleSettings>
@@ -31,4 +29,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
+</component>
\ No newline at end of file
diff --git a/library/src/androidTest/java/com/owncloud/android/Dav4JVM.kt b/library/src/androidTest/java/com/owncloud/android/Dav4JVM.kt
index 09063146c4..fc7cce27f7 100644
--- a/library/src/androidTest/java/com/owncloud/android/Dav4JVM.kt
+++ b/library/src/androidTest/java/com/owncloud/android/Dav4JVM.kt
@@ -29,7 +29,6 @@ package com.owncloud.android
 
 import at.bitfire.dav4jvm.DavResource
 import at.bitfire.dav4jvm.Response
-import at.bitfire.dav4jvm.property.CreationDate
 import com.nextcloud.common.NextcloudAuthenticator
 import com.owncloud.android.lib.common.network.WebdavUtils
 import com.owncloud.android.lib.common.utils.WebDavFileUtils
@@ -39,7 +38,6 @@ import com.owncloud.android.lib.resources.files.SearchRemoteOperation
 import com.owncloud.android.lib.resources.files.ToggleFavoriteRemoteOperation
 import com.owncloud.android.lib.resources.files.UploadFileRemoteOperation
 import com.owncloud.android.lib.resources.files.model.RemoteFile
-import com.owncloud.android.lib.resources.files.webdav.NCFavorite
 import com.owncloud.android.lib.resources.shares.CreateShareRemoteOperation
 import com.owncloud.android.lib.resources.shares.OCShare
 import com.owncloud.android.lib.resources.shares.ShareType
@@ -59,6 +57,7 @@ class Dav4JVM : AbstractIT() {
     @Throws(IOException::class)
     fun singlePropfind() {
         val path = "/testFolder/"
+        val subFolder = "$path subfolder/"
 
         // create folder
         CreateFolderRemoteOperation(
@@ -86,9 +85,24 @@ class Dav4JVM : AbstractIT() {
                 .isSuccess
         )
 
+        // add one child
+        // create folder
+        CreateFolderRemoteOperation(
+            subFolder,
+            true
+        ).execute(client).isSuccess
+
+        // verify folder
+        assertTrue(ReadFolderRemoteOperation(subFolder).execute(client).isSuccess)
+
         // do old read folder operation to compare data against it
         val result = ReadFolderRemoteOperation(path).execute(client).data as List<RemoteFile>
+        assertEquals(2, result.size)
         val oldRemoteFile = result[0]
+        val oldSubFolderFile = result[1]
+
+        assertEquals(path, oldRemoteFile.remotePath)
+        assertEquals(subFolder, oldSubFolderFile.remotePath)
 
         // new
         val httpUrl = (nextcloudClient.filesDavUri.toString() + path).toHttpUrl()
@@ -109,6 +123,8 @@ class Dav4JVM : AbstractIT() {
         WebdavUtils.registerCustomFactories()
 
         // TODO use DavResource().propfind in ReadFileRemoteOperation/ReadFolderRemoteOperation
+        // TODO extract in own class for convenient use
+        // TODO test all properties on server!
         DavResource(client, httpUrl)
             .propfind(
                 DavConstants.DEPTH_1,
@@ -125,49 +141,11 @@ class Dav4JVM : AbstractIT() {
 
         assertTrue(davResponse?.isSuccess() == true)
         assertTrue(rootElement != null)
-        assertEquals(0, memberElements.size)
+        assertEquals(1, memberElements.size)
 
         val remoteFile = WebDavFileUtils().parseResponse(rootElement, nextcloudClient.filesDavUri)
 
-        val date = davResponse?.get(CreationDate::class.java)
-        assertEquals(
-            oldRemoteFile.creationTimestamp,
-            (WebdavUtils.parseResponseDate(date?.creationDate)?.time ?: 0) / 1000
-        )
-
-        assertTrue(oldRemoteFile.isFavorite)
-        val favorite = davResponse?.get(NCFavorite::class.java)
-        assertTrue(favorite?.isOcFavorite == true)
-
-        assertEquals(oldRemoteFile.remotePath, remoteFile.remotePath)
-        assertEquals(oldRemoteFile.mimeType, remoteFile.mimeType)
-        assertEquals(oldRemoteFile.length, remoteFile.length)
-        assertEquals(oldRemoteFile.creationTimestamp, remoteFile.creationTimestamp)
-        // assertEquals(oldRemoteFile.modifiedTimestamp, remoteFile.modifiedTimestamp)
-        assertEquals(oldRemoteFile.uploadTimestamp, remoteFile.uploadTimestamp)
-        assertEquals(oldRemoteFile.etag, remoteFile.etag)
-        assertEquals(oldRemoteFile.permissions, remoteFile.permissions)
-        assertEquals(oldRemoteFile.remoteId, remoteFile.remoteId)
-        assertEquals(oldRemoteFile.size, remoteFile.size)
-        assertEquals(oldRemoteFile.isFavorite, remoteFile.isFavorite)
-        assertEquals(oldRemoteFile.isEncrypted, remoteFile.isEncrypted)
-        assertEquals(oldRemoteFile.mountType, remoteFile.mountType)
-        assertEquals(oldRemoteFile.ownerId, remoteFile.ownerId)
-        assertEquals(oldRemoteFile.ownerDisplayName, remoteFile.ownerDisplayName)
-        assertEquals(oldRemoteFile.unreadCommentsCount, remoteFile.unreadCommentsCount)
-        assertEquals(oldRemoteFile.isHasPreview, remoteFile.isHasPreview)
-        assertEquals(oldRemoteFile.note, remoteFile.note)
-        assertEquals(oldRemoteFile.sharees.size, remoteFile.sharees.size)
-        assertEquals(oldRemoteFile.richWorkspace, remoteFile.richWorkspace)
-        assertEquals(oldRemoteFile.isLocked, remoteFile.isLocked)
-        assertEquals(oldRemoteFile.lockType, remoteFile.lockType)
-        assertEquals(oldRemoteFile.lockOwner, remoteFile.lockOwner)
-        assertEquals(oldRemoteFile.lockOwnerDisplayName, remoteFile.lockOwnerDisplayName)
-        assertEquals(oldRemoteFile.lockTimestamp, remoteFile.lockTimestamp)
-        assertEquals(oldRemoteFile.lockOwnerEditor, remoteFile.lockOwnerEditor)
-        assertEquals(oldRemoteFile.lockTimeout, remoteFile.lockTimeout)
-        assertEquals(oldRemoteFile.lockToken, remoteFile.lockToken)
-        assertEquals(oldRemoteFile.localId, remoteFile.localId)
+        assertTrue(oldRemoteFile == remoteFile)
     }
 
     @Test
@@ -213,7 +191,11 @@ class Dav4JVM : AbstractIT() {
         assertEquals(2, ror.resultData.size)
 
         val oldRemoteFile = ror.resultData[0]
-        assertEquals(path, oldRemoteFile.remotePath)
+
+        assertTrue(
+            path == ror.resultData[0].remotePath ||
+                path == ror.resultData[1].remotePath
+        )
 
         ror = SearchRemoteOperation(
             "test",
@@ -228,7 +210,10 @@ class Dav4JVM : AbstractIT() {
         assertEquals(2, ror.resultData.size)
 
         val remoteFile = ror.resultData[0]
-        assertEquals(path, remoteFile.remotePath)
+        assertTrue(
+            path == ror.resultData[0].remotePath ||
+                path == ror.resultData[1].remotePath
+        )
 
         assertEquals(oldRemoteFile.remoteId, remoteFile.remoteId)
     }
diff --git a/library/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java b/library/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java
index 08d7222084..5faf66b676 100644
--- a/library/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java
+++ b/library/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java
@@ -35,6 +35,7 @@
 import com.nextcloud.talk.components.filebrowser.models.properties.OCSize;
 import com.owncloud.android.lib.resources.files.webdav.NCEtag;
 import com.owncloud.android.lib.resources.files.webdav.NCFavorite;
+import com.owncloud.android.lib.resources.files.webdav.NCGetLastModified;
 import com.owncloud.android.lib.resources.files.webdav.NCMountType;
 import com.owncloud.android.lib.resources.files.webdav.NCPermissions;
 import com.owncloud.android.lib.resources.files.webdav.NCRichWorkspace;
@@ -61,7 +62,6 @@
 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 WebdavUtils {
@@ -161,7 +161,7 @@ public static Property.Name[] getAllPropertiesList() {
         list.add(GetContentType.NAME);
         list.add(ResourceType.NAME);
         list.add(GetContentLength.NAME);
-        list.add(GetLastModified.NAME);
+        list.add(NCGetLastModified.NAME);
         list.add(CreationDate.NAME);
         list.add(GetETag.NAME); // list.add(NCEtag.NAME);
         list.add(NCPermissions.NAME);
@@ -321,6 +321,7 @@ public static String getEtagFromResponse(HttpMethod method) {
     public static void registerCustomFactories() {
         List<PropertyFactory> list = new ArrayList<>();
         list.add(new NCFavorite.Factory());
+        list.add(new NCGetLastModified.Factory());
         list.add(new NCEtag.Factory());
         list.add(new NCPermissions.Factory());
         list.add(new OCId.Factory());
diff --git a/library/src/main/java/com/owncloud/android/lib/common/utils/WebDavFileUtils.java b/library/src/main/java/com/owncloud/android/lib/common/utils/WebDavFileUtils.java
index 2bdc0fe765..b9da3c03eb 100644
--- a/library/src/main/java/com/owncloud/android/lib/common/utils/WebDavFileUtils.java
+++ b/library/src/main/java/com/owncloud/android/lib/common/utils/WebDavFileUtils.java
@@ -37,6 +37,7 @@
 import com.owncloud.android.lib.resources.files.model.RemoteFile;
 import com.owncloud.android.lib.resources.files.webdav.NCEtag;
 import com.owncloud.android.lib.resources.files.webdav.NCFavorite;
+import com.owncloud.android.lib.resources.files.webdav.NCGetLastModified;
 import com.owncloud.android.lib.resources.files.webdav.NCMountType;
 import com.owncloud.android.lib.resources.files.webdav.NCPermissions;
 import com.owncloud.android.lib.resources.files.webdav.NCRichWorkspace;
@@ -51,7 +52,6 @@
 import at.bitfire.dav4jvm.Property;
 import at.bitfire.dav4jvm.Response;
 import at.bitfire.dav4jvm.property.GetContentType;
-import at.bitfire.dav4jvm.property.GetLastModified;
 import at.bitfire.dav4jvm.property.ResourceType;
 import okhttp3.MediaType;
 
@@ -121,8 +121,8 @@ public RemoteFile parseResponse(Response response, Uri filesDavUri) {
                 remoteFile.setFavorite(((NCFavorite) property).isOcFavorite());
             }
 
-            if (property instanceof GetLastModified) {
-                remoteFile.setModifiedTimestamp(((GetLastModified) property).getLastModified());
+            if (property instanceof NCGetLastModified) {
+                remoteFile.setModifiedTimestamp(((NCGetLastModified) property).getLastModified());
             }
 
             if (property instanceof GetContentType) {
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/model/RemoteFile.java b/library/src/main/java/com/owncloud/android/lib/resources/files/model/RemoteFile.java
index ed459eaa40..470b6b06fa 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/model/RemoteFile.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/model/RemoteFile.java
@@ -253,7 +253,35 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         RemoteFile that = (RemoteFile) o;
-        return length == that.length && creationTimestamp == that.creationTimestamp && modifiedTimestamp == that.modifiedTimestamp && uploadTimestamp == that.uploadTimestamp && size == that.size && favorite == that.favorite && encrypted == that.encrypted && unreadCommentsCount == that.unreadCommentsCount && hasPreview == that.hasPreview && isLocked == that.isLocked && lockTimestamp == that.lockTimestamp && lockTimeout == that.lockTimeout && Objects.equals(remotePath, that.remotePath) && Objects.equals(mimeType, that.mimeType) && Objects.equals(etag, that.etag) && Objects.equals(permissions, that.permissions) && Objects.equals(remoteId, that.remoteId) && mountType == that.mountType && Objects.equals(ownerId, that.ownerId) && Objects.equals(ownerDisplayName, that.ownerDisplayName) && Objects.equals(note, that.note) && Arrays.equals(sharees, that.sharees) && Objects.equals(richWorkspace, that.richWorkspace) && lockType == that.lockType && Objects.equals(lockOwner, that.lockOwner) && Objects.equals(lockOwnerDisplayName, that.lockOwnerDisplayName) && Objects.equals(lockOwnerEditor, that.lockOwnerEditor) && Objects.equals(lockToken, that.lockToken);
+        return
+                Objects.equals(remotePath, that.remotePath) &&
+                        Objects.equals(mimeType, that.mimeType) &&
+                        length == that.length &&
+                        creationTimestamp == that.creationTimestamp &&
+                        modifiedTimestamp == that.modifiedTimestamp &&
+                        uploadTimestamp == that.uploadTimestamp &&
+                        Objects.equals(etag, that.etag) &&
+                        Objects.equals(permissions, that.permissions) &&
+                        Objects.equals(remoteId, that.remoteId) &&
+                        size == that.size &&
+                        favorite == that.favorite &&
+                        encrypted == that.encrypted &&
+                        mountType == that.mountType &&
+                        Objects.equals(ownerId, that.ownerId) &&
+                        Objects.equals(ownerDisplayName, that.ownerDisplayName) &&
+                        unreadCommentsCount == that.unreadCommentsCount &&
+                        hasPreview == that.hasPreview &&
+                        Objects.equals(note, that.note) &&
+                        Arrays.equals(sharees, that.sharees) &&
+                        Objects.equals(richWorkspace, that.richWorkspace) &&
+                        isLocked == that.isLocked &&
+                        lockType == that.lockType &&
+                        Objects.equals(lockOwner, that.lockOwner) &&
+                        Objects.equals(lockOwnerDisplayName, that.lockOwnerDisplayName) &&
+                        lockTimestamp == that.lockTimestamp &&
+                        Objects.equals(lockOwnerEditor, that.lockOwnerEditor) &&
+                        lockTimeout == that.lockTimeout &&
+                        Objects.equals(lockToken, that.lockToken);
     }
 
     @Override
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/webdav/NCFavorite.kt b/library/src/main/java/com/owncloud/android/lib/resources/files/webdav/NCFavorite.kt
index cb58625a8c..429ef5e878 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/webdav/NCFavorite.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/webdav/NCFavorite.kt
@@ -49,9 +49,7 @@ class NCFavorite internal constructor(var isOcFavorite: Boolean) : Property {
             return NCFavorite(false)
         }
 
-        override fun getName(): Property.Name {
-            return NAME
-        }
+        override fun getName() = NAME
     }
 
     companion object {
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/webdav/NCGetLastModified.kt b/library/src/main/java/com/owncloud/android/lib/resources/files/webdav/NCGetLastModified.kt
new file mode 100644
index 0000000000..5d761a9ab6
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/webdav/NCGetLastModified.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2023 Tobias Kaminsky
+ * Copyright (C) 2023 Nextcloud GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.lib.resources.files.webdav
+
+import at.bitfire.dav4jvm.Property
+import at.bitfire.dav4jvm.PropertyFactory
+import at.bitfire.dav4jvm.XmlUtils
+import com.owncloud.android.lib.common.network.WebdavUtils
+import org.xmlpull.v1.XmlPullParser
+
+class NCGetLastModified internal constructor(var lastModified: Long) : Property {
+
+    class Factory : PropertyFactory {
+
+        override fun getName() = NAME
+
+        override fun create(parser: XmlPullParser): NCGetLastModified? {
+            // <!ELEMENT getlastmodified (#PCDATA) >
+            XmlUtils.readText(parser)?.let { rawDate ->
+                val date = WebdavUtils.parseResponseDate(rawDate)
+                if (date != null) {
+                    return NCGetLastModified(date.time)
+                } else {
+                    0
+                }
+            }
+            return null
+        }
+    }
+
+    companion object {
+        @JvmField
+        val NAME = Property.Name(XmlUtils.NS_WEBDAV, "getlastmodified")
+    }
+}