Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 57da6f04 authored by alperozturk's avatar alperozturk
Browse files

distinguish tag and system tag 



Signed-off-by: default avataralperozturk <alper_ozturk@proton.me>
parent 867a12b9

library/src/main/java/com/owncloud/android/lib/common/network/Tag.kt

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
/*

 * Nextcloud Android Library

 *

 * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors

 * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>

 * SPDX-License-Identifier: MIT

 */



package com.owncloud.android.lib.common.network



data class Tag (val name: String, val color: String)

library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt

+5 −4
Original line number Diff line number Diff line
@@ -21,6 +21,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
@@ -90,7 +91,7 @@ class WebdavEntry constructor( 
        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
@@ -482,10 +483,10 @@ class WebdavEntry constructor( 
        }

    }



    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(

library/src/main/java/com/owncloud/android/lib/resources/files/model/RemoteFile.kt

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 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



/**
@@ -54,7 +55,7 @@ class RemoteFile : 
    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

library/src/main/java/com/owncloud/android/lib/resources/systemTag/SystemTag.kt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
/*

 * 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?)