Compare commits

...

7 commits

Author SHA1 Message Date
adbenitez
183cb03577 set new calls-related stock strings 2025-10-02 17:09:28 +02:00
adbenitez
b1e6d59ba9 now it is CallState.Canceled not CallState.Cancelled 2025-10-02 17:05:43 +02:00
adb
33f38889c1
Merge branch 'adb/new-rpc-bindings' into adb/integrated-videocalls 2025-10-02 15:45:19 +02:00
adbenitez
f97e800907 update core 2025-10-02 15:44:49 +02:00
adbenitez
21e597d09e add instructions on JSON-RPC binding generation 2025-10-02 15:28:21 +02:00
adbenitez
6b040b160d update changelog 2025-10-02 15:11:00 +02:00
adbenitez
57e5523bf3 update core to v2.16.0 2025-10-02 15:07:01 +02:00
7 changed files with 35 additions and 8 deletions

View file

@ -15,7 +15,7 @@
* properly display "Messages are end-to-end encrypted." in all encrypted groups
* several small fixes and improvements
* add experimental built-in calls
* update to core 2.13.0
* update to core 2.16.0
## v2.11.0
2025-08

View file

@ -23,6 +23,28 @@ subproject _deltachat-core-rust_:
or later by `git submodule update --init --recursive`. If you do this in your
home directory, this results in the folder `~/deltachat-android` which is just fine.
# Generate JSON-RPC bindings
To generate the JSON-RPC bindings (ex. `chat.delta.rpc.*` package)
install the [dcrpcgen tool](https://github.com/chatmail/dcrpcgen)
then generate the `schema.json` file:
```
# install deltachat-rpc-server program:
cargo install --path ./jni/deltachat-core-rust/deltachat-rpc-server
# check the version of core matches:
deltachat-rpc-server --version
# generate the schema:
deltachat-rpc-server --openrpc > schema.json
```
then pass the schema file to the `dcrpcgen` tool to generate the
code:
```
dcrpcgen java --schema schema.json -o ./src/main/java/
```
# Build Using Nix
The repository contains [Nix](https://nixos.org/) development environment

@ -1 +1 @@
Subproject commit ba2e573c2358f7c29bf3ad3bb082dd74da167261
Subproject commit 570a9993f73ad8d186a3ed810a185e0ca7e1f5ca

View file

@ -13,7 +13,7 @@ public class CallInfo {
/**
* Call state.
* <p>
* For example, if the call is accepted, active, cancelled, declined etc.
* For example, if the call is accepted, active, canceled, declined etc.
*/
public CallState state;
}

View file

@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
@JsonTypeInfo(use=Id.NAME, include=As.PROPERTY, property="kind")
@JsonSubTypes({@Type(value = CallState.Alerting.class, name="Alerting"), @Type(value = CallState.Active.class, name="Active"), @Type(value = CallState.Completed.class, name="Completed"), @Type(value = CallState.Missed.class, name="Missed"), @Type(value = CallState.Declined.class, name="Declined"), @Type(value = CallState.Cancelled.class, name="Cancelled")})
@JsonSubTypes({@Type(value = CallState.Alerting.class, name="Alerting"), @Type(value = CallState.Active.class, name="Active"), @Type(value = CallState.Completed.class, name="Completed"), @Type(value = CallState.Missed.class, name="Missed"), @Type(value = CallState.Declined.class, name="Declined"), @Type(value = CallState.Canceled.class, name="Canceled")})
public abstract class CallState {
/**
@ -38,11 +38,11 @@ public abstract class CallState {
}
/**
* Outgoing call that has been cancelled on our side before receiving a response.
* Outgoing call that has been canceled on our side before receiving a response.
* <p>
* Incoming calls cannot be cancelled, on the receiver side cancelled calls usually result in missed calls.
* Incoming calls cannot be canceled, on the receiver side canceled calls usually result in missed calls.
*/
public static class Cancelled extends CallState {
public static class Canceled extends CallState {
}
}

View file

@ -63,7 +63,7 @@ public class CallItemView extends FrameLayout {
if (callInfo.state instanceof CallState.Missed) {
title.setText(R.string.missed_call);
} else if (callInfo.state instanceof CallState.Cancelled) {
} else if (callInfo.state instanceof CallState.Canceled) {
title.setText(R.string.canceled_call);
} else if (callInfo.state instanceof CallState.Declined) {
title.setText(R.string.declined_call);

View file

@ -244,6 +244,11 @@ public class DcHelper {
dcContext.setStockTranslation(177, context.getString(R.string.reaction_by_other));
dcContext.setStockTranslation(190, context.getString(R.string.secure_join_wait));
dcContext.setStockTranslation(193, context.getString(R.string.donate_device_msg));
dcContext.setStockTranslation(194, context.getString(R.string.outgoing_call));
dcContext.setStockTranslation(195, context.getString(R.string.incoming_call));
dcContext.setStockTranslation(196, context.getString(R.string.declined_call));
dcContext.setStockTranslation(197, context.getString(R.string.canceled_call));
dcContext.setStockTranslation(198, context.getString(R.string.missed_call));
}
public static File getImexDir() {