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

Implement multi account commands for dbus client

Browse source
This commit is contained in:
AsamK 2021-12-31 18:17:32 +01:00
parent 00cda598c8
commit 805f976d9e
12 changed files with 335 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
View file

@ -15,6 +15,7 @@ import org.freedesktop.dbus.DBusPath;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.channels.OverlappingFileLockException;
import java.util.List;
import java.util.concurrent.TimeoutException;
@ -88,9 +89,9 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
@Override
public String link(final String newDeviceName) throws Error.Failure {
try {
final ProvisioningManager provisioningManager = c.getNewProvisioningManager();
final URI deviceLinkUri = provisioningManager.getDeviceLinkUri();
final URI deviceLinkUri = c.getNewProvisioningDeviceLinkUri();
new Thread(() -> {
final ProvisioningManager provisioningManager = c.getProvisioningManagerFor(deviceLinkUri);
try {
provisioningManager.finishDeviceLink(newDeviceName);
} catch (IOException | TimeoutException | UserAlreadyExists e) {
@ -103,6 +104,26 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
}
}
@Override
public String startLink() throws Error.Failure {
try {
final URI deviceLinkUri = c.getNewProvisioningDeviceLinkUri();
return deviceLinkUri.toString();
} catch (TimeoutException | IOException e) {
throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
}
}
@Override
public String finishLink(String deviceLinkUri, final String newDeviceName) throws Error.Failure {
try {
final var provisioningManager = c.getProvisioningManagerFor(new URI(deviceLinkUri));
return provisioningManager.finishDeviceLink(newDeviceName);
} catch (TimeoutException | IOException | UserAlreadyExists | URISyntaxException e) {
throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
}
}
@Override
public String version() {
return BaseConfig.PROJECT_VERSION;
@ -112,4 +133,9 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
public List<DBusPath> listAccounts() {
return c.getAccountNumbers().stream().map(u -> new DBusPath(DbusConfig.getObjectPath(u))).toList();
}
@Override
public DBusPath getAccount(final String number) {
return new DBusPath(DbusConfig.getObjectPath(number));
}
}