wip

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

app/src/main/java/com/owncloud/android/ui/activity/RichDocumentsEditorWebView.kt

@@ -168,7 +168,9 @@ class RichDocumentsEditorWebView : EditorWebView() {
             val url = result.url.toUri()
             when (result.format) {
                 PRINT -> printFile(url)
+
                 SLIDESHOW -> showSlideShow(url)
+
                 else -> {
                     downloadFile(url, result.fileName)
                 }
@@ -211,12 +213,9 @@ class RichDocumentsEditorWebView : EditorWebView() {
     }
 
     companion object {
-        private const val URL = "URL"
         private const val HYPERLINK = "Url"
-        private const val TYPE = "Type"
         private const val PRINT = "print"
         private const val SLIDESHOW = "slideshow"
         private const val NEW_NAME = "NewName"
-        private const val FILENAME = "filename"
     }
 }

app/src/main/java/com/owncloud/android/ui/model/DownloadAs.kt

@@ -7,62 +7,4 @@
 
 package com.owncloud.android.ui.model
 
-import com.owncloud.android.lib.common.utils.Log_OC
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.SerializationException
-import kotlinx.serialization.json.Json
-
-@Serializable
-data class DownloadAsV1(
-    @SerialName("Type") val type: String,
-    @SerialName("URL") val url: String,
-    @SerialName("filename") val fileName: String
-) {
-    companion object {
-        fun tryDeserialize(json: String): DownloadAsResult? {
-            return try {
-                val v1 = jsonImpl.decodeFromString<DownloadAsV1>(json)
-                return DownloadAsResult(
-                    format = v1.type,
-                    fileName = v1.fileName,
-                    url = v1.url
-                )
-            } catch (e: SerializationException) {
-                Log_OC.e("DownloadAsV1", "tryDeserialize: $e")
-                null
-            }
-        }
-    }
-}
-
-@Serializable
-data class DownloadAsV2(
-    @SerialName("format") val format: String,
-    @SerialName("name") val fileName: String,
-    @SerialName("url") val url: String
-) {
-    companion object {
-        fun tryDeserialize(json: String): DownloadAsResult? {
-            return try {
-                val v2 = jsonImpl.decodeFromString<DownloadAsV2>(json)
-                return DownloadAsResult(
-                    format = v2.format,
-                    fileName = v2.fileName,
-                    url = v2.url
-                )
-            } catch (e: SerializationException) {
-                Log_OC.e("DownloadAsV2", "tryDeserialize: $e")
-                null
-            }
-        }
-    }
-}
-
-data class DownloadAsResult(
-    val format: String,
-    val fileName: String,
-    val url: String
-)
-
-private val jsonImpl = Json { ignoreUnknownKeys = true }
+data class DownloadAs(val format: String, val fileName: String, val url: String)

app/src/main/java/com/owncloud/android/utils/RichDocumentDownloadAsParser.kt

@@ -7,19 +7,52 @@
 
 package com.owncloud.android.utils
 
-import com.owncloud.android.ui.model.DownloadAsResult
-import com.owncloud.android.ui.model.DownloadAsV1
-import com.owncloud.android.ui.model.DownloadAsV2
+import com.owncloud.android.lib.common.utils.Log_OC
+import com.owncloud.android.ui.model.DownloadAs
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.contentOrNull
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
 
 object RichDocumentDownloadAsParser {
-    fun parse(json: String?): DownloadAsResult? {
-        if (json.isNullOrBlank()) return null
 
-        var result = DownloadAsV2.tryDeserialize(json)
-        if (result == null) {
-            result = DownloadAsV1.tryDeserialize(json)
+    private const val TAG = "RichDocumentDownloadAsParser"
+    private const val URL_UPPERCASE = "URL"
+    private const val URL_LOWERCASE = "url"
+
+    private const val FORMAT = "format"
+    private const val NAME = "name"
+    private const val TYPE = "Type"
+    private const val FILENAME = "filename"
+
+    private val json = Json { ignoreUnknownKeys = true }
+
+    fun parse(jsonString: String?): DownloadAs? {
+        if (jsonString.isNullOrBlank()) return null
+
+        return try {
+            val obj = json.parseToJsonElement(jsonString).jsonObject
+            val url = obj[URL_LOWERCASE]?.jsonPrimitive?.contentOrNull
+                ?: obj[URL_UPPERCASE]?.jsonPrimitive?.contentOrNull
+            tryParseV2(obj, url) ?: tryParseV1(obj, url)
+        } catch (e: Exception) {
+            Log_OC.e(TAG, "parse failed: $e")
+            null
         }
+    }
+
+    private fun tryParseV2(obj: JsonObject, url: String?): DownloadAs? {
+        val format = obj[FORMAT]?.jsonPrimitive?.contentOrNull
+        val name = obj[NAME]?.jsonPrimitive?.contentOrNull
+        if (format == null || url == null) return null
+        return DownloadAs(format = format, fileName = name ?: "", url = url)
+    }
 
-        return result
+    private fun tryParseV1(obj: JsonObject, url: String?): DownloadAs? {
+        val type = obj[TYPE]?.jsonPrimitive?.contentOrNull
+        val filename = obj[FILENAME]?.jsonPrimitive?.contentOrNull
+        if (type == null || url == null) return null
+        return DownloadAs(format = type, fileName = filename ?: "", url = url)
     }
 }