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

Add dbus methods: deleteContact and deleteRecipient

Browse source
This commit is contained in:
jonas.hoefer 2021-12-02 11:02:28 +01:00
parent 7e7e4150e1
commit b32580c5af
6 changed files with 49 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
View file

@ -194,6 +194,9 @@ public final class ProfileHelper {
}
profile = decryptProfileIfKeyKnown(recipientId, encryptedProfile);
if (profile.getGivenName() == null && profile.getFamilyName() == null) {
return profile;
}
account.getProfileStore().storeProfile(recipientId, profile);
return profile;

15
lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
View file

@ -261,7 +261,12 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
public void storeProfile(final RecipientId recipientId, final Profile profile) {
synchronized (recipients) {
final var recipient = recipients.get(recipientId);
storeRecipientLocked(recipientId, Recipient.newBuilder(recipient).withProfile(profile).build());
if (recipient != null) {
storeRecipientLocked(recipientId, Recipient.newBuilder(recipient).withProfile(profile).build());
} else {
storeRecipientLocked(recipientId,
Recipient.newBuilder().withRecipientId(recipientId).withProfile(profile).build());
}
}
}
@ -459,6 +464,10 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
final var base64 = Base64.getEncoder();
var storage = new Storage(recipients.entrySet().stream().map(pair -> {
final var recipient = pair.getValue();
final var number = recipient.getAddress() == null ? null : recipient.getAddress().getNumber().orElse(null);
final var uuid = recipient.getAddress() == null
? null
: recipient.getAddress().getUuid().map(UUID::toString).orElse(null);
final var contact = recipient.getContact() == null
? null
: new Storage.Recipient.Contact(recipient.getContact().getName(),
@ -481,8 +490,8 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
.map(Enum::name)
.collect(Collectors.toSet()));
return new Storage.Recipient(pair.getKey().id(),
recipient.getAddress().getNumber().orElse(null),
recipient.getAddress().getUuid().map(UUID::toString).orElse(null),
number,
uuid,
recipient.getProfileKey() == null
? null
: base64.encodeToString(recipient.getProfileKey().serialize()),