Make ResponseProgressListener a fun interface

app/src/main/java/com/ludovic/vimont/nasaapod/api/glide/GlideDispatchProgressListener.kt

@@ -5,6 +5,7 @@ package com.ludovic.vimont.nasaapod.api.glide
  * the download with a percentage.
  */
 class GlideDispatchProgressListener: ResponseProgressListener {
+
  companion object {
  private const val HUNDRED_PERCENT: Int = 100
  private val listeners = HashMap<String, UIDownloadProgressListener>()
@@ -20,11 +21,10 @@ class GlideDispatchProgressListener: ResponseProgressListener {
  }
  }
 
- override fun update(url: String, totalBytesRead: Long, contentLength: Long, isDone: Boolean) {
+ override fun invoke(url: String, totalBytesRead: Long, contentLength: Long, isDone: Boolean) {
  val currentProgress: Int = (HUNDRED_PERCENT * totalBytesRead / contentLength).toInt()
- if (isDispatchNeeded(url, currentProgress)) {
- listeners[url]?.invoke(currentProgress)
- }
+ if (!isDispatchNeeded(url, currentProgress)) return
+ listeners[url]?.invoke(currentProgress)
  }
 
  private fun isDispatchNeeded(key: String, currentProgress: Int): Boolean {
@@ -41,4 +41,5 @@ class GlideDispatchProgressListener: ResponseProgressListener {
  progresses[key] = currentProgress
  return true
  }
+
 }

app/src/main/java/com/ludovic/vimont/nasaapod/api/glide/OkHttpResponseBody.kt

@@ -17,22 +17,16 @@ import okio.Source
 class OkHttpResponseBody(private val httpUrl: HttpUrl,
  private val responseBody: ResponseBody,
  private val progressListener: ResponseProgressListener) : ResponseBody() {
- private var bufferedSource: BufferedSource? = null
 
- override fun contentType(): MediaType? {
- return responseBody.contentType()
+ private val bufferedSource: BufferedSource by lazy {
+ Okio.buffer(source(responseBody.source()))
  }
 
- override fun contentLength(): Long {
- return responseBody.contentLength()
- }
+ override fun contentType(): MediaType? = responseBody.contentType()
 
- override fun source(): BufferedSource? {
- if (bufferedSource == null) {
- bufferedSource = Okio.buffer(source(responseBody.source()))
- }
- return bufferedSource
- }
+ override fun contentLength(): Long = responseBody.contentLength()
+
+ override fun source(): BufferedSource = bufferedSource
 
  private fun source(source: Source): Source {
  return object : ForwardingSource(source) {
@@ -48,9 +42,17 @@ class OkHttpResponseBody(private val httpUrl: HttpUrl,
  }
  val isDone: Boolean = (bytesRead == -1L)
  val url: String = httpUrl.uri().toString()
- progressListener.update(url, totalBytesRead, responseBody.contentLength(), isDone)
+
+ progressListener.invoke(
+ url = url,
+ totalBytesRead = totalBytesRead,
+ contentLength = responseBody.contentLength(),
+ isDone = isDone,
+ )
+
  return bytesRead
  }
  }
  }
+
 }

app/src/main/java/com/ludovic/vimont/nasaapod/api/glide/ResponseProgressListener.kt

@@ -1,10 +1,12 @@
 package com.ludovic.vimont.nasaapod.api.glide
 
-interface ResponseProgressListener {
- fun update(
+fun interface ResponseProgressListener {
+
+ operator fun invoke(
  url: String,
  totalBytesRead: Long,
  contentLength: Long,
  isDone: Boolean
  )
+
 }