Refactor ProfileStore to handle name/uuid addresses correctly

[signal-cli] / src / main / java / org / asamk / signal / storage / profiles / SignalProfileEntry.java

diff --git a/src/main/java/org/asamk/signal/storage/profiles/SignalProfileEntry.java b/src/main/java/org/asamk/signal/storage/profiles/SignalProfileEntry.java
index 0423e12ed12f09f9dc327979e867f4361c3a80d2..ed1f7127e694160676ccfdc0a50d5d7990f5a6ba 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/profiles/SignalProfileEntry.java
+++ b/src/main/java/org/asamk/signal/storage/profiles/SignalProfileEntry.java
@@ -1,21 +1,29 @@
 package org.asamk.signal.storage.profiles;
 
 import org.signal.zkgroup.profiles.ProfileKey;
+import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 public class SignalProfileEntry {
 
-    private ProfileKey profileKey;
+    private final SignalServiceAddress serviceAddress;
 
-    private long lastUpdateTimestamp;
+    private final ProfileKey profileKey;
 
-    private SignalProfile profile;
+    private final long lastUpdateTimestamp;
 
-    public SignalProfileEntry(final ProfileKey profileKey, final long lastUpdateTimestamp, final SignalProfile profile) {
+    private final SignalProfile profile;
+
+    public SignalProfileEntry(final SignalServiceAddress serviceAddress, final ProfileKey profileKey, final long lastUpdateTimestamp, final SignalProfile profile) {
+        this.serviceAddress = serviceAddress;
         this.profileKey = profileKey;
         this.lastUpdateTimestamp = lastUpdateTimestamp;
         this.profile = profile;
     }
 
+    public SignalServiceAddress getServiceAddress() {
+        return serviceAddress;
+    }
+
     public ProfileKey getProfileKey() {
         return profileKey;
     }