more debug message cleanup

This commit is contained in:
John Freed 2021-08-17 11:03:14 +02:00
parent 26a3bc1481
commit bc3f8803dc
6 changed files with 13 additions and 13 deletions

View file

@ -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<String> 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

View file

@ -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;
}

View file

@ -194,7 +194,7 @@ Exceptions: Failure, InvalidNumber
getContactName(number<s>) -> name<s>::
* 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<s>,name<>) -> <>::
* number : Phone number

View file

@ -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

View file

@ -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.");

View file

@ -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