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

Merge v1.112.3

Browse Source
This commit is contained in:
link2xt
2023-03-30 20:37:43 +00:00
parent c4cf0f12c9 e612927c5d
commit 0073a09da6
10 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -7,6 +7,10 @@
### Fixes ### Fixes
## [1.112.3] - 2023-03-30
### Fixes
- `transfer::get_backup` now frees ongoing process when cancelled. #4249
## [1.112.2] - 2023-03-30 ## [1.112.2] - 2023-03-30
@@ -18,7 +22,6 @@
### Fixes ### Fixes
- Do not return media from trashed messages in the "All media" view. #4247 - Do not return media from trashed messages in the "All media" view. #4247
## [1.112.1] - 2023-03-27 ## [1.112.1] - 2023-03-27
### Changes ### Changes
@@ -2354,3 +2357,4 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
[1.112.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.111.0...v1.112.0 [1.112.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.111.0...v1.112.0
[1.112.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.0...v1.112.1 [1.112.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.0...v1.112.1
[1.112.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.1...v1.112.2 [1.112.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.1...v1.112.2
[1.112.3]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.2...v1.112.3

10
Cargo.lock generated
View File

@@ -1061,7 +1061,7 @@ dependencies = [
[[package]] [[package]]
name = "deltachat" name = "deltachat"
version = "1.112.2" version = "1.112.3"
dependencies = [ dependencies = [
"ansi_term", "ansi_term",
"anyhow", "anyhow",
@@ -1135,7 +1135,7 @@ dependencies = [
[[package]] [[package]]
name = "deltachat-jsonrpc" name = "deltachat-jsonrpc"
version = "1.112.2" version = "1.112.3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-channel", "async-channel",
@@ -1158,7 +1158,7 @@ dependencies = [
[[package]] [[package]]
name = "deltachat-repl" name = "deltachat-repl"
version = "1.112.2" version = "1.112.3"
dependencies = [ dependencies = [
"ansi_term", "ansi_term",
"anyhow", "anyhow",
@@ -1173,7 +1173,7 @@ dependencies = [
[[package]] [[package]]
name = "deltachat-rpc-server" name = "deltachat-rpc-server"
version = "1.112.2" version = "1.112.3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"deltachat", "deltachat",
@@ -1197,7 +1197,7 @@ dependencies = [
[[package]] [[package]]
name = "deltachat_ffi" name = "deltachat_ffi"
version = "1.112.2" version = "1.112.3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"deltachat", "deltachat",

2
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "deltachat" name = "deltachat"
version = "1.112.2" version = "1.112.3"
edition = "2021" edition = "2021"
license = "MPL-2.0" license = "MPL-2.0"
rust-version = "1.64" rust-version = "1.64"

2
deltachat-ffi/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "deltachat_ffi" name = "deltachat_ffi"
version = "1.112.2" version = "1.112.3"
description = "Deltachat FFI" description = "Deltachat FFI"
edition = "2018" edition = "2018"
readme = "README.md" readme = "README.md"

2
deltachat-jsonrpc/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "deltachat-jsonrpc" name = "deltachat-jsonrpc"
version = "1.112.2" version = "1.112.3"
description = "DeltaChat JSON-RPC API" description = "DeltaChat JSON-RPC API"
edition = "2021" edition = "2021"
default-run = "deltachat-jsonrpc-server" default-run = "deltachat-jsonrpc-server"

2
deltachat-jsonrpc/typescript/package.json
View File

@@ -55,5 +55,5 @@
}, },
"type": "module", "type": "module",
"types": "dist/deltachat.d.ts", "types": "dist/deltachat.d.ts",
"version": "1.112.2" "version": "1.112.3"
} }

2
deltachat-repl/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "deltachat-repl" name = "deltachat-repl"
version = "1.112.2" version = "1.112.3"
license = "MPL-2.0" license = "MPL-2.0"
edition = "2021" edition = "2021"

2
deltachat-rpc-server/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "deltachat-rpc-server" name = "deltachat-rpc-server"
version = "1.112.2" version = "1.112.3"
description = "DeltaChat JSON-RPC server" description = "DeltaChat JSON-RPC server"
edition = "2021" edition = "2021"
readme = "README.md" readme = "README.md"

2
package.json
View File

@@ -60,5 +60,5 @@
"test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit" "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit"
}, },
"types": "node/dist/index.d.ts", "types": "node/dist/index.d.ts",
"version": "1.112.2" "version": "1.112.3"
} }

6
src/imex/transfer.rs
View File

@@ -392,12 +392,10 @@ pub async fn get_backup(context: &Context, qr: Qr) -> Result<()> {
let cancel_token = context.alloc_ongoing().await?; let cancel_token = context.alloc_ongoing().await?;
let res = tokio::select! { let res = tokio::select! {
biased; biased;
res = get_backup_inner(context, qr) => { res = get_backup_inner(context, qr) => res,
context.free_ongoing().await;
res
}
_ = cancel_token.recv() => Err(format_err!("cancelled")), _ = cancel_token.recv() => Err(format_err!("cancelled")),
}; };
context.free_ongoing().await;
res res
} }