mirror of
https://github.com/AsamK/signal-cli
synced 2025-08-28 18:10:38 +00:00
Update libsignal-service-java
This commit is contained in:
parent
dc787be17b
commit
c924d5c03a
5 changed files with 9 additions and 5 deletions
|
@ -3070,6 +3070,7 @@
|
||||||
{
|
{
|
||||||
"name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record",
|
"name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record",
|
||||||
"allDeclaredFields":true,
|
"allDeclaredFields":true,
|
||||||
|
"fields":[{"name":"archived"}, {"name":"avatarColor"}, {"name":"blocked"}, {"name":"dontNotifyForMentionsIfMuted"}, {"name":"hideStory"}, {"name":"markedUnread"}, {"name":"masterKey"}, {"name":"mutedUntilTimestamp"}, {"name":"storySendMode"}, {"name":"whitelisted"}],
|
||||||
"methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
|
"methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -10,7 +10,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
|
||||||
slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
|
slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
|
||||||
logback = "ch.qos.logback:logback-classic:1.5.18"
|
logback = "ch.qos.logback:logback-classic:1.5.18"
|
||||||
|
|
||||||
signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_126"
|
signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_127"
|
||||||
sqlite = "org.xerial:sqlite-jdbc:3.50.1.0"
|
sqlite = "org.xerial:sqlite-jdbc:3.50.1.0"
|
||||||
hikari = "com.zaxxer:HikariCP:6.3.0"
|
hikari = "com.zaxxer:HikariCP:6.3.0"
|
||||||
junit-jupiter = "org.junit.jupiter:junit-jupiter:5.13.2"
|
junit-jupiter = "org.junit.jupiter:junit-jupiter:5.13.2"
|
||||||
|
|
|
@ -41,6 +41,7 @@ import org.signal.libsignal.metadata.ProtocolNoSessionException;
|
||||||
import org.signal.libsignal.metadata.ProtocolUntrustedIdentityException;
|
import org.signal.libsignal.metadata.ProtocolUntrustedIdentityException;
|
||||||
import org.signal.libsignal.metadata.SelfSendException;
|
import org.signal.libsignal.metadata.SelfSendException;
|
||||||
import org.signal.libsignal.protocol.InvalidMessageException;
|
import org.signal.libsignal.protocol.InvalidMessageException;
|
||||||
|
import org.signal.libsignal.protocol.UsePqRatchet;
|
||||||
import org.signal.libsignal.protocol.groups.GroupSessionBuilder;
|
import org.signal.libsignal.protocol.groups.GroupSessionBuilder;
|
||||||
import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
|
import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
|
||||||
import org.signal.libsignal.zkgroup.InvalidInputException;
|
import org.signal.libsignal.zkgroup.InvalidInputException;
|
||||||
|
@ -105,7 +106,7 @@ public final class IncomingMessageHandler {
|
||||||
try {
|
try {
|
||||||
final var cipherResult = dependencies.getCipher(destination == null
|
final var cipherResult = dependencies.getCipher(destination == null
|
||||||
|| destination.equals(account.getAci()) ? ServiceIdType.ACI : ServiceIdType.PNI)
|
|| destination.equals(account.getAci()) ? ServiceIdType.ACI : ServiceIdType.PNI)
|
||||||
.decrypt(envelope.getProto(), envelope.getServerDeliveredTimestamp());
|
.decrypt(envelope.getProto(), envelope.getServerDeliveredTimestamp(), UsePqRatchet.NO);
|
||||||
content = validate(envelope.getProto(), cipherResult, envelope.getServerDeliveredTimestamp());
|
content = validate(envelope.getProto(), cipherResult, envelope.getServerDeliveredTimestamp());
|
||||||
if (content == null) {
|
if (content == null) {
|
||||||
return new Pair<>(List.of(), null);
|
return new Pair<>(List.of(), null);
|
||||||
|
@ -143,7 +144,7 @@ public final class IncomingMessageHandler {
|
||||||
try {
|
try {
|
||||||
final var cipherResult = dependencies.getCipher(destination == null
|
final var cipherResult = dependencies.getCipher(destination == null
|
||||||
|| destination.equals(account.getAci()) ? ServiceIdType.ACI : ServiceIdType.PNI)
|
|| destination.equals(account.getAci()) ? ServiceIdType.ACI : ServiceIdType.PNI)
|
||||||
.decrypt(envelope.getProto(), envelope.getServerDeliveredTimestamp());
|
.decrypt(envelope.getProto(), envelope.getServerDeliveredTimestamp(), UsePqRatchet.NO);
|
||||||
content = validate(envelope.getProto(), cipherResult, envelope.getServerDeliveredTimestamp());
|
content = validate(envelope.getProto(), cipherResult, envelope.getServerDeliveredTimestamp());
|
||||||
if (content == null) {
|
if (content == null) {
|
||||||
return new Pair<>(List.of(), null);
|
return new Pair<>(List.of(), null);
|
||||||
|
|
|
@ -5,6 +5,7 @@ import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
|
||||||
import org.asamk.signal.manager.util.Utils;
|
import org.asamk.signal.manager.util.Utils;
|
||||||
import org.signal.libsignal.metadata.certificate.CertificateValidator;
|
import org.signal.libsignal.metadata.certificate.CertificateValidator;
|
||||||
import org.signal.libsignal.net.Network;
|
import org.signal.libsignal.net.Network;
|
||||||
|
import org.signal.libsignal.protocol.UsePqRatchet;
|
||||||
import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations;
|
import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
@ -326,7 +327,8 @@ public class SignalDependencies {
|
||||||
Optional.empty(),
|
Optional.empty(),
|
||||||
executor,
|
executor,
|
||||||
ServiceConfig.MAX_ENVELOPE_SIZE,
|
ServiceConfig.MAX_ENVELOPE_SIZE,
|
||||||
() -> true));
|
() -> true,
|
||||||
|
UsePqRatchet.NO));
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<SecureValueRecovery> getSecureValueRecovery() {
|
public List<SecureValueRecovery> getSecureValueRecovery() {
|
||||||
|
|
|
@ -37,7 +37,7 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ContactRecordProcessor.class);
|
private static final Logger logger = LoggerFactory.getLogger(ContactRecordProcessor.class);
|
||||||
|
|
||||||
private static final Pattern E164_PATTERN = Pattern.compile("^\\+[1-9]\\d{0,18}$");
|
private static final Pattern E164_PATTERN = Pattern.compile("^\\+[1-9]\\d{6,18}$");
|
||||||
|
|
||||||
private final ACI selfAci;
|
private final ACI selfAci;
|
||||||
private final PNI selfPni;
|
private final PNI selfPni;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue