From eb52380ecf31c7eb3aaa62c12e027c9d3040951d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 8 Dec 2025 17:08:38 +0100
Subject: [PATCH] Remove now unnecessary check for primary device from
 updateContact

Fixes #1880
---
 lib/src/main/java/org/asamk/signal/manager/Manager.java      | 2 +-
 .../java/org/asamk/signal/manager/internal/ManagerImpl.java  | 5 +----
 .../java/org/asamk/signal/commands/UpdateContactCommand.java | 3 ---
 src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java     | 2 +-
 src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java      | 2 --
 5 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 4f2e152a..abb22ef4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -271,7 +271,7 @@ public interface Manager extends Closeable {
             final String nickGivenName,
             final String nickFamilyName,
             final String note
-    ) throws NotPrimaryDeviceException, UnregisteredRecipientException;
+    ) throws UnregisteredRecipientException;
 
     void setContactsBlocked(
             Collection<RecipientIdentifier.Single> recipient,
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index a768813a..c8ab4233 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -1138,10 +1138,7 @@ public class ManagerImpl implements Manager {
             final String nickGivenName,
             final String nickFamilyName,
             final String note
-    ) throws NotPrimaryDeviceException, UnregisteredRecipientException {
-        if (!account.isPrimaryDevice()) {
-            throw new NotPrimaryDeviceException();
-        }
+    ) throws UnregisteredRecipientException {
         context.getContactHelper()
                 .setContactName(context.getRecipientHelper().resolveRecipient(recipient),
                         givenName,
diff --git a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
index 9cba6992..481139fb 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
@@ -7,7 +7,6 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
@@ -63,8 +62,6 @@ public class UpdateContactCommand implements JsonRpcLocalCommand {
             m.setContactName(recipient, givenName, familyName, nickGivenName, nickFamilyName, note);
         } catch (IOException e) {
             throw new IOErrorException("Update contact error: " + e.getMessage(), e);
-        } catch (NotPrimaryDeviceException e) {
-            throw new UserErrorException("This command doesn't work on linked devices.");
         } catch (UnregisteredRecipientException e) {
             throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
         }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 6da1ab2b..cc0f308b 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -563,7 +563,7 @@ public class DbusManagerImpl implements Manager {
             final String nickGivenName,
             final String nickFamilyName,
             final String note
-    ) throws NotPrimaryDeviceException {
+    ) {
         signal.setContactName(recipient.getIdentifier(), givenName);
     }
 
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index b4ce234c..2c0a1101 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -537,8 +537,6 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
     public void setContactName(final String number, final String name) {
         try {
             m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name, "", null, null, null);
-        } catch (NotPrimaryDeviceException e) {
-            throw new Error.Failure("This command doesn't work on linked devices.");
         } catch (UnregisteredRecipientException e) {
             throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");
         }