From: AsamK Date: Tue, 24 May 2022 12:36:33 +0000 (+0200) Subject: Rename main/master device to primary device X-Git-Tag: v0.10.7~13 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/9ad24614cb800c0e3f853dc985d8d4180bbdd04d?ds=sidebyside Rename main/master device to primary device --- diff --git a/CHANGELOG.md b/CHANGELOG.md index f88e83f7..43a7d336 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -114,7 +114,7 @@ ### Changed - libzkgroup dependency is no longer required - Renamed `-u` and `--username` flags to `-a` and `--account` to prevent confusion with upcoming Signal usernames. The old flags are also still supported for now. -- Respect phone number sharing mode and unlisted state set by main device +- Respect phone number sharing mode and unlisted state set by primary device - Adapt register command to reactivate account if possible. - dbus-java now uses Java 16 native unix sockets, which should provide better cross-platform compatibility - If sending to a recipient fails (e.g. unregistered) signal-cli now exits with a success exit code and prints additional information about the failure. @@ -166,7 +166,7 @@ ### Added - New global parameter `--trust-new-identities=always` to allow trusting any new identity key without verification -- New parameter `--device-name` for `updateAccount` command to change the device name (also works for the main device) +- New parameter `--device-name` for `updateAccount` command to change the device name (also works for the primary device) - New SignalControl DBus interface, to register/verify/link new accounts - New `jsonRpc` command that provides a JSON-RPC based API on stdout/stdin - Support for announcement groups @@ -217,7 +217,7 @@ ### Added - A manual page for the DBus interface (Thanks @bublath, @exquo) - Remote message delete command (Thanks @adaptivegarage) -- sendSyncRequest command to request complete contact/group list from master device +- sendSyncRequest command to request complete contact/group list from primary device - New `--delete-account` argument for unregister (Dangerous) - New `--family-name` argument for updateProfile @@ -225,7 +225,7 @@ - Sending reaction to group (Thanks @adaptivegarage) - Displaying of address for messages from untrusted identities - Handling of recipient number or uuid changes (e.g. after account deletions) -- Only respond to sync requests from master device +- Only respond to sync requests from primary device - Display of quit group messages ### Changed 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 4444e57a..eb00d745 100644 --- a/lib/src/main/java/org/asamk/signal/manager/Manager.java +++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java @@ -10,7 +10,7 @@ import org.asamk.signal.manager.api.InvalidDeviceLinkException; import org.asamk.signal.manager.api.InvalidStickerException; import org.asamk.signal.manager.api.Message; import org.asamk.signal.manager.api.MessageEnvelope; -import org.asamk.signal.manager.api.NotMasterDeviceException; +import org.asamk.signal.manager.api.NotPrimaryDeviceException; import org.asamk.signal.manager.api.Pair; import org.asamk.signal.manager.api.RecipientIdentifier; import org.asamk.signal.manager.api.SendGroupMessageResults; @@ -65,7 +65,7 @@ public interface Manager extends Closeable { Configuration getConfiguration(); - void updateConfiguration(Configuration configuration) throws IOException, NotMasterDeviceException; + void updateConfiguration(Configuration configuration) throws IOException, NotPrimaryDeviceException; /** * Update the user's profile. @@ -85,7 +85,7 @@ public interface Manager extends Closeable { void addDeviceLink(URI linkUri) throws IOException, InvalidDeviceLinkException; - void setRegistrationLockPin(Optional pin) throws IOException, NotMasterDeviceException; + void setRegistrationLockPin(Optional pin) throws IOException, NotPrimaryDeviceException; Profile getRecipientProfile(RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException; @@ -149,15 +149,15 @@ public interface Manager extends Closeable { void setContactName( RecipientIdentifier.Single recipient, String name - ) throws NotMasterDeviceException, IOException, UnregisteredRecipientException; + ) throws NotPrimaryDeviceException, IOException, UnregisteredRecipientException; void setContactsBlocked( Collection recipient, boolean blocked - ) throws NotMasterDeviceException, IOException, UnregisteredRecipientException; + ) throws NotPrimaryDeviceException, IOException, UnregisteredRecipientException; void setGroupsBlocked( Collection groupId, boolean blocked - ) throws GroupNotFoundException, IOException, NotMasterDeviceException; + ) throws GroupNotFoundException, IOException, NotPrimaryDeviceException; /** * Change the expiration timer for a contact diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java index 19ff8b54..22fcc141 100644 --- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java @@ -25,7 +25,7 @@ import org.asamk.signal.manager.api.InactiveGroupLinkException; import org.asamk.signal.manager.api.InvalidDeviceLinkException; import org.asamk.signal.manager.api.InvalidStickerException; import org.asamk.signal.manager.api.Message; -import org.asamk.signal.manager.api.NotMasterDeviceException; +import org.asamk.signal.manager.api.NotPrimaryDeviceException; import org.asamk.signal.manager.api.Pair; import org.asamk.signal.manager.api.RecipientIdentifier; import org.asamk.signal.manager.api.SendGroupMessageResults; @@ -241,9 +241,9 @@ class ManagerImpl implements Manager { @Override public void updateConfiguration( Configuration configuration - ) throws NotMasterDeviceException { - if (!account.isMasterDevice()) { - throw new NotMasterDeviceException(); + ) throws NotPrimaryDeviceException { + if (!account.isPrimaryDevice()) { + throw new NotPrimaryDeviceException(); } final var configurationStore = account.getConfigurationStore(); @@ -327,9 +327,9 @@ class ManagerImpl implements Manager { } @Override - public void setRegistrationLockPin(Optional pin) throws IOException, NotMasterDeviceException { - if (!account.isMasterDevice()) { - throw new NotMasterDeviceException(); + public void setRegistrationLockPin(Optional pin) throws IOException, NotPrimaryDeviceException { + if (!account.isPrimaryDevice()) { + throw new NotPrimaryDeviceException(); } if (pin.isPresent()) { context.getAccountHelper().setRegistrationPin(pin.get()); @@ -692,9 +692,9 @@ class ManagerImpl implements Manager { @Override public void setContactName( RecipientIdentifier.Single recipient, String name - ) throws NotMasterDeviceException, UnregisteredRecipientException { - if (!account.isMasterDevice()) { - throw new NotMasterDeviceException(); + ) throws NotPrimaryDeviceException, UnregisteredRecipientException { + if (!account.isPrimaryDevice()) { + throw new NotPrimaryDeviceException(); } context.getContactHelper().setContactName(context.getRecipientHelper().resolveRecipient(recipient), name); } @@ -702,9 +702,9 @@ class ManagerImpl implements Manager { @Override public void setContactsBlocked( Collection recipients, boolean blocked - ) throws NotMasterDeviceException, IOException, UnregisteredRecipientException { - if (!account.isMasterDevice()) { - throw new NotMasterDeviceException(); + ) throws NotPrimaryDeviceException, IOException, UnregisteredRecipientException { + if (!account.isPrimaryDevice()) { + throw new NotPrimaryDeviceException(); } if (recipients.size() == 0) { return; @@ -734,9 +734,9 @@ class ManagerImpl implements Manager { @Override public void setGroupsBlocked( final Collection groupIds, final boolean blocked - ) throws GroupNotFoundException, NotMasterDeviceException, IOException { - if (!account.isMasterDevice()) { - throw new NotMasterDeviceException(); + ) throws GroupNotFoundException, NotPrimaryDeviceException, IOException { + if (!account.isPrimaryDevice()) { + throw new NotPrimaryDeviceException(); } if (groupIds.size() == 0) { return; diff --git a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java index d7c12337..08826c57 100644 --- a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java @@ -206,8 +206,8 @@ class ProvisioningManagerImpl implements ProvisioningManager { } try (signalAccount) { - if (signalAccount.isMasterDevice()) { - logger.debug("Account is a master device."); + if (signalAccount.isPrimaryDevice()) { + logger.debug("Account is a primary device."); return false; } if (signalAccount.isRegistered() diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/RetrieveStorageDataAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/RetrieveStorageDataAction.java index b44c7e3a..28b304ab 100644 --- a/lib/src/main/java/org/asamk/signal/manager/actions/RetrieveStorageDataAction.java +++ b/lib/src/main/java/org/asamk/signal/manager/actions/RetrieveStorageDataAction.java @@ -17,7 +17,7 @@ public class RetrieveStorageDataAction implements HandleAction { public void execute(Context context) throws Throwable { if (context.getAccount().getStorageKey() != null) { context.getStorageHelper().readDataFromStorage(); - } else if (!context.getAccount().isMasterDevice()) { + } else if (!context.getAccount().isPrimaryDevice()) { context.getSyncHelper().requestSyncKeys(); } } diff --git a/lib/src/main/java/org/asamk/signal/manager/api/NotMasterDeviceException.java b/lib/src/main/java/org/asamk/signal/manager/api/NotPrimaryDeviceException.java similarity index 53% rename from lib/src/main/java/org/asamk/signal/manager/api/NotMasterDeviceException.java rename to lib/src/main/java/org/asamk/signal/manager/api/NotPrimaryDeviceException.java index 22cbb1f7..b2f72e82 100644 --- a/lib/src/main/java/org/asamk/signal/manager/api/NotMasterDeviceException.java +++ b/lib/src/main/java/org/asamk/signal/manager/api/NotPrimaryDeviceException.java @@ -1,8 +1,8 @@ package org.asamk.signal.manager.api; -public class NotMasterDeviceException extends Exception { +public class NotPrimaryDeviceException extends Exception { - public NotMasterDeviceException() { + public NotPrimaryDeviceException() { super("This function is not supported for linked devices."); } } diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java index 224ac4da..bae049c5 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java @@ -60,7 +60,7 @@ public class AccountHelper { if (account.getAci() == null || account.getPni() == null) { checkWhoAmiI(); } - if (!account.isMasterDevice() && account.getPniIdentityKeyPair() == null) { + if (!account.isPrimaryDevice() && account.getPniIdentityKeyPair() == null) { context.getSyncHelper().requestSyncPniIdentity(); } updateAccountAttributes(); @@ -175,7 +175,7 @@ public class AccountHelper { public void unregister() throws IOException { // When setting an empty GCM id, the Signal-Server also sets the fetchesMessages property to false. - // If this is the master device, other users can't send messages to this number anymore. + // If this is the primary device, other users can't send messages to this number anymore. // If this is a linked device, other users can still send messages, but this device doesn't receive them anymore. dependencies.getAccountManager().setGcmId(Optional.empty()); diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java index 648e10ef..37616d6e 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java @@ -336,7 +336,7 @@ public final class IncomingMessageHandler { ignoreAttachments)); } } - if (syncMessage.getRequest().isPresent() && account.isMasterDevice()) { + if (syncMessage.getRequest().isPresent() && account.isPrimaryDevice()) { var rm = syncMessage.getRequest().get(); if (rm.isContactsRequest()) { actions.add(SendSyncContactsAction.create()); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java index 27e96016..6d6bb12f 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java @@ -388,7 +388,7 @@ public class SignalAccount implements Closeable { } save(); } - if (isMasterDevice() && getPniIdentityKeyPair() == null) { + if (isPrimaryDevice() && getPniIdentityKeyPair() == null) { setPniIdentityKeyPair(KeyUtils.generateIdentityKeyPair()); } } @@ -1203,7 +1203,7 @@ public class SignalAccount implements Closeable { return deviceId; } - public boolean isMasterDevice() { + public boolean isPrimaryDevice() { return deviceId == SignalServiceAddress.DEFAULT_DEVICE_ID; } diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java index 24327eb0..be494d51 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java @@ -85,7 +85,7 @@ public class SessionStore implements SignalServiceSessionStore { synchronized (cachedSessions) { return getKeysLocked(recipientId).stream() - // get all sessions for recipient except main device session + // get all sessions for recipient except primary device session .filter(key -> key.deviceId() != 1 && key.recipientId().equals(recipientId)) .map(Key::deviceId) .toList(); diff --git a/man/signal-cli-dbus.5.adoc b/man/signal-cli-dbus.5.adoc index a475eadc..2a83e50c 100644 --- a/man/signal-cli-dbus.5.adoc +++ b/man/signal-cli-dbus.5.adoc @@ -119,7 +119,7 @@ The following methods listen to the account's object path, which is constructed getContactName(number) -> name:: * number : Phone number -* name : Contact's name in local storage (from the master device for a linked account, or the one set with setContactName); if not set, contact's profile name is used +* name : Contact's name in local storage (from the primary device for a linked account, or the one set with setContactName); if not set, contact's profile name is used Exceptions: None diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc index 456c6f1a..9b54635e 100644 --- a/man/signal-cli.1.adoc +++ b/man/signal-cli.1.adoc @@ -110,9 +110,9 @@ Only required if a PIN was set. === unregister Disable push support for this device, i.e. this device won't receive any more messages. -If this is the master device, other users can't send messages to this number anymore. +If this is the primary device, other users can't send messages to this number anymore. Use "updateAccount" to undo this. -To remove a linked device, use "removeDevice" from the master device. +To remove a linked device, use "removeDevice" from the primary device. *--delete-account*:: Delete account completely from server. @@ -137,12 +137,12 @@ Update the account attributes on the signal server. Can fix problems with receiving messages. *-n* NAME, *--device-name* NAME:: -Set a new device name for the main or linked device +Set a new device name for the primary or linked device === updateConfiguration Update signal configs and sync them to linked devices. -This command only works on the main devices. +This command only works on the primary devices. *--read-receipts* {true,false}:: Indicates if Signal should send read receipts. @@ -181,7 +181,7 @@ By default "cli" will be used. === addDevice Link another device to this device. -Only works, if this is the master device. +Only works, if this is the primary device. *--uri* URI:: Specify the uri contained in the QR code shown by the new device. @@ -194,7 +194,7 @@ Show a list of linked devices. === removeDevice Remove a linked device. -Only works, if this is the master device. +Only works, if this is the primary device. *-d* DEVICE_ID, *--device-id* DEVICE_ID:: Specify the device you want to remove. @@ -547,12 +547,12 @@ Specify the group IDs that should be unblocked in base64 encoding. === sendContacts Send a synchronization message with the local contacts list to all linked devices. -This command should only be used if this is the master device. +This command should only be used if this is the primary device. === sendSyncRequest -Send a synchronization request message to the master device (for group, contacts, ...). -The master device will respond with synchronization messages with full contact and group lists. +Send a synchronization request message to the primary device (for group, contacts, ...). +The primary device will respond with synchronization messages with full contact and group lists. === uploadStickerPack diff --git a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java index 24c4ea91..eb218c70 100644 --- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java +++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java @@ -27,7 +27,7 @@ public class AddDeviceCommand implements JsonRpcLocalCommand { @Override public void attachToSubparser(final Subparser subparser) { - subparser.help("Link another device to this device. Only works, if this is the master device."); + subparser.help("Link another device to this device. Only works, if this is the primary device."); subparser.addArgument("--uri") .required(true) .help("Specify the uri contained in the QR code shown by the new device."); diff --git a/src/main/java/org/asamk/signal/commands/BlockCommand.java b/src/main/java/org/asamk/signal/commands/BlockCommand.java index 8d7f1a8b..682ff63f 100644 --- a/src/main/java/org/asamk/signal/commands/BlockCommand.java +++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java @@ -7,7 +7,7 @@ import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.UnexpectedErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.Manager; -import org.asamk.signal.manager.api.NotMasterDeviceException; +import org.asamk.signal.manager.api.NotPrimaryDeviceException; import org.asamk.signal.manager.api.UnregisteredRecipientException; import org.asamk.signal.manager.groups.GroupNotFoundException; import org.asamk.signal.output.OutputWriter; @@ -41,7 +41,7 @@ public class BlockCommand implements JsonRpcLocalCommand { final var recipients = CommandUtil.getSingleRecipientIdentifiers(contacts, m.getSelfNumber()); try { m.setContactsBlocked(recipients, true); - } catch (NotMasterDeviceException e) { + } catch (NotPrimaryDeviceException e) { throw new UserErrorException("This command doesn't work on linked devices."); } catch (IOException e) { throw new UnexpectedErrorException("Failed to sync block to linked devices: " + e.getMessage(), e); @@ -53,7 +53,7 @@ public class BlockCommand implements JsonRpcLocalCommand { final var groupIds = CommandUtil.getGroupIds(groupIdStrings); try { m.setGroupsBlocked(groupIds, true); - } catch (NotMasterDeviceException e) { + } catch (NotPrimaryDeviceException e) { throw new UserErrorException("This command doesn't work on linked devices."); } catch (GroupNotFoundException e) { logger.warn("Unknown group id: {}", e.getMessage()); diff --git a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java index a4ffc564..8085bc65 100644 --- a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java +++ b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java @@ -7,7 +7,7 @@ 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.NotMasterDeviceException; +import org.asamk.signal.manager.api.NotPrimaryDeviceException; import org.asamk.signal.output.OutputWriter; import java.io.IOException; @@ -33,7 +33,7 @@ public class RemovePinCommand implements JsonRpcLocalCommand { m.setRegistrationLockPin(Optional.empty()); } catch (IOException e) { throw new IOErrorException("Remove pin error: " + e.getMessage(), e); - } catch (NotMasterDeviceException e) { + } catch (NotPrimaryDeviceException e) { throw new UserErrorException("This command doesn't work on linked devices."); } } diff --git a/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java b/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java index d429e47d..1f35ba2b 100644 --- a/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java @@ -19,7 +19,7 @@ public class SendSyncRequestCommand implements JsonRpcLocalCommand { @Override public void attachToSubparser(final Subparser subparser) { - subparser.help("Send a synchronization request message to master device (for group, contacts, ...)."); + subparser.help("Send a synchronization request message to primary device (for group, contacts, ...)."); } @Override diff --git a/src/main/java/org/asamk/signal/commands/SetPinCommand.java b/src/main/java/org/asamk/signal/commands/SetPinCommand.java index 45c332d9..f6b5f7ad 100644 --- a/src/main/java/org/asamk/signal/commands/SetPinCommand.java +++ b/src/main/java/org/asamk/signal/commands/SetPinCommand.java @@ -7,7 +7,7 @@ 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.NotMasterDeviceException; +import org.asamk.signal.manager.api.NotPrimaryDeviceException; import org.asamk.signal.output.OutputWriter; import java.io.IOException; @@ -36,7 +36,7 @@ public class SetPinCommand implements JsonRpcLocalCommand { m.setRegistrationLockPin(Optional.of(registrationLockPin)); } catch (IOException e) { throw new IOErrorException("Set pin error: " + e.getMessage(), e); - } catch (NotMasterDeviceException e) { + } catch (NotPrimaryDeviceException e) { throw new UserErrorException("This command doesn't work on linked devices."); } } diff --git a/src/main/java/org/asamk/signal/commands/UnblockCommand.java b/src/main/java/org/asamk/signal/commands/UnblockCommand.java index 4cfe4647..9ff018bb 100644 --- a/src/main/java/org/asamk/signal/commands/UnblockCommand.java +++ b/src/main/java/org/asamk/signal/commands/UnblockCommand.java @@ -7,7 +7,7 @@ import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.UnexpectedErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.Manager; -import org.asamk.signal.manager.api.NotMasterDeviceException; +import org.asamk.signal.manager.api.NotPrimaryDeviceException; import org.asamk.signal.manager.api.UnregisteredRecipientException; import org.asamk.signal.manager.groups.GroupNotFoundException; import org.asamk.signal.output.OutputWriter; @@ -41,7 +41,7 @@ public class UnblockCommand implements JsonRpcLocalCommand { final var recipients = CommandUtil.getSingleRecipientIdentifiers(contacts, m.getSelfNumber()); try { m.setContactsBlocked(recipients, false); - } catch (NotMasterDeviceException e) { + } catch (NotPrimaryDeviceException e) { throw new UserErrorException("This command doesn't work on linked devices."); } catch (IOException e) { throw new UnexpectedErrorException("Failed to sync unblock to linked devices: " + e.getMessage(), e); @@ -53,7 +53,7 @@ public class UnblockCommand implements JsonRpcLocalCommand { final var groupIds = CommandUtil.getGroupIds(groupIdStrings); try { m.setGroupsBlocked(groupIds, false); - } catch (NotMasterDeviceException e) { + } catch (NotPrimaryDeviceException e) { throw new UserErrorException("This command doesn't work on linked devices."); } catch (GroupNotFoundException e) { logger.warn("Unknown group id: {}", e.getMessage()); diff --git a/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java b/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java index 804804d4..73bac056 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java @@ -8,7 +8,7 @@ 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.Configuration; -import org.asamk.signal.manager.api.NotMasterDeviceException; +import org.asamk.signal.manager.api.NotPrimaryDeviceException; import org.asamk.signal.output.OutputWriter; import java.io.IOException; @@ -53,7 +53,7 @@ public class UpdateConfigurationCommand implements JsonRpcLocalCommand { Optional.ofNullable(linkPreviews))); } catch (IOException e) { throw new IOErrorException("UpdateAccount error: " + e.getMessage(), e); - } catch (NotMasterDeviceException e) { + } catch (NotPrimaryDeviceException e) { throw new UserErrorException("This command doesn't work on linked devices."); } } diff --git a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java index 6ae549ae..c5305f30 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java @@ -7,7 +7,7 @@ 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.NotMasterDeviceException; +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; @@ -48,7 +48,7 @@ public class UpdateContactCommand implements JsonRpcLocalCommand { } } catch (IOException e) { throw new IOErrorException("Update contact error: " + e.getMessage(), e); - } catch (NotMasterDeviceException 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 c960b34d..a66d0f41 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java @@ -12,7 +12,7 @@ import org.asamk.signal.manager.api.InactiveGroupLinkException; import org.asamk.signal.manager.api.InvalidDeviceLinkException; import org.asamk.signal.manager.api.Message; import org.asamk.signal.manager.api.MessageEnvelope; -import org.asamk.signal.manager.api.NotMasterDeviceException; +import org.asamk.signal.manager.api.NotPrimaryDeviceException; import org.asamk.signal.manager.api.Pair; import org.asamk.signal.manager.api.RecipientIdentifier; import org.asamk.signal.manager.api.SendGroupMessageResults; @@ -409,14 +409,14 @@ public class DbusManagerImpl implements Manager { @Override public void setContactName( final RecipientIdentifier.Single recipient, final String name - ) throws NotMasterDeviceException { + ) throws NotPrimaryDeviceException { signal.setContactName(recipient.getIdentifier(), name); } @Override public void setContactsBlocked( final Collection recipients, final boolean blocked - ) throws NotMasterDeviceException, IOException { + ) throws NotPrimaryDeviceException, IOException { for (final var recipient : recipients) { signal.setContactBlocked(recipient.getIdentifier(), blocked); } diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java index ec7174b2..18b53eea 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java @@ -9,7 +9,7 @@ import org.asamk.signal.manager.api.InvalidDeviceLinkException; import org.asamk.signal.manager.api.InvalidNumberException; import org.asamk.signal.manager.api.InvalidStickerException; import org.asamk.signal.manager.api.Message; -import org.asamk.signal.manager.api.NotMasterDeviceException; +import org.asamk.signal.manager.api.NotPrimaryDeviceException; import org.asamk.signal.manager.api.RecipientIdentifier; import org.asamk.signal.manager.api.SendMessageResult; import org.asamk.signal.manager.api.SendMessageResults; @@ -490,7 +490,7 @@ public class DbusSignalImpl implements Signal { public void setContactName(final String number, final String name) { try { m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name); - } catch (NotMasterDeviceException e) { + } catch (NotPrimaryDeviceException e) { throw new Error.Failure("This command doesn't work on linked devices."); } catch (IOException e) { throw new Error.Failure("Contact is not registered."); @@ -514,7 +514,7 @@ public class DbusSignalImpl implements Signal { public void setContactBlocked(final String number, final boolean blocked) { try { m.setContactsBlocked(List.of(getSingleRecipientIdentifier(number, m.getSelfNumber())), blocked); - } catch (NotMasterDeviceException e) { + } catch (NotPrimaryDeviceException e) { throw new Error.Failure("This command doesn't work on linked devices."); } catch (IOException e) { throw new Error.Failure(e.getMessage()); @@ -527,7 +527,7 @@ public class DbusSignalImpl implements Signal { public void setGroupBlocked(final byte[] groupId, final boolean blocked) { try { m.setGroupsBlocked(List.of(getGroupId(groupId)), blocked); - } catch (NotMasterDeviceException e) { + } catch (NotPrimaryDeviceException e) { throw new Error.Failure("This command doesn't work on linked devices."); } catch (GroupNotFoundException e) { throw new Error.GroupNotFound(e.getMessage()); @@ -694,7 +694,7 @@ public class DbusSignalImpl implements Signal { m.setRegistrationLockPin(Optional.empty()); } catch (IOException e) { throw new Error.Failure("Remove pin error: " + e.getMessage()); - } catch (NotMasterDeviceException e) { + } catch (NotPrimaryDeviceException e) { throw new Error.Failure("This command doesn't work on linked devices."); } } @@ -705,7 +705,7 @@ public class DbusSignalImpl implements Signal { m.setRegistrationLockPin(Optional.of(registrationLockPin)); } catch (IOException e) { throw new Error.Failure("Set pin error: " + e.getMessage()); - } catch (NotMasterDeviceException e) { + } catch (NotPrimaryDeviceException e) { throw new Error.Failure("This command doesn't work on linked devices."); } } @@ -1092,7 +1092,7 @@ public class DbusSignalImpl implements Signal { Optional.ofNullable(linkPreviews))); } catch (IOException e) { throw new Error.Failure("UpdateAccount error: " + e.getMessage()); - } catch (NotMasterDeviceException e) { + } catch (NotPrimaryDeviceException e) { throw new Error.Failure("This command doesn't work on linked devices."); } } @@ -1270,7 +1270,7 @@ public class DbusSignalImpl implements Signal { private void setIsBlocked(final boolean isBlocked) { try { m.setGroupsBlocked(List.of(groupId), isBlocked); - } catch (NotMasterDeviceException e) { + } catch (NotPrimaryDeviceException e) { throw new Error.Failure("This command doesn't work on linked devices."); } catch (GroupNotFoundException e) { throw new Error.GroupNotFound(e.getMessage());