Handle potential cast error, use extension (b2794f50) · Commits · e / os / Nextcloud Android Library

library/src/main/java/com/nextcloud/extensions/ArrayListExtensions.kt

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		package com.nextcloud.extensions

		import org.w3c.dom.Element

		inline fun <reified T> ArrayList<*>.processXmlData(tagName: String): T? {
		this.forEach {
		val element = it as? Element
		if (element != null && element.tagName == tagName) {
		val textContent = element.firstChild.textContent

		return when (T::class) {
		Float::class -> textContent.toDouble() as T
		Double::class -> textContent.toDouble() as T
		else -> textContent as T
		}
		}
		}

		return null
		}

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

+11 −24

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ package com.owncloud.android.lib.common.network
		import android.net.Uri
		import com.google.gson.Gson
		import com.nextcloud.extensions.fromDavProperty
		import com.nextcloud.extensions.processXmlData
		import com.owncloud.android.lib.common.utils.Log_OC
		import com.owncloud.android.lib.resources.files.model.FileLockType
		import com.owncloud.android.lib.resources.files.model.FileLockType.Companion.fromValue
		@@ -414,19 +415,12 @@ class WebdavEntry constructor(ms: MultiStatusResponse, splitElement: String) {
		prop = propSet[EXTENDED_PROPERTY_METADATA_SIZE, ncNamespace]
		gson.fromDavProperty<ImageDimension>(prop)
		} else {
		val xmlData = prop.value as ArrayList<*>
		var width = 0f
		var height = 0f
		xmlData.forEach {
		val element = it as Element
		if (element.tagName == "width") {
		width = element.firstChild.textContent.toFloat()
		} else if (element.tagName == "height") {
		height = element.firstChild.textContent.toFloat()
		}
		}
		val result = ImageDimension()
		val xmlData = prop.value as? ArrayList<*>
		result.width = xmlData?.processXmlData<Float>("width") ?: -1f
		result.height = xmlData?.processXmlData<Float>("height") ?: -1f

		ImageDimension(width, height)
		result
		}

		// NC metadata gps property <nc:file-metadata-gps>
		@@ -436,19 +430,12 @@ class WebdavEntry constructor(ms: MultiStatusResponse, splitElement: String) {
		prop = propSet[EXTENDED_PROPERTY_METADATA_GPS, ncNamespace]
		gson.fromDavProperty<GeoLocation>(prop)
		} else {
		val xmlData = prop.value as ArrayList<*>
		var latitude = 0.0
		var longitude = 0.0
		xmlData.forEach {
		val element = it as Element
		if (element.tagName == "latitude") {
		latitude = element.firstChild.textContent.toDouble()
		} else if (element.tagName == "longitude") {
		longitude = element.firstChild.textContent.toDouble()
		}
		}
		val result = GeoLocation()
		val xmlData = prop.value as? ArrayList<*>
		result.latitude = xmlData?.processXmlData<Double>("latitude") ?: -1.0
		result.longitude = xmlData?.processXmlData<Double>("longitude") ?: -1.0

		GeoLocation(latitude, longitude)
		result
		}

		// NC metadata live photo property: <nc:metadata-files-live-photo/>