marvin.weiler/signal-cli-with-http-logging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update libsignal-service

Browse Source 
Fixes #1530
This commit is contained in:
AsamK 2024-06-06 09:37:01 +02:00
parent a2b002ac5e
commit 10b9c264fd
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graalvm-config-dir/reflect-config.json
View File

@ -203,6 +203,9 @@
"name":"java.lang.Class", "name":"java.lang.Class",
"methods":[{"name":"getPermittedSubclasses","parameterTypes":[] }, {"name":"getRecordComponents","parameterTypes":[] }, {"name":"isRecord","parameterTypes":[] }, {"name":"isSealed","parameterTypes":[] }] "methods":[{"name":"getPermittedSubclasses","parameterTypes":[] }, {"name":"getRecordComponents","parameterTypes":[] }, {"name":"isRecord","parameterTypes":[] }, {"name":"isSealed","parameterTypes":[] }]
}, },
{
"name":"java.lang.ClassValue"
},
{ {
"name":"java.lang.Comparable", "name":"java.lang.Comparable",
"allDeclaredMethods":true "allDeclaredMethods":true

11
lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
View File

@ -38,7 +38,7 @@ import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
import org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo; import org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupHistoryEntry; import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupChangeLog;
import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException; import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
import org.whispersystems.signalservice.api.messages.SignalServiceAttachment; import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream; import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
@ -482,11 +482,10 @@ public class GroupHelper {
final var newProfileKeys = new HashMap<RecipientId, ProfileKey>(); final var newProfileKeys = new HashMap<RecipientId, ProfileKey>();
while (true) { while (true) {
final var page = context.getGroupV2Helper().getDecryptedGroupHistoryPage(groupSecretParams, fromRevision); final var page = context.getGroupV2Helper().getDecryptedGroupHistoryPage(groupSecretParams, fromRevision);
page.getResults() page.getChangeLogs()
.stream() .stream()
.map(DecryptedGroupHistoryEntry::getChange) .map(DecryptedGroupChangeLog::getChange)
.filter(Optional::isPresent) .filter(Objects::nonNull)
.map(Optional::get)
.map(context.getGroupV2Helper()::getAuthoritativeProfileKeyFromChange) .map(context.getGroupV2Helper()::getAuthoritativeProfileKeyFromChange)
.filter(Objects::nonNull) .filter(Objects::nonNull)
.forEach(p -> { .forEach(p -> {
@ -495,7 +494,7 @@ public class GroupHelper {
final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId); final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
newProfileKeys.put(recipientId, profileKey); newProfileKeys.put(recipientId, profileKey);
}); });
if (!page.getPagingData().hasMorePages()) { if (!page.getPagingData().getHasMorePages()) {
break; break;
} }
fromRevision = page.getPagingData().getNextPageRevision(); fromRevision = page.getPagingData().getNextPageRevision();

8
lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
View File

@ -23,7 +23,6 @@ import org.whispersystems.signalservice.api.util.CredentialsProvider;
import org.whispersystems.signalservice.api.util.UptimeSleepTimer; import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
import org.whispersystems.signalservice.api.websocket.WebSocketFactory; import org.whispersystems.signalservice.api.websocket.WebSocketFactory;
import org.whispersystems.signalservice.internal.push.PushServiceSocket; import org.whispersystems.signalservice.internal.push.PushServiceSocket;
import org.whispersystems.signalservice.internal.websocket.LibSignalNetwork;
import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection; import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection;
import org.whispersystems.signalservice.internal.websocket.WebSocketConnection; import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
@ -51,7 +50,7 @@ public class SignalDependencies {
private ClientZkOperations clientZkOperations; private ClientZkOperations clientZkOperations;
private PushServiceSocket pushServiceSocket; private PushServiceSocket pushServiceSocket;
private LibSignalNetwork libSignalNetwork; private Network libSignalNetwork;
private SignalWebSocket signalWebSocket; private SignalWebSocket signalWebSocket;
private SignalServiceMessageReceiver messageReceiver; private SignalServiceMessageReceiver messageReceiver;
private SignalServiceMessageSender messageSender; private SignalServiceMessageSender messageSender;
@ -108,10 +107,9 @@ public class SignalDependencies {
ServiceConfig.AUTOMATIC_NETWORK_RETRY)); ServiceConfig.AUTOMATIC_NETWORK_RETRY));
} }
public LibSignalNetwork getLibSignalNetwork() { public Network getLibSignalNetwork() {
return getOrCreate(() -> libSignalNetwork, return getOrCreate(() -> libSignalNetwork,
() -> libSignalNetwork = new LibSignalNetwork(new Network(serviceEnvironmentConfig.netEnvironment(), () -> libSignalNetwork = new Network(serviceEnvironmentConfig.netEnvironment(), userAgent));
userAgent), serviceEnvironmentConfig.signalServiceConfiguration()));
} }
public SignalServiceAccountManager getAccountManager() { public SignalServiceAccountManager getAccountManager() {

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.6") library("logback", "ch.qos.logback", "logback-classic").version("1.5.6")
library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_102") library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_103")
library("sqlite", "org.xerial", "sqlite-jdbc").version("3.46.0.0") library("sqlite", "org.xerial", "sqlite-jdbc").version("3.46.0.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.10.2") library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")