Refactor Context to create helpers lazily

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

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index dcdba890575b21a71da7bb0e1be3db95c79c0efc..5c4896e1f9be705567be2e617e4bd2d3f9e35fb7 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -32,14 +32,10 @@ public class RecipientHelper {
     private final SignalDependencies dependencies;
     private final ServiceEnvironmentConfig serviceEnvironmentConfig;
 
-    public RecipientHelper(
-            final SignalAccount account,
-            final SignalDependencies dependencies,
-            final ServiceEnvironmentConfig serviceEnvironmentConfig
-    ) {
-        this.account = account;
-        this.dependencies = dependencies;
-        this.serviceEnvironmentConfig = serviceEnvironmentConfig;
+    public RecipientHelper(final Context context) {
+        this.account = context.getAccount();
+        this.dependencies = context.getDependencies();
+        this.serviceEnvironmentConfig = dependencies.getServiceEnvironmentConfig();
     }
 
     public SignalServiceAddress resolveSignalServiceAddress(RecipientId recipientId) {
@@ -64,6 +60,10 @@ public class RecipientHelper {
                 .toSignalServiceAddress();
     }
 
+    public RecipientId resolveRecipient(final SignalServiceAddress address) {
+        return account.getRecipientStore().resolveRecipient(address);
+    }
+
     public Set<RecipientId> resolveRecipients(Collection<RecipientIdentifier.Single> recipients) throws IOException, UnregisteredRecipientException {
         final var recipientIds = new HashSet<RecipientId>(recipients.size());
         for (var number : recipients) {