Skip to content

Commit f9659da

Browse files
committed
Removed some warnings on OkHttpDownloader
1 parent b0bdb75 commit f9659da

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

fetch2okhttp/src/main/java/com/tonyodev/fetch2okhttp/OkHttpDownloader.kt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.tonyodev.fetch2okhttp
22

3+
import android.util.Log
34
import com.tonyodev.fetch2core.*
45
import okhttp3.OkHttpClient
56
import okhttp3.Request
@@ -26,7 +27,7 @@ open class OkHttpDownloader @JvmOverloads constructor(
2627

2728
constructor(fileDownloaderType: Downloader.FileDownloaderType) : this(null, fileDownloaderType)
2829

29-
protected val connections: MutableMap<Downloader.Response, Response> = Collections.synchronizedMap(HashMap<Downloader.Response, Response>())
30+
private val connections: MutableMap<Downloader.Response, Response> = Collections.synchronizedMap(HashMap<Downloader.Response, Response>())
3031

3132
@Volatile
3233
var client: OkHttpClient = okHttpClient ?: OkHttpClient.Builder()
@@ -74,8 +75,8 @@ open class OkHttpDownloader @JvmOverloads constructor(
7475
.build()
7576
}
7677
var okHttpResponse = client.newCall(okHttpRequest).execute()
77-
var responseHeaders = okHttpResponse.headers().toMultimap()
78-
var code = okHttpResponse.code()
78+
var responseHeaders = okHttpResponse.headers.toMultimap()
79+
var code = okHttpResponse.code
7980
if ((code == HttpURLConnection.HTTP_MOVED_TEMP
8081
|| code == HttpURLConnection.HTTP_MOVED_PERM
8182
|| code == HttpURLConnection.HTTP_SEE_OTHER) && getHeaderValue(responseHeaders, "Location") != null) {
@@ -90,16 +91,16 @@ open class OkHttpDownloader @JvmOverloads constructor(
9091
try {
9192
okHttpResponse.close()
9293
} catch (e: Exception) {
93-
94+
Log.d(e.message, "Failed executing request.")
9495
}
9596
okHttpResponse = client.newCall(okHttpRequest).execute()
96-
responseHeaders = okHttpResponse.headers().toMultimap()
97-
code = okHttpResponse.code()
97+
responseHeaders = okHttpResponse.headers.toMultimap()
98+
code = okHttpResponse.code
9899
}
99100

100101
val success = okHttpResponse.isSuccessful
101102
val contentLength = getContentLengthFromHeader(responseHeaders, -1L)
102-
val byteStream: InputStream? = okHttpResponse.body()?.byteStream()
103+
val byteStream: InputStream? = okHttpResponse.body?.byteStream()
103104
val errorResponseString: String? = if (!success) {
104105
copyStreamToString(byteStream, false)
105106
} else {
@@ -159,7 +160,7 @@ open class OkHttpDownloader @JvmOverloads constructor(
159160
try {
160161
response?.close()
161162
} catch (e: Exception) {
162-
163+
e.printStackTrace()
163164
}
164165
}
165166

0 commit comments

Comments
 (0)