nik/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli.git synced 2026-09-01 06:28:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't send read receipt if disabled in configuration

Browse Source 
Only send sync read message in this case
This commit is contained in:
AsamK 2026-07-12 10:50:43 +02:00
parent 4f4a4b9fb4
commit fd98cce8b3
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
View File

@ -794,13 +794,20 @@ public class ManagerImpl implements Manager {
) { ) {
try { try {
final var recipientId = context.getRecipientHelper().resolveRecipient(sender); final var recipientId = context.getRecipientHelper().resolveRecipient(sender);
final var result = context.getSendHelper().sendReceiptMessage(receiptMessage, recipientId); List<SendMessageResult> results;
if (receiptMessage.isDeliveryReceipt() || !Boolean.FALSE.equals(account.getConfigurationStore()
.getReadReceipts())) {
final var result = context.getSendHelper().sendReceiptMessage(receiptMessage, recipientId);
results = List.of(toSendMessageResult(result));
} else {
results = List.of();
}
final var aci = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId).aci(); final var aci = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId).aci();
if (aci.isPresent()) { if (aci.isPresent()) {
context.getSyncHelper().sendSyncReceiptMessage(aci.get(), receiptMessage); context.getSyncHelper().sendSyncReceiptMessage(aci.get(), receiptMessage);
} }
return new SendMessageResults(timestamp, Map.of(sender, List.of(toSendMessageResult(result)))); return new SendMessageResults(timestamp, Map.of(sender, results));
} catch (UnregisteredRecipientException e) { } catch (UnregisteredRecipientException e) {
return new SendMessageResults(timestamp, return new SendMessageResults(timestamp,
Map.of(sender, List.of(SendMessageResult.unregisteredFailure(sender.toPartialRecipientAddress())))); Map.of(sender, List.of(SendMessageResult.unregisteredFailure(sender.toPartialRecipientAddress()))));
@ -1870,7 +1877,7 @@ public class ManagerImpl implements Manager {
var callMessage = SignalServiceCallMessage.forOffer(offerMessage, null); var callMessage = SignalServiceCallMessage.forOffer(offerMessage, null);
try { try {
dependencies.getMessageSender().sendCallMessage(address, null, callMessage); dependencies.getMessageSender().sendCallMessage(address, null, callMessage);
} catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) { } catch (UntrustedIdentityException e) {
throw new IOException("Untrusted identity for call recipient", e); throw new IOException("Untrusted identity for call recipient", e);
} catch (NoSessionException e) { } catch (NoSessionException e) {
throw new IOException("No session for call recipient", e); throw new IOException("No session for call recipient", e);
@ -1889,7 +1896,7 @@ public class ManagerImpl implements Manager {
var callMessage = SignalServiceCallMessage.forAnswer(answerMessage, null); var callMessage = SignalServiceCallMessage.forAnswer(answerMessage, null);
try { try {
dependencies.getMessageSender().sendCallMessage(address, null, callMessage); dependencies.getMessageSender().sendCallMessage(address, null, callMessage);
} catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) { } catch (UntrustedIdentityException e) {
throw new IOException("Untrusted identity for call recipient", e); throw new IOException("Untrusted identity for call recipient", e);
} catch (NoSessionException e) { } catch (NoSessionException e) {
throw new IOException("No session for call recipient", e); throw new IOException("No session for call recipient", e);
@ -1908,7 +1915,7 @@ public class ManagerImpl implements Manager {
var callMessage = SignalServiceCallMessage.forIceUpdates(iceUpdates, null); var callMessage = SignalServiceCallMessage.forIceUpdates(iceUpdates, null);
try { try {
dependencies.getMessageSender().sendCallMessage(address, null, callMessage); dependencies.getMessageSender().sendCallMessage(address, null, callMessage);
} catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) { } catch (UntrustedIdentityException e) {
throw new IOException("Untrusted identity for call recipient", e); throw new IOException("Untrusted identity for call recipient", e);
} catch (NoSessionException e) { } catch (NoSessionException e) {
throw new IOException("No session for call recipient", e); throw new IOException("No session for call recipient", e);
@ -1934,7 +1941,7 @@ public class ManagerImpl implements Manager {
var callMessage = SignalServiceCallMessage.forHangup(hangupMessage, null); var callMessage = SignalServiceCallMessage.forHangup(hangupMessage, null);
try { try {
dependencies.getMessageSender().sendCallMessage(address, null, callMessage); dependencies.getMessageSender().sendCallMessage(address, null, callMessage);
} catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) { } catch (UntrustedIdentityException e) {
throw new IOException("Untrusted identity for call recipient", e); throw new IOException("Untrusted identity for call recipient", e);
} catch (NoSessionException e) { } catch (NoSessionException e) {
throw new IOException("No session for call recipient", e); throw new IOException("No session for call recipient", e);
@ -1952,7 +1959,7 @@ public class ManagerImpl implements Manager {
var callMessage = SignalServiceCallMessage.forBusy(busyMessage, null); var callMessage = SignalServiceCallMessage.forBusy(busyMessage, null);
try { try {
dependencies.getMessageSender().sendCallMessage(address, null, callMessage); dependencies.getMessageSender().sendCallMessage(address, null, callMessage);
} catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) { } catch (UntrustedIdentityException e) {
throw new IOException("Untrusted identity for call recipient", e); throw new IOException("Untrusted identity for call recipient", e);
} catch (NoSessionException e) { } catch (NoSessionException e) {
throw new IOException("No session for call recipient", e); throw new IOException("No session for call recipient", e);