Skip to content

Commit 2236c65

Browse files
committed
Merge branch 'fix/1.4.x'
2 parents 2bfed9f + 78c7c13 commit 2236c65

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/extension/UserRequestConversionExtension.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ fun HttpRequest.toApacheHttpRequest(): Pair<AsyncRequestProducer, Long> {
215215
*(entity.trailers?.get()?.toTypedArray() ?: emptyArray())
216216
)
217217
}
218-
is StringBody -> AsyncEntityProducers.create(body.value)
218+
is StringBody -> AsyncEntityProducers.create(body.value, Charsets.UTF_8)
219219
null -> null
220220
else -> throw UnsupportedOperationException()
221221
}

src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/model/HttpRequest.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ data class HttpRequest(
1414
val extra: Any? = null
1515
) {
1616
fun getResolvedUri(): URI {
17-
return URIBuilder(url)
17+
return URIBuilder(url.replace(" ", "+"))
1818
.run {
1919
var b = this
2020
queryParameters.forEach {
@@ -23,5 +23,6 @@ data class HttpRequest(
2323
b
2424
}
2525
.build()
26+
.let { URI.create(it.toASCIIString()) }
2627
}
2728
}

src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/RequestEditorView.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ fun RequestEditorView(
138138
val hasPayloadEditor = (request.application == ProtocolApplication.WebSocket
139139
|| (request.application == ProtocolApplication.Grpc && currentGrpcMethod?.isClientStreaming == true)
140140
)
141-
var selectedPayloadExampleId by rememberLast(request.id) { mutableStateOf(request.payloadExamples?.firstOrNull()?.id) }
141+
var selectedPayloadExampleId by rememberLast(request.id, request.application) { mutableStateOf(request.payloadExamples?.firstOrNull()?.id) }
142142

143143
val isEnableSendButton = when (connectionStatus.isConnectionActive()) {
144144
true -> true

0 commit comments

Comments
 (0)