TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-23 20:11:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keep path prefixes for v4 endpoints

Browse Source
This commit is contained in:
ceokot 2022-04-01 08:56:50 +02:00
parent 5f9d323525
commit 52b222cf8e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -477,7 +477,7 @@ object OnionRequestAPI {
val urlAsString = url.toString() val urlAsString = url.toString()
val body = request.getBodyForOnionRequest() ?: "null" val body = request.getBodyForOnionRequest() ?: "null"
val endpoint = when { val endpoint = when {
server.count() < urlAsString.count() -> urlAsString.substringAfter(server).removePrefix("/") server.count() < urlAsString.count() -> urlAsString.substringAfter(server)
else -> "" else -> ""
} }
return if (version == Version.V4) { return if (version == Version.V4) {
@ -505,7 +505,7 @@ object OnionRequestAPI {
} else { } else {
val payload = mapOf( val payload = mapOf(
"body" to body, "body" to body,
"endpoint" to endpoint, "endpoint" to endpoint.removePrefix("/"),
"method" to request.method(), "method" to request.method(),
"headers" to headers "headers" to headers
) )
@ -555,6 +555,9 @@ object OnionRequestAPI {
responseInfo, responseInfo,
destination.description destination.description
) )
val message = plaintextString.substring(infoEndIndex)
.split(":").last().dropLast(1)
Log.d("Loki", "Response body: $message")
return deferred.reject(exception) return deferred.reject(exception)
} }
} }
@ -651,8 +654,4 @@ object OnionRequestAPI {
V4("/oxen/v4/lsrpc"); V4("/oxen/v4/lsrpc");
} }
data class ResponseInfo(
val code: String,
val headers: Map<String, String>
)
} }