webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 02:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update libsignal-service

Browse source
This commit is contained in:
AsamK 2024-10-14 22:06:01 +02:00
parent eac2a47163
commit 9afd4e4328
6 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
View file

@ -390,7 +390,7 @@ public record MessageEnvelope(
} }
public record Name( public record Name(
Optional<String> display, Optional<String> nickname,
Optional<String> given, Optional<String> given,
Optional<String> family, Optional<String> family,
Optional<String> prefix, Optional<String> prefix,
@ -399,7 +399,7 @@ public record MessageEnvelope(
) { ) {
static Name from(org.whispersystems.signalservice.api.messages.shared.SharedContact.Name name) { static Name from(org.whispersystems.signalservice.api.messages.shared.SharedContact.Name name) {
return new Name(name.getDisplay(), return new Name(name.getNickname(),
name.getGiven(), name.getGiven(),
name.getFamily(), name.getFamily(),
name.getPrefix(), name.getPrefix(),

5
lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
View file

@ -28,7 +28,8 @@ class LiveConfig {
private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder() private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
.decode("BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF"); .decode("BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF");
private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57"; private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
private static final String SVR2_MRENCLAVE = "a6622ad4656e1abcd0bc0ff17c229477747d2ded0495c4ebee7ed35c1789fa97"; private static final String SVR2_MRENCLAVE = "9314436a9a144992bb3680770ea5fd7934a7ffd29257844a33763a238903d570";
private static final String SVR2_LEGACY_MRENCLAVE = "a6622ad4656e1abcd0bc0ff17c229477747d2ded0495c4ebee7ed35c1789fa97";
private static final String URL = "https://chat.signal.org"; private static final String URL = "https://chat.signal.org";
private static final String CDN_URL = "https://cdn.signal.org"; private static final String CDN_URL = "https://cdn.signal.org";
@ -87,7 +88,7 @@ class LiveConfig {
createDefaultServiceConfiguration(interceptors), createDefaultServiceConfiguration(interceptors),
getUnidentifiedSenderTrustRoot(), getUnidentifiedSenderTrustRoot(),
CDSI_MRENCLAVE, CDSI_MRENCLAVE,
List.of(SVR2_MRENCLAVE)); List.of(SVR2_MRENCLAVE, SVR2_LEGACY_MRENCLAVE));
} }
private LiveConfig() { private LiveConfig() {

5
lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
View file

@ -28,7 +28,8 @@ class StagingConfig {
private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder() private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
.decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx"); .decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx");
private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57"; private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
private static final String SVR2_MRENCLAVE = "acb1973aa0bbbd14b3b4e06f145497d948fd4a98efc500fcce363b3b743ec482"; private static final String SVR2_MRENCLAVE = "38e01eff4fe357dc0b0e8ef7a44b4abc5489fbccba3a78780f3872c277f62bf3";
private static final String SVR2_LEGACY_MRENCLAVE = "acb1973aa0bbbd14b3b4e06f145497d948fd4a98efc500fcce363b3b743ec482";
private static final String URL = "https://chat.staging.signal.org"; private static final String URL = "https://chat.staging.signal.org";
private static final String CDN_URL = "https://cdn-staging.signal.org"; private static final String CDN_URL = "https://cdn-staging.signal.org";
@ -87,7 +88,7 @@ class StagingConfig {
createDefaultServiceConfiguration(interceptors), createDefaultServiceConfiguration(interceptors),
getUnidentifiedSenderTrustRoot(), getUnidentifiedSenderTrustRoot(),
CDSI_MRENCLAVE, CDSI_MRENCLAVE,
List.of(SVR2_MRENCLAVE)); List.of(SVR2_MRENCLAVE, SVR2_LEGACY_MRENCLAVE));
} }
private StagingConfig() { private StagingConfig() {

2
settings.gradle.kts
View file

@ -15,7 +15,7 @@ dependencyResolutionManagement {
library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j") library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
library("logback", "ch.qos.logback", "logback-classic").version("1.5.8") library("logback", "ch.qos.logback", "logback-classic").version("1.5.8")
library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_108") library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_109")
library("sqlite", "org.xerial", "sqlite-jdbc").version("3.46.1.0") library("sqlite", "org.xerial", "sqlite-jdbc").version("3.46.1.0")
library("hikari", "com.zaxxer", "HikariCP").version("5.1.0") library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.11.0") library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.11.0")

6
src/main/java/org/asamk/signal/ReceiveMessageHandler.java
View file

@ -448,9 +448,6 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
writer.println("Name:"); writer.println("Name:");
var name = contact.name(); var name = contact.name();
writer.indent(w -> { writer.indent(w -> {
if (name.display().isPresent() && !name.display().get().isBlank()) {
w.println("Display name: {}", name.display().get());
}
if (name.given().isPresent() && !name.given().get().isBlank()) { if (name.given().isPresent() && !name.given().get().isBlank()) {
w.println("First name: {}", name.given().get()); w.println("First name: {}", name.given().get());
} }
@ -466,6 +463,9 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
if (name.suffix().isPresent() && !name.suffix().get().isBlank()) { if (name.suffix().isPresent() && !name.suffix().get().isBlank()) {
w.println("Suffix name: {}", name.suffix().get()); w.println("Suffix name: {}", name.suffix().get());
} }
if (name.nickname().isPresent() && !name.nickname().get().isBlank()) {
w.println("Display name: {}", name.nickname().get());
}
}); });
if (contact.avatar().isPresent()) { if (contact.avatar().isPresent()) {

4
src/main/java/org/asamk/signal/json/JsonContactName.java
View file

@ -4,11 +4,11 @@ import org.asamk.signal.manager.api.MessageEnvelope;
import org.asamk.signal.util.Util; import org.asamk.signal.util.Util;
public record JsonContactName( public record JsonContactName(
String display, String given, String family, String prefix, String suffix, String middle String nickname, String given, String family, String prefix, String suffix, String middle
) { ) {
static JsonContactName from(MessageEnvelope.Data.SharedContact.Name name) { static JsonContactName from(MessageEnvelope.Data.SharedContact.Name name) {
return new JsonContactName(Util.getStringIfNotBlank(name.display()), return new JsonContactName(Util.getStringIfNotBlank(name.nickname()),
Util.getStringIfNotBlank(name.given()), Util.getStringIfNotBlank(name.given()),
Util.getStringIfNotBlank(name.family()), Util.getStringIfNotBlank(name.family()),
Util.getStringIfNotBlank(name.prefix()), Util.getStringIfNotBlank(name.prefix()),