Skip to content

Commit 5084e5c

Browse files
committed
Revert exposed readText method.
Change-Id: I8076fabed4b4f2f460c74b43ad1c3e38a5268005
1 parent 924a473 commit 5084e5c

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

core/network/src/main/kotlin/JvmUnitTestDemoAssetManager.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.google.samples.apps.nowinandroid.core.network.demo.DemoAssetManager
1818
import java.io.File
1919
import java.io.InputStream
20-
import java.nio.charset.StandardCharsets
2120
import java.util.Properties
2221

2322
/**
@@ -39,5 +38,4 @@ internal object JvmUnitTestDemoAssetManager : DemoAssetManager {
3938
private val assets = File(properties["android_merged_assets"].toString())
4039

4140
override fun open(fileName: String): InputStream = File(assets, fileName).inputStream()
42-
override fun readText(fileName: String): String = File(assets, fileName).readText(StandardCharsets.UTF_8)
4341
}

core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoAssetManager.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package com.google.samples.apps.nowinandroid.core.network.demo
1818

1919
import java.io.InputStream
2020

21-
interface DemoAssetManager {
21+
fun interface DemoAssetManager {
2222
fun open(fileName: String): InputStream
23-
fun readText(fileName: String): String
2423
}

core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import kotlinx.serialization.json.Json
3232
import okhttp3.Call
3333
import okhttp3.OkHttpClient
3434
import okhttp3.logging.HttpLoggingInterceptor
35-
import java.io.InputStream
3635
import javax.inject.Singleton
3736

3837
@Module
@@ -49,10 +48,7 @@ internal object NetworkModule {
4948
@Singleton
5049
fun providesDemoAssetManager(
5150
@ApplicationContext context: Context,
52-
): DemoAssetManager = object : DemoAssetManager {
53-
override fun open(fileName: String): InputStream = context.assets.open(fileName)
54-
override fun readText(fileName: String): String = context.assets.open(fileName).bufferedReader().use { it.readText() }
55-
}
51+
): DemoAssetManager = DemoAssetManager(context.assets::open)
5652

5753
@Provides
5854
@Singleton

0 commit comments

Comments
 (0)