webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 02:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing linked devices only works on the primary device

Browse source
This commit is contained in:
AsamK 2024-02-25 18:12:36 +01:00
parent b76964f219
commit 22ac3cb50f
4 changed files with 11 additions and 2 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

@ -140,7 +140,7 @@ public interface Manager extends Closeable {
List<Device> getLinkedDevices() throws IOException; List<Device> getLinkedDevices() throws IOException;
void removeLinkedDevices(int deviceId) throws IOException; void removeLinkedDevices(int deviceId) throws IOException, NotPrimaryDeviceException;
void addDeviceLink(DeviceLinkUrl linkUri) throws IOException, InvalidDeviceLinkException, NotPrimaryDeviceException; void addDeviceLink(DeviceLinkUrl linkUri) throws IOException, InvalidDeviceLinkException, NotPrimaryDeviceException;

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

@ -436,7 +436,10 @@ public class ManagerImpl implements Manager {
} }
@Override @Override
public void removeLinkedDevices(int deviceId) throws IOException { public void removeLinkedDevices(int deviceId) throws IOException, NotPrimaryDeviceException {
if (!account.isPrimaryDevice()) {
throw new NotPrimaryDeviceException();
}
context.getAccountHelper().removeLinkedDevices(deviceId); context.getAccountHelper().removeLinkedDevices(deviceId);
} }

4
src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
View file

@ -5,7 +5,9 @@ import net.sourceforge.argparse4j.inf.Subparser;
import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.CommandException;
import org.asamk.signal.commands.exceptions.IOErrorException; 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.Manager;
import org.asamk.signal.manager.api.NotPrimaryDeviceException;
import org.asamk.signal.output.OutputWriter; import org.asamk.signal.output.OutputWriter;
import java.io.IOException; import java.io.IOException;
@ -33,6 +35,8 @@ public class RemoveDeviceCommand implements JsonRpcLocalCommand {
try { try {
final var deviceId = ns.getInt("device-id"); final var deviceId = ns.getInt("device-id");
m.removeLinkedDevices(deviceId); m.removeLinkedDevices(deviceId);
} catch (NotPrimaryDeviceException e) {
throw new UserErrorException("This command doesn't work on linked devices.");
} catch (IOException e) { } catch (IOException e) {
throw new IOErrorException("Error while removing device: " + e.getMessage(), e); throw new IOErrorException("Error while removing device: " + e.getMessage(), e);
} }

2
src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
View file

@ -1177,6 +1177,8 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
try { try {
m.removeLinkedDevices(device.id()); m.removeLinkedDevices(device.id());
updateDevices(); updateDevices();
} catch (NotPrimaryDeviceException e) {
throw new Error.Failure("This command doesn't work on linked devices.");
} catch (IOException e) { } catch (IOException e) {
throw new Error.Failure(e.getMessage()); throw new Error.Failure(e.getMessage());
} }