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 1

Update libsignal-service-java

Browse source
This commit is contained in:
AsamK 2023-04-16 21:18:54 +02:00
parent d2251ccd14
commit 842f13b2fc
3 changed files with 41 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

58
lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
View file

@ -345,29 +345,41 @@ public class SendHelper {
},
() -> false,
urgent);
final SenderKeySenderHandler senderKeySender = (distId, recipients, unidentifiedAccess, isRecipientUpdate) -> {
final var res = messageSender.sendGroupDataMessage(distId,
recipients,
unidentifiedAccess,
isRecipientUpdate,
contentHint,
message,
SignalServiceMessageSender.SenderKeyGroupEvents.EMPTY,
urgent,
false);
synchronized (entryId) {
if (entryId.get() == -1) {
final var newId = messageSendLogStore.insertIfPossible(message.getTimestamp(),
res,
contentHint,
urgent);
entryId.set(newId);
} else {
messageSendLogStore.addRecipientToExistingEntryIfPossible(entryId.get(), res);
}
}
return res;
};
final SenderKeySenderHandler senderKeySender = (distId, recipients, unidentifiedAccess, isRecipientUpdate) -> messageSender.sendGroupDataMessage(
distId,
recipients,
unidentifiedAccess,
isRecipientUpdate,
contentHint,
message,
SignalServiceMessageSender.SenderKeyGroupEvents.EMPTY,
urgent,
false,
sendResult -> {
logger.trace("Partial message send results: {}", sendResult.size());
synchronized (entryId) {
if (entryId.get() == -1) {
final var newId = messageSendLogStore.insertIfPossible(message.getTimestamp(),
sendResult,
contentHint,
urgent);
entryId.set(newId);
} else {
messageSendLogStore.addRecipientToExistingEntryIfPossible(entryId.get(), sendResult);
}
}
synchronized (entryId) {
if (entryId.get() == -1) {
final var newId = messageSendLogStore.insertIfPossible(message.getTimestamp(),
sendResult,
contentHint,
urgent);
entryId.set(newId);
} else {
messageSendLogStore.addRecipientToExistingEntryIfPossible(entryId.get(), sendResult);
}
}
});
final var results = sendGroupMessageInternal(legacySender, senderKeySender, recipientIds, distributionId);
for (var r : results) {

2
settings.gradle.kts
View file

@ -16,7 +16,7 @@ dependencyResolutionManagement {
library("logback", "ch.qos.logback", "logback-classic").version("1.4.6")
library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_68")
library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_69")
library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.22.2")
library("sqlite", "org.xerial", "sqlite-jdbc").version("3.41.2.1")
library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")

6
src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
View file

@ -55,7 +55,11 @@ public class FinishLinkCommand implements JsonRpcMultiCommand<FinishLinkCommand.
} catch (TimeoutException e) {
throw new UserErrorException("Link request timed out, please try again.");
} catch (IOException e) {
throw new IOErrorException("Link request error: " + e.getMessage(), e);
throw new IOErrorException("Link request error: "
+ e.getMessage()
+ " ("
+ e.getClass().getSimpleName()
+ ")", e);
} catch (UserAlreadyExistsException e) {
throw new UserErrorException("The user "
+ e.getNumber()