Refactor contact and profile store

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

diff --git a/lib/src/main/java/org/asamk/signal/manager/HandleAction.java b/lib/src/main/java/org/asamk/signal/manager/HandleAction.java
index ba426fa1c994274a615f6a60800c354e150372f8..7fb80c34812a6d5197389b5a318de8ec72a56261 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/HandleAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/HandleAction.java
@@ -1,6 +1,7 @@
 package org.asamk.signal.manager;
 
 import org.asamk.signal.manager.groups.GroupIdV1;
+import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.util.Objects;
@@ -160,15 +161,15 @@ class SendGroupInfoAction implements HandleAction {
 
 class RetrieveProfileAction implements HandleAction {
 
-    private final SignalServiceAddress address;
+    private final RecipientId recipientId;
 
-    public RetrieveProfileAction(final SignalServiceAddress address) {
-        this.address = address;
+    public RetrieveProfileAction(final RecipientId recipientId) {
+        this.recipientId = recipientId;
     }
 
     @Override
     public void execute(Manager m) throws Throwable {
-        m.getRecipientProfile(address, true);
+        m.getRecipientProfile(recipientId, true);
     }
 
     @Override
@@ -178,11 +179,11 @@ class RetrieveProfileAction implements HandleAction {
 
         final RetrieveProfileAction that = (RetrieveProfileAction) o;
 
-        return address.equals(that.address);
+        return recipientId.equals(that.recipientId);
     }
 
     @Override
     public int hashCode() {
-        return address.hashCode();
+        return recipientId.hashCode();
     }
 }