Remove duplicate address resolving

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / helper / IdentityHelper.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
index c150abedcbbd9c802a5bc6b20dec1d8253906223..61973f33864626cf9595f6f795063fcf118b97e4 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
@@ -94,10 +94,8 @@ public class IdentityHelper {
     private boolean trustIdentity(
             RecipientId recipientId, BiFunction<ServiceId, IdentityKey, Boolean> verifier, TrustLevel trustLevel
     ) {
-        final var serviceId = account.getRecipientAddressResolver()
-                .resolveRecipientAddress(recipientId)
-                .serviceId()
-                .orElse(null);
+        final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
+        final var serviceId = address.serviceId().orElse(null);
         if (serviceId == null) {
             return false;
         }
@@ -112,9 +110,8 @@ public class IdentityHelper {
 
         account.getIdentityKeyStore().setIdentityTrustLevel(serviceId, identity.getIdentityKey(), trustLevel);
         try {
-            final var address = context.getRecipientHelper()
-                    .resolveSignalServiceAddress(account.getRecipientResolver().resolveRecipient(serviceId));
-            context.getSyncHelper().sendVerifiedMessage(address, identity.getIdentityKey(), trustLevel);
+            context.getSyncHelper()
+                    .sendVerifiedMessage(address.toSignalServiceAddress(), identity.getIdentityKey(), trustLevel);
         } catch (IOException e) {
             logger.warn("Failed to send verification sync message: {}", e.getMessage());
         }