Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Revert exposed `readText` method.

Jaehwa Noh5084e5c3d6b7
diff --git a/core/network/src/main/kotlin/JvmUnitTestDemoAssetManager.kt b/core/network/src/main/kotlin/JvmUnitTestDemoAssetManager.kt
index 7017cb0e2..2ef418517 100644
--- a/core/network/src/main/kotlin/JvmUnitTestDemoAssetManager.kt
+++ b/core/network/src/main/kotlin/JvmUnitTestDemoAssetManager.kt
@@ -17,7 +17,6 @@
import com.google.samples.apps.nowinandroid.core.network.demo.DemoAssetManager
import java.io.File
import java.io.InputStream
-import java.nio.charset.StandardCharsets
import java.util.Properties
/**
@@ -39,5 +38,4 @@ internal object JvmUnitTestDemoAssetManager : DemoAssetManager {
private val assets = File(properties["android_merged_assets"].toString())
override fun open(fileName: String): InputStream = File(assets, fileName).inputStream()
- override fun readText(fileName: String): String = File(assets, fileName).readText(StandardCharsets.UTF_8)
}
diff --git a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoAssetManager.kt b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoAssetManager.kt
index d3264a251..e5fb07bb3 100644
--- a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoAssetManager.kt
+++ b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoAssetManager.kt
@@ -18,7 +18,6 @@ package com.google.samples.apps.nowinandroid.core.network.demo
import java.io.InputStream
-interface DemoAssetManager {
+fun interface DemoAssetManager {
fun open(fileName: String): InputStream
- fun readText(fileName: String): String
}
diff --git a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt
index 08e186d01..a97540f2b 100644
--- a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt
+++ b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt
@@ -32,7 +32,6 @@ import kotlinx.serialization.json.Json
import okhttp3.Call
import okhttp3.OkHttpClient
import okhttp3.logging.HttpLoggingInterceptor
-import java.io.InputStream
import javax.inject.Singleton
@Module
@@ -49,10 +48,7 @@ internal object NetworkModule {
@Singleton
fun providesDemoAssetManager(
@ApplicationContext context: Context,
- ): DemoAssetManager = object : DemoAssetManager {
- override fun open(fileName: String): InputStream = context.assets.open(fileName)
- override fun readText(fileName: String): String = context.assets.open(fileName).bufferedReader().use { it.readText() }
- }
+ ): DemoAssetManager = DemoAssetManager(context.assets::open)
@Provides
@Singleton