nik/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli.git synced 2026-05-28 14:54:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor UnidentifiedAccessHelper

Browse Source
This commit is contained in:
AsamK 2025-09-14 14:38:23 +02:00
parent 597f0368cf
commit 991ff04196
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
View File

@ -94,16 +94,17 @@ public class UnidentifiedAccessHelper {
} }
try { try {
return new UnidentifiedAccess(recipientUnidentifiedAccessKey, senderCertificate, false); return new UnidentifiedAccess(recipientUnidentifiedAccessKey, senderCertificate.getSerialized(), false);
} catch (InvalidCertificateException e) { } catch (InvalidCertificateException e) {
return null; return null;
} }
} }
private byte[] getSenderCertificateFor(final RecipientId recipientId) { public SenderCertificate getSenderCertificateFor(final RecipientId recipientId) {
final var sharingMode = account.getConfigurationStore().getPhoneNumberSharingMode(); final var sharingMode = account.getConfigurationStore().getPhoneNumberSharingMode();
if (sharingMode == PhoneNumberSharingMode.EVERYBODY || ( if (sharingMode == PhoneNumberSharingMode.EVERYBODY || (
sharingMode == PhoneNumberSharingMode.CONTACTS recipientId != null
&& sharingMode == PhoneNumberSharingMode.CONTACTS
&& account.getContactStore().getContact(recipientId) != null && account.getContactStore().getContact(recipientId) != null
)) { )) {
logger.trace("Using normal sender certificate for message to {}", recipientId); logger.trace("Using normal sender certificate for message to {}", recipientId);
@ -114,33 +115,33 @@ public class UnidentifiedAccessHelper {
} }
} }
private byte[] getSenderCertificateForPhoneNumberPrivacy() { private SenderCertificate getSenderCertificateForPhoneNumberPrivacy() {
if (privacySenderCertificate != null && System.currentTimeMillis() < ( if (privacySenderCertificate != null && System.currentTimeMillis() < (
privacySenderCertificate.getExpiration() - CERTIFICATE_EXPIRATION_BUFFER privacySenderCertificate.getExpiration() - CERTIFICATE_EXPIRATION_BUFFER
)) { )) {
return privacySenderCertificate.getSerialized(); return privacySenderCertificate;
} }
try { try {
final var certificate = handleResponseException(dependencies.getCertificateApi() final var certificate = handleResponseException(dependencies.getCertificateApi()
.getSenderCertificateForPhoneNumberPrivacy()); .getSenderCertificateForPhoneNumberPrivacy());
privacySenderCertificate = new SenderCertificate(certificate); privacySenderCertificate = new SenderCertificate(certificate);
return certificate; return privacySenderCertificate;
} catch (IOException | InvalidCertificateException e) { } catch (IOException | InvalidCertificateException e) {
logger.warn("Failed to get sender certificate (pnp), ignoring: {}", e.getMessage()); logger.warn("Failed to get sender certificate (pnp), ignoring: {}", e.getMessage());
return null; return null;
} }
} }
private byte[] getSenderCertificate() { private SenderCertificate getSenderCertificate() {
if (senderCertificate != null && System.currentTimeMillis() < ( if (senderCertificate != null && System.currentTimeMillis() < (
senderCertificate.getExpiration() - CERTIFICATE_EXPIRATION_BUFFER senderCertificate.getExpiration() - CERTIFICATE_EXPIRATION_BUFFER
)) { )) {
return senderCertificate.getSerialized(); return senderCertificate;
} }
try { try {
final var certificate = handleResponseException(dependencies.getCertificateApi().getSenderCertificate()); final var certificate = handleResponseException(dependencies.getCertificateApi().getSenderCertificate());
this.senderCertificate = new SenderCertificate(certificate); this.senderCertificate = new SenderCertificate(certificate);
return certificate; return senderCertificate;
} catch (IOException | InvalidCertificateException e) { } catch (IOException | InvalidCertificateException e) {
logger.warn("Failed to get sender certificate, ignoring: {}", e.getMessage()); logger.warn("Failed to get sender certificate, ignoring: {}", e.getMessage());
return null; return null;