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

Refactor ProfileStore to handle name/uuid addresses correctly

Browse source
This commit is contained in:
AsamK 2020-09-11 16:22:30 +02:00
parent bb24a2aa31
commit ad509e8097
3 changed files with 41 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/asamk/signal/manager/Manager.java
View file

@ -462,8 +462,8 @@ public class Manager implements Closeable {
// Profiles are cache for 24h before retrieving them again // Profiles are cache for 24h before retrieving them again
if (profileEntry == null || profileEntry.getProfile() == null || now - profileEntry.getLastUpdateTimestamp() > 24 * 60 * 60 * 1000) { if (profileEntry == null || profileEntry.getProfile() == null || now - profileEntry.getLastUpdateTimestamp() > 24 * 60 * 60 * 1000) {
SignalProfile profile = retrieveRecipientProfile(address, unidentifiedAccess, profileKey); SignalProfile profile = retrieveRecipientProfile(address, unidentifiedAccess, profileKey);
profileEntry = new SignalProfileEntry(profileKey, now, profile); account.getProfileStore().updateProfile(address, profileKey, now, profile);
account.getProfileStore().updateProfile(address, profileEntry); return profile;
} }
return profileEntry.getProfile(); return profileEntry.getProfile();
} }

41
src/main/java/org/asamk/signal/storage/profiles/ProfileStore.java
View file

@ -19,8 +19,9 @@ import org.whispersystems.signalservice.api.util.UuidUtil;
import org.whispersystems.util.Base64; import org.whispersystems.util.Base64;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.List;
import java.util.UUID; import java.util.UUID;
public class ProfileStore { public class ProfileStore {
@ -30,23 +31,36 @@ public class ProfileStore {
@JsonProperty("profiles") @JsonProperty("profiles")
@JsonDeserialize(using = ProfileStoreDeserializer.class) @JsonDeserialize(using = ProfileStoreDeserializer.class)
@JsonSerialize(using = ProfileStoreSerializer.class) @JsonSerialize(using = ProfileStoreSerializer.class)
private final Map<SignalServiceAddress, SignalProfileEntry> profiles = new HashMap<>(); private final List<SignalProfileEntry> profiles = new ArrayList<>();
public SignalProfileEntry getProfile(SignalServiceAddress serviceAddress) { public SignalProfileEntry getProfile(SignalServiceAddress serviceAddress) {
return profiles.get(serviceAddress); for (SignalProfileEntry entry : profiles) {
if (entry.getServiceAddress().matches(serviceAddress)) {
return entry;
}
}
return null;
} }
public void updateProfile(SignalServiceAddress serviceAddress, SignalProfileEntry profile) { public void updateProfile(SignalServiceAddress serviceAddress, ProfileKey profileKey, long now, SignalProfile profile) {
profiles.put(serviceAddress, profile); SignalProfileEntry newEntry = new SignalProfileEntry(serviceAddress, profileKey, now, profile);
for (int i = 0; i < profiles.size(); i++) {
if (profiles.get(i).getServiceAddress().matches(serviceAddress)) {
profiles.set(i, newEntry);
return;
}
}
profiles.add(newEntry);
} }
public static class ProfileStoreDeserializer extends JsonDeserializer<Map<SignalServiceAddress, SignalProfileEntry>> { public static class ProfileStoreDeserializer extends JsonDeserializer<List<SignalProfileEntry>> {
@Override @Override
public Map<SignalServiceAddress, SignalProfileEntry> deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException { public List<SignalProfileEntry> deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
JsonNode node = jsonParser.getCodec().readTree(jsonParser); JsonNode node = jsonParser.getCodec().readTree(jsonParser);
Map<SignalServiceAddress, SignalProfileEntry> addresses = new HashMap<>(); List<SignalProfileEntry> addresses = new ArrayList<>();
if (node.isArray()) { if (node.isArray()) {
for (JsonNode entry : node) { for (JsonNode entry : node) {
@ -64,7 +78,7 @@ public class ProfileStore {
} }
long lastUpdateTimestamp = entry.get("lastUpdateTimestamp").asLong(); long lastUpdateTimestamp = entry.get("lastUpdateTimestamp").asLong();
SignalProfile profile = jsonProcessor.treeToValue(entry.get("profile"), SignalProfile.class); SignalProfile profile = jsonProcessor.treeToValue(entry.get("profile"), SignalProfile.class);
addresses.put(serviceAddress, new SignalProfileEntry(profileKey, lastUpdateTimestamp, profile)); addresses.add(new SignalProfileEntry(serviceAddress, profileKey, lastUpdateTimestamp, profile));
} }
} }
@ -72,14 +86,13 @@ public class ProfileStore {
} }
} }
public static class ProfileStoreSerializer extends JsonSerializer<Map<SignalServiceAddress, SignalProfileEntry>> { public static class ProfileStoreSerializer extends JsonSerializer<List<SignalProfileEntry>> {
@Override @Override
public void serialize(Map<SignalServiceAddress, SignalProfileEntry> profiles, JsonGenerator json, SerializerProvider serializerProvider) throws IOException { public void serialize(List<SignalProfileEntry> profiles, JsonGenerator json, SerializerProvider serializerProvider) throws IOException {
json.writeStartArray(); json.writeStartArray();
for (Map.Entry<SignalServiceAddress, SignalProfileEntry> entry : profiles.entrySet()) { for (SignalProfileEntry profileEntry : profiles) {
final SignalServiceAddress address = entry.getKey(); final SignalServiceAddress address = profileEntry.getServiceAddress();
final SignalProfileEntry profileEntry = entry.getValue();
json.writeStartObject(); json.writeStartObject();
if (address.getNumber().isPresent()) { if (address.getNumber().isPresent()) {
json.writeStringField("name", address.getNumber().get()); json.writeStringField("name", address.getNumber().get());

16
src/main/java/org/asamk/signal/storage/profiles/SignalProfileEntry.java
View file

@ -1,21 +1,29 @@
package org.asamk.signal.storage.profiles; package org.asamk.signal.storage.profiles;
import org.signal.zkgroup.profiles.ProfileKey; import org.signal.zkgroup.profiles.ProfileKey;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
public class SignalProfileEntry { 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.profileKey = profileKey;
this.lastUpdateTimestamp = lastUpdateTimestamp; this.lastUpdateTimestamp = lastUpdateTimestamp;
this.profile = profile; this.profile = profile;
} }
public SignalServiceAddress getServiceAddress() {
return serviceAddress;
}
public ProfileKey getProfileKey() { public ProfileKey getProfileKey() {
return profileKey; return profileKey;
} }