aljaz/signal-cli
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli.git synced 2026-01-27 01:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Split given/family name in updateContact command

Browse Source
This commit is contained in:
AsamK
2022-05-29 22:21:24 +02:00
parent 27dbc671e0
commit badbb55ef2
7 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/main/java/org/asamk/signal/manager/Manager.java
View File

@@ -149,7 +149,7 @@ public interface Manager extends Closeable {
void deleteContact(RecipientIdentifier.Single recipient);
void setContactName(
RecipientIdentifier.Single recipient, String name
RecipientIdentifier.Single recipient, String givenName, final String familyName
) throws NotPrimaryDeviceException, IOException, UnregisteredRecipientException;
void setContactsBlocked(

5
lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
View File

@@ -705,12 +705,13 @@ class ManagerImpl implements Manager {
@Override
public void setContactName(
RecipientIdentifier.Single recipient, String name
RecipientIdentifier.Single recipient, String givenName, final String familyName
) throws NotPrimaryDeviceException, UnregisteredRecipientException {
if (!account.isPrimaryDevice()) {
throw new NotPrimaryDeviceException();
}
context.getContactHelper().setContactName(context.getRecipientHelper().resolveRecipient(recipient), name);
context.getContactHelper()
.setContactName(context.getRecipientHelper().resolveRecipient(recipient), givenName, familyName);
}
@Override

10
lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
View File

@@ -17,10 +17,16 @@ public class ContactHelper {
return sourceContact != null && sourceContact.isBlocked();
}
public void setContactName(final RecipientId recipientId, final String name) {
public void setContactName(final RecipientId recipientId, final String givenName, final String familyName) {
var contact = account.getContactStore().getContact(recipientId);
final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
account.getContactStore().storeContact(recipientId, builder.withGivenName(name).build());
if (givenName != null) {
builder.withGivenName(givenName);
}
if (familyName != null) {
builder.withFamilyName(familyName);
}
account.getContactStore().storeContact(recipientId, builder.build());
}
public void setExpirationTimer(RecipientId recipientId, int messageExpirationTimer) {