A fully functional Android app built entirely with Kotlin and Jetpack Compose
Refactor change to make it clearer when the deserialization workaround is required.
Don Turnerb77f6f8da7c0
diff --git a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.ktindex 5d04ee4c8..328cc4e0f 100644--- a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt+++ b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt@@ -18,7 +18,7 @@ package com.google.samples.apps.nowinandroid.core.network.demoimport JvmUnitTestDemoAssetManagerimport android.os.Build.VERSION.SDK_INT-import android.os.Build.VERSION_CODES.N+import android.os.Build.VERSION_CODES.Mimport com.google.samples.apps.nowinandroid.core.network.Dispatcherimport com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IOimport com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource@@ -43,10 +43,10 @@ class DemoNiaNetworkDataSource @Inject constructor() : NiaNetworkDataSource {override suspend fun getTopics(ids: List<String>?): List<NetworkTopic> =- getDemoDataFromJson(TOPICS_ASSET)+ getDataFromJsonFile(TOPICS_ASSET)override suspend fun getNewsResources(ids: List<String>?): List<NetworkNewsResource> =- getDemoDataFromJson(NEWS_ASSET)+ getDataFromJsonFile(NEWS_ASSET)override suspend fun getTopicChangeList(after: Int?): List<NetworkChangeList> =getTopics().mapToChangeList(NetworkTopic::id)@@ -55,18 +55,22 @@ class DemoNiaNetworkDataSource @Inject constructor(getNewsResources().mapToChangeList(NetworkNewsResource::id)/**- * Get Demo data form a [fileName] Json file.+ * Get data from the given JSON [fileName].*/@OptIn(ExperimentalSerializationApi::class)- private suspend inline fun <reified T> getDemoDataFromJson(fileName: String): List<T> =+ private suspend inline fun <reified T> getDataFromJsonFile(fileName: String): List<T> =withContext(ioDispatcher) {assets.open(fileName).use { inputStream ->- if (SDK_INT >= N) {- networkJson.decodeFromStream(inputStream)- } // https://github.com/Kotlin/kotlinx.serialization/issues/2457#issuecomment-1786923342- else {+ if (SDK_INT <= M) {+ /**+ * On API 23 (M) and below we must use a workaround to avoid an exception being+ * thrown during deserialization. See:+ * https://github.com/Kotlin/kotlinx.serialization/issues/2457#issuecomment-1786923342+ */inputStream.bufferedReader().use(BufferedReader::readText).let(networkJson::decodeFromString)+ } else {+ networkJson.decodeFromStream(inputStream)}}}