rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Whitespce

Browse Source
This commit is contained in:
Hugh Nimmo-Smith 2022-10-18 09:31:13 +01:00
parent a1d2944c32
commit 57a8dd4a1f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
View File

@ -81,7 +81,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
private var aesKey: ByteArray? = null private var aesKey: ByteArray? = null
init { init {
theirPublicKeyBase64 ?.let { theirPublicKeyBase64?.let {
theirPublicKey = Base64.decode(it, Base64.NO_WRAP) theirPublicKey = Base64.decode(it, Base64.NO_WRAP)
} }
olmSAS = OlmSAS() olmSAS = OlmSAS()
@ -142,7 +142,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
} }
private suspend fun receiveAsPayload(): ECDHPayload? { private suspend fun receiveAsPayload(): ECDHPayload? {
transport.receive()?.toString(Charsets.UTF_8) ?.let { transport.receive()?.toString(Charsets.UTF_8)?.let {
return ecdhAdapter.fromJson(it) return ecdhAdapter.fromJson(it)
} ?: return null } ?: return null
} }

8
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
View File

@ -69,7 +69,7 @@ class SimpleHttpRendezvousTransport(rendezvousUri: String?) : RendezvousTranspor
.method(method, data.toRequestBody()) .method(method, data.toRequestBody())
.header("content-type", contentType.toString()) .header("content-type", contentType.toString())
etag ?.let { etag?.let {
request.header("if-match", it) request.header("if-match", it)
} }
@ -85,7 +85,7 @@ class SimpleHttpRendezvousTransport(rendezvousUri: String?) : RendezvousTranspor
if (method == "POST") { if (method == "POST") {
val location = response.header("location") ?: throw RuntimeException("No rendezvous URI found in response") val location = response.header("location") ?: throw RuntimeException("No rendezvous URI found in response")
response.header("expires") ?.let { response.header("expires")?.let {
val format = SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz") val format = SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz")
expiresAt = format.parse(it) expiresAt = format.parse(it)
} }
@ -108,7 +108,7 @@ class SimpleHttpRendezvousTransport(rendezvousUri: String?) : RendezvousTranspor
.url(uri) .url(uri)
.get() .get()
etag ?.let { etag?.let {
request.header("if-none-match", it) request.header("if-none-match", it)
} }
@ -154,7 +154,7 @@ class SimpleHttpRendezvousTransport(rendezvousUri: String?) : RendezvousTranspor
cancelled = true cancelled = true
ready = false ready = false
uri ?.let { uri?.let {
try { try {
val httpClient = okhttp3.OkHttpClient.Builder().build() val httpClient = okhttp3.OkHttpClient.Builder().build()
val request = Request.Builder() val request = Request.Builder()