Skip to content

Commit 6dc0f85

Browse files
Fix bad merge of CONTENT_TYPE_JSON consolidation
1 parent 2e27966 commit 6dc0f85

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

rust/net/chat/src/ws/keytrans.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ use async_trait::async_trait;
99
use base64::prelude::{
1010
Engine as _, BASE64_STANDARD, BASE64_STANDARD_NO_PAD, BASE64_URL_SAFE_NO_PAD,
1111
};
12-
use http::header::{ACCEPT, CONTENT_TYPE};
12+
use http::header::ACCEPT;
1313
use http::uri::PathAndQuery;
1414
use libsignal_core::{Aci, E164};
1515
use libsignal_keytrans::{AccountData, LastTreeHead};
1616
use libsignal_net::chat;
1717
use libsignal_protocol::PublicKey;
1818
use serde::{Deserialize, Serialize};
1919

20-
use super::{TryIntoResponse as _, WsConnection, JSON_CONTENT_TYPE};
20+
use super::{TryIntoResponse as _, WsConnection, CONTENT_TYPE_JSON};
2121
use crate::api::keytrans::*;
2222
use crate::api::{RequestError, Unauth};
2323

@@ -26,10 +26,7 @@ const DISTINGUISHED_PATH: &str = "/v1/key-transparency/distinguished";
2626
const MONITOR_PATH: &str = "/v1/key-transparency/monitor";
2727

2828
fn common_headers() -> http::HeaderMap {
29-
http::HeaderMap::from_iter([
30-
(CONTENT_TYPE, JSON_CONTENT_TYPE),
31-
(ACCEPT, JSON_CONTENT_TYPE),
32-
])
29+
http::HeaderMap::from_iter([CONTENT_TYPE_JSON, (ACCEPT, CONTENT_TYPE_JSON.1)])
3330
}
3431

3532
/// String representation of a value to be sent in chat server JSON requests.

0 commit comments

Comments
 (0)