Skip to content

Commit 051e8a9

Browse files
committed
Address PR review feedback
1 parent d878b40 commit 051e8a9

4 files changed

Lines changed: 13 additions & 8 deletions

File tree

templates/android/library/src/main/java/io/package/Client.kt.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ class Client @JvmOverloads constructor(
239239
*
240240
* @return the OkHttpClient instance used by this client
241241
*/
242-
fun getHttpClient(): OkHttpClient = http.newBuilder().build()
242+
fun getHttpClient(): OkHttpClient = http
243243

244244
/**
245245
* Sends a "ping" request to Appwrite to verify connectivity.

templates/rust/src/client.rs.twig

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,16 @@ impl Client {
272272
.config
273273
.headers
274274
.iter()
275-
.filter_map(|(key, value)| {
276-
value
277-
.to_str()
278-
.ok()
279-
.map(|value| (key.as_str().to_string(), value.to_string()))
275+
.filter_map(|(key, value)| match value.to_str() {
276+
Ok(value) => Some((key.as_str().to_string(), value.to_string())),
277+
Err(_) => {
278+
debug_assert!(
279+
false,
280+
"Non-UTF-8 header value found for key {}",
281+
key.as_str()
282+
);
283+
None
284+
}
280285
})
281286
.collect()
282287
}

tests/languages/apple/Tests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class Tests: XCTestCase {
2525
.addHeader(key: "Origin", value: "http://localhost")
2626
.setSelfSigned()
2727
let sdkHeaders = client.getHeaders()
28-
print("x-sdk-name: \(sdkHeaders["x-sdk-name"]!); x-sdk-platform: \(sdkHeaders["x-sdk-platform"]!); x-sdk-language: \(sdkHeaders["x-sdk-language"]!); x-sdk-version: \(sdkHeaders["x-sdk-version"]!)")
28+
print("x-sdk-name: \(sdkHeaders["x-sdk-name"] ?? "nil"); x-sdk-platform: \(sdkHeaders["x-sdk-platform"] ?? "nil"); x-sdk-language: \(sdkHeaders["x-sdk-language"] ?? "nil"); x-sdk-version: \(sdkHeaders["x-sdk-version"] ?? "nil")")
2929

3030
// Ping pong test
3131
let ping = try await client.ping()

tests/languages/swift/Tests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class Tests: XCTestCase {
2525
.addHeader(key: "Origin", value: "http://localhost")
2626
.setSelfSigned()
2727
let sdkHeaders = client.getHeaders()
28-
print("x-sdk-name: \(sdkHeaders["x-sdk-name"]!); x-sdk-platform: \(sdkHeaders["x-sdk-platform"]!); x-sdk-language: \(sdkHeaders["x-sdk-language"]!); x-sdk-version: \(sdkHeaders["x-sdk-version"]!)")
28+
print("x-sdk-name: \(sdkHeaders["x-sdk-name"] ?? "nil"); x-sdk-platform: \(sdkHeaders["x-sdk-platform"] ?? "nil"); x-sdk-language: \(sdkHeaders["x-sdk-language"] ?? "nil"); x-sdk-version: \(sdkHeaders["x-sdk-version"] ?? "nil")")
2929

3030
// Ping pong test
3131
let ping = try await client.ping()

0 commit comments

Comments
 (0)