Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 08:39:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade OkHttp to 4.12.

Browse Source 
Addresses #13491
This commit is contained in:
Nicholas Tinsley
2024-06-17 17:51:19 -04:00
committed by Greyson Parrelli
parent 9824cc2cbe
commit 8ba57a2733
11 changed files with 68 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/s3/S3.kt
View File

@@ -53,10 +53,10 @@ object S3 {
fun getString(endpoint: String): String {
getObject(endpoint).use { response ->
if (!response.isSuccessful) {
throw NonSuccessfulResponseCodeException(response.code())
throw NonSuccessfulResponseCodeException(response.code)
}
return response.body()?.string()?.trim() ?: throw IOException()
return response.body?.string()?.trim() ?: throw IOException()
}
}
@@ -110,13 +110,13 @@ object S3 {
getObject(endpoint).use { response ->
if (!response.isSuccessful) {
return ServiceResponse.forApplicationError(
DefaultErrorMapper.getDefault().parseError(response.code()),
response.code(),
DefaultErrorMapper.getDefault().parseError(response.code),
response.code,
""
)
}
val source = response.body()?.source()
val source = response.body?.source()
val outputStream = ByteArrayOutputStream()
@@ -166,7 +166,7 @@ object S3 {
}
getObject(objectPathOnNetwork).use { response ->
val source = response.body()?.source()
val source = response.body?.source()
val outputStream: OutputStream = if (doNotEncrypt) {
FileOutputStream(objectFileOnDisk)