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

reverted sendMessage, completed isContactBlocked, fixed formatting

Browse source
This commit is contained in:
Adimarantis 2021-02-27 09:58:17 +01:00
parent 4cea401792
commit 6f04361a01
2 changed files with 109 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,7 @@ import java.util.List;
*/
public interface Signal extends DBusInterface {
long sendMessageSingle(
long sendMessage(
String message, List<String> attachments, String recipient
) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.UntrustedIdentity;

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

@ -43,7 +43,7 @@ public class DbusSignalImpl implements Signal {
}
@Override
public long sendMessageSingle(final String message, final List<String> attachments, final String recipient) {
public long sendMessage(final String message, final List<String> attachments, final String recipient) {
var recipients = new ArrayList<String>(1);
recipients.add(recipient);
return sendMessage(message, attachments, recipients);
@ -65,9 +65,8 @@ public class DbusSignalImpl implements Signal {
}
}
private static void checkSendMessageResults(
long timestamp, List<SendMessageResult> results
) throws DBusExecutionException {
private static void checkSendMessageResults(long timestamp, List<SendMessageResult> results)
throws DBusExecutionException {
if (results.size() == 1) {
checkSendMessageResult(timestamp, results.get(0));
return;
@ -90,14 +89,6 @@ public class DbusSignalImpl implements Signal {
@Override
public long sendMessage(final String message, final List<String> attachments, final List<String> recipients) {
System.out.println("Sending messsage:"+message);
System.out.println("Sending rec:"+recipients);
for (String r : recipients) {
System.out.println("to:"+r);
}
for (String r : attachments) {
System.out.println("at:"+r);
}
try {
final var results = m.sendMessage(message, attachments, recipients);
checkSendMessageResults(results.first(), results.second());
@ -112,9 +103,8 @@ public class DbusSignalImpl implements Signal {
}
@Override
public long sendNoteToSelfMessage(
final String message, final List<String> attachments
) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
public long sendNoteToSelfMessage(final String message, final List<String> attachments)
throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
try {
final var results = m.sendSelfMessage(message, attachments);
checkSendMessageResult(results.first(), results.second());
@ -153,8 +143,10 @@ public class DbusSignalImpl implements Signal {
}
}
//Since contact names might be empty if not defined, also potentially return the profile name
//Profile names separate firstname/lastname by a \0 - replace by space otherwise the interface will hickup
// Since contact names might be empty if not defined, also potentially return
// the profile name
// Profile names separate firstname/lastname by a \0 - replace by space
// otherwise the interface will hickup
@Override
public String getContactName(final String number) {
String name = m.getContactOrProfileName(number).replace("\0", " ");
@ -214,11 +206,8 @@ public class DbusSignalImpl implements Signal {
if (group == null) {
return List.of();
} else {
return group.getMembers()
.stream()
.map(m::resolveSignalServiceAddress)
.map(SignalServiceAddress::getLegacyIdentifier)
.collect(Collectors.toList());
return group.getMembers().stream().map(m::resolveSignalServiceAddress)
.map(SignalServiceAddress::getLegacyIdentifier).collect(Collectors.toList());
}
}
@ -237,9 +226,7 @@ public class DbusSignalImpl implements Signal {
if (avatar.isEmpty()) {
avatar = null;
}
final var results = m.updateGroup(groupId == null ? null : GroupId.unknownVersion(groupId),
name,
members,
final var results = m.updateGroup(groupId == null ? null : GroupId.unknownVersion(groupId), name, members,
avatar == null ? null : new File(avatar));
checkSendMessageResults(0, results.second());
return results.first().serialize();
@ -260,19 +247,13 @@ public class DbusSignalImpl implements Signal {
}
@Override
public void updateProfile(
final String name,
final String about,
final String aboutEmoji,
String avatarPath,
final boolean removeAvatar
) {
public void updateProfile(final String name, final String about, final String aboutEmoji, String avatarPath,
final boolean removeAvatar) {
try {
if (avatarPath.isEmpty()) {
avatarPath = null;
}
Optional<File> avatarFile = removeAvatar
? Optional.absent()
Optional<File> avatarFile = removeAvatar ? Optional.absent()
: avatarPath == null ? null : Optional.of(new File(avatarPath));
m.setProfile(name, about, aboutEmoji, avatarFile);
} catch (IOException e) {
@ -280,13 +261,15 @@ public class DbusSignalImpl implements Signal {
}
}
//Provide option to query a version string in order to react on potential future interface changes
// Provide option to query a version string in order to react on potential
// future interface changes
@Override
public String version() {
return BaseConfig.PROJECT_VERSION;
}
//Create a unique list of Numbers from Identities and Contacts to really get all numbers the system knows
// Create a unique list of Numbers from Identities and Contacts to really get
// all numbers the system knows
@Override
public List<String> listNumbers() {
List<String> numbers = new ArrayList<>();
@ -365,7 +348,13 @@ public class DbusSignalImpl implements Signal {
@Override
public boolean isContactBlocked(final String number) {
return false;
var contacts = m.getContacts();
for (var c : contacts) {
if (c.number.equals(number)) {
return c.blocked;
}
}
throw new Error.InvalidNumber("Contact not found");
}
@Override
@ -388,5 +377,4 @@ public class DbusSignalImpl implements Signal {
}
}
}