Extend RemoteFile and WebdavEntry for files download limit (e62670ca) · Commits · e / os / Nextcloud Android Library

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

+47 −1

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ package com.owncloud.android.lib.common.network

		import android.net.Uri
		import com.google.gson.Gson
		import com.nextcloud.android.lib.resources.files.FileDownloadLimit
		import com.nextcloud.extensions.fromDavProperty
		import com.nextcloud.extensions.processXmlData
		import com.owncloud.android.lib.common.utils.Log_OC
		@@ -96,6 +97,7 @@ class WebdavEntry constructor(
		private set
		var livePhoto: String? = null
		private set
		var fileDownloadLimit = emptyList<FileDownloadLimit>()

		private val gson = Gson()

		@@ -114,7 +116,7 @@ class WebdavEntry constructor(
		path =
		uri!!.split(splitElement.toRegex(), limit = 2).toTypedArray()[1].replace("//", "/")
		var status = ms.status[0].statusCode
		if (status == CODE_PROP_NOT_FOUND) {
		if (status == CODE_PROP_NOT_FOUND && ms.status.size > 1) {
		status = ms.status[1].statusCode
		}
		val propSet = ms.getProperties(status)
		@@ -464,6 +466,19 @@ class WebdavEntry constructor(
		false
		}

		// NC files download limits property: <nc:share-download-limits>
		prop = propSet[EXTENDED_PROPERTY_FILE_DOWNLOAD_LIMITS, ncNamespace]
		if (prop != null && prop.value != null) {
		if (prop.value is ArrayList<*>) {
		val list = prop.value as ArrayList<*>
		fileDownloadLimit = list.mapNotNull { extractFileDownloadLimit(it as Element) }
		} else {
		extractFileDownloadLimit(prop.value as Element)?.let {
		fileDownloadLimit = listOf(it)
		}
		}
		}

		parseLockProperties(ncNamespace, propSet)
		} else {
		Log_OC.e("WebdavEntry", "General error, no status for webdav response")
		@@ -564,6 +579,35 @@ class WebdavEntry constructor(
		return ShareType.NO_SHARED
		}

		private fun extractFileDownloadLimit(element: Element): FileDownloadLimit? {
		val token =
		element
		.getElementsByTagNameNS(NAMESPACE_NC, "token")
		?.item(0)
		?.firstChild
		?.nodeValue
		val limit =
		element
		.getElementsByTagNameNS(NAMESPACE_NC, "limit")
		?.item(0)
		?.firstChild
		?.nodeValue
		?.toIntOrNull()
		val count =
		element
		.getElementsByTagNameNS(NAMESPACE_NC, "count")
		?.item(0)
		?.firstChild
		?.nodeValue
		?.toIntOrNull()

		return if (token != null && limit != null && count != null) {
		FileDownloadLimit(token, limit, count)
		} else {
		null
		}
		}

		fun decodedPath(): String = Uri.decode(path)

		val isDirectory: Boolean
		@@ -623,6 +667,8 @@ class WebdavEntry constructor(
		const val EXTENDED_PROPERTY_HIDDEN = "hidden"
		const val EXTENDED_PROPERTY_METADATA_LIVE_PHOTO = "metadata-files-live-photo"

		const val EXTENDED_PROPERTY_FILE_DOWNLOAD_LIMITS = "share-download-limits"

		const val EXTENDED_PROPERTY_METADATA_PHOTOS_SIZE = "metadata-photos-size"
		const val EXTENDED_PROPERTY_METADATA_PHOTOS_GPS = "metadata-photos-gps"
		const val TRASHBIN_FILENAME = "trashbin-filename"

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -123,6 +123,7 @@ public class WebdavUtils {
		propSet.add(WebdavEntry.EXTENDED_PROPERTY_METADATA_PHOTOS_GPS, ncNamespace);
		propSet.add(WebdavEntry.EXTENDED_PROPERTY_METADATA_LIVE_PHOTO, ncNamespace);
		propSet.add(WebdavEntry.EXTENDED_PROPERTY_HIDDEN, ncNamespace);
		propSet.add(WebdavEntry.EXTENDED_PROPERTY_FILE_DOWNLOAD_LIMITS, ncNamespace);

		return propSet;
		}

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ package com.owncloud.android.lib.resources.files.model

		import android.os.Parcel
		import android.os.Parcelable
		import com.nextcloud.android.lib.resources.files.FileDownloadLimit
		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
		@@ -57,6 +58,7 @@ class RemoteFile :
		var geoLocation: GeoLocation? = null
		var hidden = false
		var livePhoto: String? = null
		var fileDownloadLimit: List<FileDownloadLimit> = emptyList()

		constructor() {
		resetData()
		@@ -112,6 +114,7 @@ class RemoteFile :
		geoLocation = we.geoLocation
		livePhoto = we.livePhoto
		hidden = we.hidden
		fileDownloadLimit = we.fileDownloadLimit
		}

		/**
		@@ -144,6 +147,7 @@ class RemoteFile :
		tags = null
		hidden = false
		livePhoto = null
		fileDownloadLimit = emptyList()
		}

		/**