From ea59ad2953ff358c43b01139ae98beede0f4dfc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Goli=C5=84ski?= Date: Sat, 17 May 2025 20:27:36 +0200 Subject: [PATCH 1/2] Reuse the existing ObjectMapper --- .../main/java/com/audiobookshelf/app/data/ItemInProgress.kt | 4 ++-- .../src/main/java/com/audiobookshelf/app/server/ApiHandler.kt | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/android/app/src/main/java/com/audiobookshelf/app/data/ItemInProgress.kt b/android/app/src/main/java/com/audiobookshelf/app/data/ItemInProgress.kt index 48dd51fb..33240c8b 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/data/ItemInProgress.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/data/ItemInProgress.kt @@ -6,6 +6,7 @@ package com.audiobookshelf.app.data import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.core.json.JsonReadFeature +import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.readValue import org.json.JSONObject @@ -18,8 +19,7 @@ data class ItemInProgress( val isLocal: Boolean ) { companion object { - fun makeFromServerObject(serverItem: JSONObject):ItemInProgress { - val jacksonMapper = jacksonObjectMapper().enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature()) + fun makeFromServerObject(serverItem: JSONObject, jacksonMapper: ObjectMapper):ItemInProgress { val libraryItem = jacksonMapper.readValue(serverItem.toString()) var episode:PodcastEpisode? = null diff --git a/android/app/src/main/java/com/audiobookshelf/app/server/ApiHandler.kt b/android/app/src/main/java/com/audiobookshelf/app/server/ApiHandler.kt index bf807f73..4086d6b7 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/server/ApiHandler.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/server/ApiHandler.kt @@ -334,8 +334,7 @@ class ApiHandler(var ctx:Context) { val array = it.getJSONArray("libraryItems") for (i in 0 until array.length()) { val jsobj = array.get(i) as JSONObject - - val itemInProgress = ItemInProgress.makeFromServerObject(jsobj) + val itemInProgress = ItemInProgress.makeFromServerObject(jsobj, jacksonMapper) items.add(itemInProgress) } } From c4fe0680f3ef1b58969d1d98b0aa89be1036cd83 Mon Sep 17 00:00:00 2001 From: advplyr Date: Sun, 18 May 2025 17:06:06 -0500 Subject: [PATCH 2/2] Remove unused imports --- .../src/main/java/com/audiobookshelf/app/data/ItemInProgress.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/android/app/src/main/java/com/audiobookshelf/app/data/ItemInProgress.kt b/android/app/src/main/java/com/audiobookshelf/app/data/ItemInProgress.kt index 33240c8b..77d4c70e 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/data/ItemInProgress.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/data/ItemInProgress.kt @@ -5,9 +5,7 @@ package com.audiobookshelf.app.data import com.fasterxml.jackson.annotation.JsonIgnoreProperties -import com.fasterxml.jackson.core.json.JsonReadFeature import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.readValue import org.json.JSONObject