TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-26 17:57:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1568 from bemusementpark/fix-body

Browse Source 
Fix leak in Response#body
This commit is contained in:
Andrew 2024-07-25 09:51:35 +09:30 committed by GitHub
commit 64c72248e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libsignal/src/main/java/org/session/libsignal/utilities/HTTP.kt
View File

@ -115,18 +115,26 @@ object HTTP {
} }
Verb.DELETE -> request.delete() Verb.DELETE -> request.delete()
} }
lateinit var response: Response return try {
try { when {
val connection: OkHttpClient = if (timeout != HTTP.timeout) { // Custom timeout // Custom timeout
timeout != HTTP.timeout -> {
if (useSeedNodeConnection) { if (useSeedNodeConnection) {
throw IllegalStateException("Setting a custom timeout is only allowed for requests to snodes.") throw IllegalStateException("Setting a custom timeout is only allowed for requests to snodes.")
} }
getDefaultConnection(timeout) getDefaultConnection(timeout)
} else {
if (useSeedNodeConnection) seedNodeConnection else defaultConnection
} }
useSeedNodeConnection -> seedNodeConnection
response = connection.newCall(request.build()).execute() else -> defaultConnection
}.newCall(request.build()).execute().use { response ->
when (val statusCode = response.code) {
200 -> response.body!!.bytes()
else -> {
Log.d("Loki", "${verb.rawValue} request to $url failed with status code: $statusCode.")
throw HTTPRequestFailedException(statusCode, null)
}
}
}
} catch (exception: Exception) { } catch (exception: Exception) {
Log.d("Loki", "${verb.rawValue} request to $url failed due to error: ${exception.localizedMessage}.") Log.d("Loki", "${verb.rawValue} request to $url failed due to error: ${exception.localizedMessage}.")
@ -135,14 +143,5 @@ object HTTP {
// Override the actual error so that we can correctly catch failed requests in OnionRequestAPI // Override the actual error so that we can correctly catch failed requests in OnionRequestAPI
throw HTTPRequestFailedException(0, null, "HTTP request failed due to: ${exception.message}") throw HTTPRequestFailedException(0, null, "HTTP request failed due to: ${exception.message}")
} }
return when (val statusCode = response.code) {
200 -> {
response.body!!.bytes()
}
else -> {
Log.d("Loki", "${verb.rawValue} request to $url failed with status code: $statusCode.")
throw HTTPRequestFailedException(statusCode, null)
}
}
} }
} }