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

implement methods for DBus clients

Browse source 
in Signal.java:
+    String getObjectPath()
+    List<String> listDevices()
+    void updateAccount()
+    List<String> listIdentity(String number)
This commit is contained in:
John Freed 2021-08-12 09:03:59 +02:00
parent 29aea22ff1
commit 2e82a12bbf
2 changed files with 64 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/org/asamk/Signal.java
View file

@ -105,8 +105,16 @@ public interface Signal extends DBusInterface {
String version();
String getObjectPath();
List<String> listNumbers();
List<String> listDevices() throws Error.Failure;
void updateAccount() throws Error.Failure;
List<String> listIdentity(String number);
List<String> getContactNumber(final String name) throws Error.Failure;
void quitGroup(final byte[] groupId) throws Error.GroupNotFound, Error.Failure;

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

@ -2,24 +2,32 @@ package org.asamk.signal.dbus;
import org.asamk.Signal;
import org.asamk.signal.BaseConfig;
import org.asamk.signal.OutputWriter;
import org.asamk.signal.PlainTextWriter;
import org.asamk.signal.PlainTextWriterImpl;
import org.asamk.signal.commands.exceptions.IOErrorException;
import org.asamk.signal.commands.exceptions.UserErrorException;
import org.asamk.signal.dbus.DbusAttachment;
import org.asamk.signal.manager.AttachmentInvalidException;
import org.asamk.signal.manager.Manager;
import org.asamk.signal.manager.NotMasterDeviceException;
import org.asamk.signal.manager.api.Device;
import org.asamk.signal.manager.groups.GroupId;
import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
import org.asamk.signal.manager.groups.GroupNotFoundException;
import org.asamk.signal.manager.groups.LastGroupAdminException;
import org.asamk.signal.manager.groups.NotAGroupMemberException;
import org.asamk.signal.manager.storage.identities.IdentityInfo;
import org.asamk.signal.util.DateUtils;
import org.asamk.signal.util.ErrorUtils;
import org.asamk.signal.util.Hex;
import org.asamk.signal.util.Util;
import org.freedesktop.dbus.exceptions.DBusExecutionException;
import org.whispersystems.libsignal.util.Pair;
import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
import org.whispersystems.signalservice.api.messages.SendMessageResult;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.util.InvalidNumberException;
import java.io.File;
@ -55,6 +63,54 @@ public class DbusSignalImpl implements Signal {
return objectPath;
}
@Override
public void updateAccount() {
try {
m.updateAccountAttributes();
} catch (IOException | Error.Failure e) {
throw new Error.Failure("UpdateAccount error: " + e.getMessage());
}
}
@Override
public List<String> listIdentity(String number) {
List<IdentityInfo> identities;
IdentityInfo theirId;
try {
identities = m.getIdentities(number);
} catch (InvalidNumberException e) {
throw new Error.InvalidNumber("Invalid number: " + e.getMessage());
}
List<String> results = new ArrayList<String>();
if (identities.isEmpty()) {return results;}
theirId = identities.get(0);
final SignalServiceAddress address = m.resolveSignalServiceAddress(theirId.getRecipientId());
var digits = Util.formatSafetyNumber(m.computeSafetyNumber(address, theirId.getIdentityKey()));
results.add(theirId.getTrustLevel().toString());
results.add(theirId.getDateAdded().toString());
results.add(Hex.toString(theirId.getFingerprint()));
results.add(digits);
return results;
}
@Override
public List<String> listDevices() {
List<Device> devices;
List<String> results = new ArrayList<String>();
try {
devices = m.getLinkedDevices();
} catch (IOException | Error.Failure e) {
throw new Error.Failure("Failed to get linked devices: " + e.getMessage());
}
for (var d : devices) {
var name = d.getName();
if (name == null) {name = "null";}
results.add(name);
}
return results;
}
@Override
public long sendMessageWithDBusAttachments(final String message, final List<DbusAttachment> dBusAttachments, final String recipient) {
var recipients = new ArrayList<String>(1);