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 0fcb42d2..0086db65 100644 --- a/lib/src/main/java/org/asamk/signal/manager/Manager.java +++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java @@ -404,7 +404,7 @@ public class Manager implements Closeable { 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.absent()); @@ -461,7 +461,7 @@ public class Manager implements Closeable { public void setRegistrationLockPin(Optional pin) throws IOException, UnauthenticatedResponseException { if (!account.isMasterDevice()) { - throw new RuntimeException("Only master device can set a PIN"); + throw new RuntimeException("Only primary device can set a PIN"); } if (pin.isPresent()) { final var masterKey = account.getPinMasterKey() != null diff --git a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java index ed7a52d9..7726edc6 100644 --- a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java +++ b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java @@ -181,7 +181,7 @@ public class ProvisioningManager { try (signalAccount) { if (signalAccount.isMasterDevice()) { - logger.error("Account is a master device."); + logger.error("Account is a primary device."); return false; } diff --git a/man/signal-cli-dbus.5.adoc b/man/signal-cli-dbus.5.adoc index a8d9ca4e..2a4c7eff 100755 --- a/man/signal-cli-dbus.5.adoc +++ b/man/signal-cli-dbus.5.adoc @@ -194,7 +194,7 @@ Exceptions: Failure, InvalidNumber 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 setContactName(number,name<>) -> <>:: * number : Phone number diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc index 0e3789e5..7d1196d7 100644 --- a/man/signal-cli.1.adoc +++ b/man/signal-cli.1.adoc @@ -88,9 +88,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. Cannot be undone without loss. You will @@ -127,7 +127,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. @@ -140,7 +140,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. @@ -402,12 +402,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 +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 31b3c7ef..e2048239 100644 --- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java +++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java @@ -22,7 +22,7 @@ public class AddDeviceCommand implements JsonRpcLocalCommand { private final static Logger logger = LoggerFactory.getLogger(AddDeviceCommand.class); public static 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/SendSyncRequestCommand.java b/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java index 4072be15..d22583b5 100644 --- a/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java @@ -16,7 +16,7 @@ public class SendSyncRequestCommand implements JsonRpcLocalCommand { } public static 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