Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-09 01:46:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Do not serialize is_default

Browse Source 
It is only stored for compatibility with old versions
This commit is contained in:
link2xt
2024-04-06 15:26:48 +00:00
parent e9f434b562
commit 60a7bbc9b5
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/deserialize.rs
View File

@@ -772,13 +772,11 @@ VALUES (:folder,
INSERT INTO INSERT INTO
keypairs (id, keypairs (id,
addr, addr,
is_default,
private_key, private_key,
public_key, public_key,
created) created)
VALUES (:id, VALUES (:id,
:addr, :addr,
:is_default,
:private_key, :private_key,
:public_key, :public_key,
:created)", :created)",
@@ -796,9 +794,6 @@ VALUES (:id,
self.expect_key("id").await?; self.expect_key("id").await?;
let id = self.expect_u32().await?; let id = self.expect_u32().await?;
self.expect_key("is_default").await?;
let is_default = self.expect_bool().await?;
self.expect_key("private_key").await?; self.expect_key("private_key").await?;
let private_key = self.expect_blob().await?; let private_key = self.expect_blob().await?;
@@ -810,7 +805,6 @@ VALUES (:id,
stmt.execute(named_params! { stmt.execute(named_params! {
":id": id, ":id": id,
":addr": addr, ":addr": addr,
":is_default": is_default,
":private_key": private_key, ":private_key": private_key,
":public_key": public_key, ":public_key": public_key,
":created": created, ":created": created,

7
src/sql/serialize.rs
View File

@@ -469,15 +469,13 @@ impl<'a, W: AsyncWrite + Unpin> Encoder<'a, W> {
async fn serialize_keypairs(&mut self) -> Result<()> { async fn serialize_keypairs(&mut self) -> Result<()> {
let mut stmt = self let mut stmt = self
.tx .tx
.prepare("SELECT id,addr,is_default,private_key,public_key,created FROM keypairs")?; .prepare("SELECT id,addr,private_key,public_key,created FROM keypairs")?;
let mut rows = stmt.query(())?; let mut rows = stmt.query(())?;
self.w.write_all(b"l").await?; self.w.write_all(b"l").await?;
while let Some(row) = rows.next()? { while let Some(row) = rows.next()? {
let id: u32 = row.get("id")?; let id: u32 = row.get("id")?;
let addr: String = row.get("addr")?; let addr: String = row.get("addr")?;
let is_default: u32 = row.get("is_default")?;
let is_default = is_default != 0;
let private_key: Vec<u8> = row.get("private_key")?; let private_key: Vec<u8> = row.get("private_key")?;
let public_key: Vec<u8> = row.get("public_key")?; let public_key: Vec<u8> = row.get("public_key")?;
let created: i64 = row.get("created")?; let created: i64 = row.get("created")?;
@@ -493,9 +491,6 @@ impl<'a, W: AsyncWrite + Unpin> Encoder<'a, W> {
write_str(&mut self.w, "id").await?; write_str(&mut self.w, "id").await?;
write_u32(&mut self.w, id).await?; write_u32(&mut self.w, id).await?;
write_str(&mut self.w, "is_default").await?;
write_bool(&mut self.w, is_default).await?;
write_str(&mut self.w, "private_key").await?; write_str(&mut self.w, "private_key").await?;
write_bytes(&mut self.w, &private_key).await?; write_bytes(&mut self.w, &private_key).await?;