TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-28 20:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: reduce attempts for downloading image, invert unreachable type check

Browse Source
This commit is contained in:
0x330a 2023-06-15 17:44:16 +10:00
parent 77ee554450
commit b5eaed3cbb
No known key found for this signature in database
GPG Key ID: 267811D6E6A2698C
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt
View File

@ -446,8 +446,8 @@ object OnionRequestAPI {
val payloadData = JsonUtil.toJson(payload).toByteArray() val payloadData = JsonUtil.toJson(payload).toByteArray()
return sendOnionRequest(Destination.Snode(snode), payloadData, version).recover { exception -> return sendOnionRequest(Destination.Snode(snode), payloadData, version).recover { exception ->
val error = when (exception) { val error = when (exception) {
is HTTP.HTTPRequestFailedException -> SnodeAPI.handleSnodeError(exception.statusCode, exception.json, snode, publicKey)
is HTTPRequestFailedAtDestinationException -> SnodeAPI.handleSnodeError(exception.statusCode, exception.json, snode, publicKey) is HTTPRequestFailedAtDestinationException -> SnodeAPI.handleSnodeError(exception.statusCode, exception.json, snode, publicKey)
is HTTP.HTTPRequestFailedException -> SnodeAPI.handleSnodeError(exception.statusCode, exception.json, snode, publicKey)
else -> null else -> null
} }
if (error != null) { throw error } if (error != null) { throw error }

6
libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt
View File

@ -4,7 +4,9 @@ import okhttp3.HttpUrl
import org.session.libsession.messaging.file_server.FileServerApi import org.session.libsession.messaging.file_server.FileServerApi
import org.session.libsignal.utilities.HTTP import org.session.libsignal.utilities.HTTP
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log
import java.io.* import java.io.File
import java.io.FileOutputStream
import java.io.OutputStream
object DownloadUtilities { object DownloadUtilities {
@ -14,7 +16,7 @@ object DownloadUtilities {
@JvmStatic @JvmStatic
fun downloadFile(destination: File, url: String) { fun downloadFile(destination: File, url: String) {
val outputStream = FileOutputStream(destination) // Throws val outputStream = FileOutputStream(destination) // Throws
var remainingAttempts = 4 var remainingAttempts = 2
var exception: Exception? = null var exception: Exception? = null
while (remainingAttempts > 0) { while (remainingAttempts > 0) {
remainingAttempts -= 1 remainingAttempts -= 1