distinguish tag and system tag

Signed-off-by: alperozturk <alper_ozturk@proton.me>
nextcloud · Jan 8, 2025 · b9cff64 · b9cff64
1 parent e5fb554
commit b9cff64
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/library/src/main/java/com/owncloud/android/lib/common/network/Tag.kt b/library/src/main/java/com/owncloud/android/lib/common/network/Tag.kt
diff --git a/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt b/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt
@@ -20,6 +20,7 @@ import com.owncloud.android.lib.resources.files.model.GeoLocation
 import com.owncloud.android.lib.resources.files.model.ImageDimension
 import com.owncloud.android.lib.resources.shares.ShareType
 import com.owncloud.android.lib.resources.shares.ShareeUser
+import com.owncloud.android.lib.resources.systemTag.SystemTag
 import org.apache.jackrabbit.webdav.MultiStatusResponse
 import org.apache.jackrabbit.webdav.property.DavProperty
 import org.apache.jackrabbit.webdav.property.DavPropertyName
@@ -86,7 +87,7 @@ class WebdavEntry constructor(ms: MultiStatusResponse, splitElement: String) {
         private set
     var lockToken: String? = null
         private set
-    var tags = arrayOfNulls<Tag>(0)
+    var tags = arrayOfNulls<SystemTag>(0)
     var imageDimension: ImageDimension? = null
     var geoLocation: GeoLocation? = null
     var hidden = false
@@ -464,10 +465,10 @@ class WebdavEntry constructor(ms: MultiStatusResponse, splitElement: String) {
         }
     }
 
-    private fun parseTag(element: Element): Tag {
+    private fun parseTag(element: Element): SystemTag {
         val name = element.firstChild.textContent
-        val color = element.getAttribute("nc:color")
-        return Tag(name, color)
+        val color = "#" + element.getAttribute("nc:color")
+        return SystemTag(name, color)
     }
 
     private fun parseLockProperties(

diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/model/RemoteFile.kt b/library/src/main/java/com/owncloud/android/lib/resources/files/model/RemoteFile.kt
@@ -8,12 +8,12 @@ package com.owncloud.android.lib.resources.files.model
 
 import android.os.Parcel
 import android.os.Parcelable
-import com.owncloud.android.lib.common.network.Tag
 import com.owncloud.android.lib.common.network.WebdavEntry
 import com.owncloud.android.lib.common.network.WebdavEntry.MountType
 import com.owncloud.android.lib.resources.files.FileUtils
 import com.owncloud.android.lib.resources.files.model.FileLockType.Companion.fromValue
 import com.owncloud.android.lib.resources.shares.ShareeUser
+import com.owncloud.android.lib.resources.systemTag.SystemTag
 import java.io.Serializable
 
 /**
@@ -51,7 +51,7 @@ class RemoteFile : Parcelable, Serializable {
     var lockOwnerEditor: String? = null
     var lockTimeout: Long = 0
     var lockToken: String? = null
-    var tags: Array<Tag?>? = null
+    var tags: Array<SystemTag?>? = null
     var imageDimension: ImageDimension? = null
     var geoLocation: GeoLocation? = null
     var hidden = false

diff --git a/library/src/main/java/com/owncloud/android/lib/resources/systemTag/SystemTag.kt b/library/src/main/java/com/owncloud/android/lib/resources/systemTag/SystemTag.kt
@@ -0,0 +1,10 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.owncloud.android.lib.resources.systemTag
+
+data class SystemTag(val name: String, val color: String?)