webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-30 02:50:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor trusted recipient resolver

Browse source
This commit is contained in:
AsamK 2023-11-11 13:17:36 +01:00
parent 7b0744ec75
commit f8ea631b03
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
View file

@ -275,13 +275,14 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
return resolveRecipientTrusted(address, true); return resolveRecipientTrusted(address, true);
} }
@Override
public RecipientId resolveRecipientTrusted(RecipientAddress address) { public RecipientId resolveRecipientTrusted(RecipientAddress address) {
return resolveRecipientTrusted(address, false); return resolveRecipientTrusted(address, false);
} }
@Override @Override
public RecipientId resolveRecipientTrusted(SignalServiceAddress address) { public RecipientId resolveRecipientTrusted(SignalServiceAddress address) {
return resolveRecipientTrusted(new RecipientAddress(address), false); return resolveRecipientTrusted(new RecipientAddress(address));
} }
@Override @Override
@ -289,12 +290,12 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
final Optional<ACI> aci, final Optional<PNI> pni, final Optional<String> number final Optional<ACI> aci, final Optional<PNI> pni, final Optional<String> number
) { ) {
final var serviceId = aci.map(a -> (ServiceId) a).or(() -> pni); final var serviceId = aci.map(a -> (ServiceId) a).or(() -> pni);
return resolveRecipientTrusted(new RecipientAddress(serviceId, pni, number, Optional.empty()), false); return resolveRecipientTrusted(new RecipientAddress(serviceId, pni, number, Optional.empty()));
} }
@Override @Override
public RecipientId resolveRecipientTrusted(final ACI aci, final String username) { public RecipientId resolveRecipientTrusted(final ACI aci, final String username) {
return resolveRecipientTrusted(new RecipientAddress(aci, null, null, username), false); return resolveRecipientTrusted(new RecipientAddress(aci, null, null, username));
} }
@Override @Override

7
lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
View file

@ -11,6 +11,8 @@ public interface RecipientTrustedResolver {
RecipientId resolveSelfRecipientTrusted(RecipientAddress address); RecipientId resolveSelfRecipientTrusted(RecipientAddress address);
RecipientId resolveRecipientTrusted(RecipientAddress address);
RecipientId resolveRecipientTrusted(SignalServiceAddress address); RecipientId resolveRecipientTrusted(SignalServiceAddress address);
RecipientId resolveRecipientTrusted(Optional<ACI> aci, Optional<PNI> pni, Optional<String> number); RecipientId resolveRecipientTrusted(Optional<ACI> aci, Optional<PNI> pni, Optional<String> number);
@ -30,6 +32,11 @@ public interface RecipientTrustedResolver {
return recipientTrustedResolverSupplier.get().resolveSelfRecipientTrusted(address); return recipientTrustedResolverSupplier.get().resolveSelfRecipientTrusted(address);
} }
@Override
public RecipientId resolveRecipientTrusted(final RecipientAddress address) {
return recipientTrustedResolverSupplier.get().resolveRecipientTrusted(address);
}
@Override @Override
public RecipientId resolveRecipientTrusted(final SignalServiceAddress address) { public RecipientId resolveRecipientTrusted(final SignalServiceAddress address) {
return recipientTrustedResolverSupplier.get().resolveRecipientTrusted(address); return recipientTrustedResolverSupplier.get().resolveRecipientTrusted(address);