1
1
package com.tonyodev.fetch2okhttp
2
2
3
+ import android.util.Log
3
4
import com.tonyodev.fetch2core.*
4
5
import okhttp3.OkHttpClient
5
6
import okhttp3.Request
@@ -26,7 +27,7 @@ open class OkHttpDownloader @JvmOverloads constructor(
26
27
27
28
constructor (fileDownloaderType: Downloader .FileDownloaderType ) : this (null , fileDownloaderType)
28
29
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 >())
30
31
31
32
@Volatile
32
33
var client: OkHttpClient = okHttpClient ? : OkHttpClient .Builder ()
@@ -74,8 +75,8 @@ open class OkHttpDownloader @JvmOverloads constructor(
74
75
.build()
75
76
}
76
77
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
79
80
if ((code == HttpURLConnection .HTTP_MOVED_TEMP
80
81
|| code == HttpURLConnection .HTTP_MOVED_PERM
81
82
|| code == HttpURLConnection .HTTP_SEE_OTHER ) && getHeaderValue(responseHeaders, " Location" ) != null ) {
@@ -90,16 +91,16 @@ open class OkHttpDownloader @JvmOverloads constructor(
90
91
try {
91
92
okHttpResponse.close()
92
93
} catch (e: Exception ) {
93
-
94
+ Log .d(e.message, " Failed executing request. " )
94
95
}
95
96
okHttpResponse = client.newCall(okHttpRequest).execute()
96
- responseHeaders = okHttpResponse.headers() .toMultimap()
97
- code = okHttpResponse.code()
97
+ responseHeaders = okHttpResponse.headers.toMultimap()
98
+ code = okHttpResponse.code
98
99
}
99
100
100
101
val success = okHttpResponse.isSuccessful
101
102
val contentLength = getContentLengthFromHeader(responseHeaders, - 1L )
102
- val byteStream: InputStream ? = okHttpResponse.body() ?.byteStream()
103
+ val byteStream: InputStream ? = okHttpResponse.body?.byteStream()
103
104
val errorResponseString: String? = if (! success) {
104
105
copyStreamToString(byteStream, false )
105
106
} else {
@@ -159,7 +160,7 @@ open class OkHttpDownloader @JvmOverloads constructor(
159
160
try {
160
161
response?.close()
161
162
} catch (e: Exception ) {
162
-
163
+ e.printStackTrace()
163
164
}
164
165
}
165
166
0 commit comments