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 2023-09-24 18:03:38 +02:00
parent da7428d6bd
commit fed2c94431
2 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
View file

@ -60,7 +60,6 @@ import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
import org.whispersystems.signalservice.api.messages.SignalServiceGroup; import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
import org.whispersystems.signalservice.api.messages.SignalServiceGroupContext; import org.whispersystems.signalservice.api.messages.SignalServiceGroupContext;
import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2; import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
import org.whispersystems.signalservice.api.messages.SignalServiceMetadata;
import org.whispersystems.signalservice.api.messages.SignalServicePniSignatureMessage; import org.whispersystems.signalservice.api.messages.SignalServicePniSignatureMessage;
import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage; import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
import org.whispersystems.signalservice.api.messages.SignalServiceStoryMessage; import org.whispersystems.signalservice.api.messages.SignalServiceStoryMessage;
@ -228,20 +227,11 @@ public final class IncomingMessageHandler {
return null; return null;
} }
final var localAddress = new SignalServiceAddress(envelopeMetadata.getDestinationServiceId(), return SignalServiceContent.Companion.createFrom(account.getNumber(),
Optional.ofNullable(account.getNumber())); envelope,
final var metadata = new SignalServiceMetadata(new SignalServiceAddress(envelopeMetadata.getSourceServiceId(), envelopeMetadata,
Optional.ofNullable(envelopeMetadata.getSourceE164())), content,
envelopeMetadata.getSourceDeviceId(), serverDeliveredTimestamp);
envelope.timestamp,
envelope.serverTimestamp,
serverDeliveredTimestamp,
envelopeMetadata.getSealedSender(),
envelope.serverGuid,
Optional.ofNullable(envelopeMetadata.getGroupId()),
envelopeMetadata.getDestinationServiceId().toString());
return SignalServiceContent.createFrom(localAddress, metadata, content);
} }
private List<HandleAction> checkAndHandleMessage( private List<HandleAction> checkAndHandleMessage(

2
settings.gradle.kts
View file

@ -16,7 +16,7 @@ dependencyResolutionManagement {
library("logback", "ch.qos.logback", "logback-classic").version("1.4.11") library("logback", "ch.qos.logback", "logback-classic").version("1.4.11")
library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_81") library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_82")
library("sqlite", "org.xerial", "sqlite-jdbc").version("3.43.0.0") library("sqlite", "org.xerial", "sqlite-jdbc").version("3.43.0.0")
library("hikari", "com.zaxxer", "HikariCP").version("5.0.1") library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
library("junit", "org.junit.jupiter", "junit-jupiter").version("5.10.0") library("junit", "org.junit.jupiter", "junit-jupiter").version("5.10.0")