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

Fix some inspection issues

Browse source
This commit is contained in:
AsamK 2020-03-21 14:41:11 +01:00
parent 0dc6b1327e
commit d7f7c84e6c
6 changed files with 35 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/main/java/org/asamk/signal/commands/ReceiveCommand.java
View file

@ -37,31 +37,24 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) { public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {
if (dbusconnection != null) { if (dbusconnection != null) {
try { try {
dbusconnection.addSigHandler(Signal.MessageReceived.class, new DBusSigHandler<Signal.MessageReceived>() { dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> {
@Override System.out.print(String.format("Envelope from: %s\nTimestamp: %s\nBody: %s\n",
public void handle(Signal.MessageReceived s) { messageReceived.getSender(), DateUtils.formatTimestamp(messageReceived.getTimestamp()), messageReceived.getMessage()));
System.out.print(String.format("Envelope from: %s\nTimestamp: %s\nBody: %s\n", if (messageReceived.getGroupId().length > 0) {
s.getSender(), DateUtils.formatTimestamp(s.getTimestamp()), s.getMessage())); System.out.println("Group info:");
if (s.getGroupId().length > 0) { System.out.println(" Id: " + Base64.encodeBytes(messageReceived.getGroupId()));
System.out.println("Group info:");
System.out.println(" Id: " + Base64.encodeBytes(s.getGroupId()));
}
if (s.getAttachments().size() > 0) {
System.out.println("Attachments: ");
for (String attachment : s.getAttachments()) {
System.out.println("- Stored plaintext in: " + attachment);
}
}
System.out.println();
} }
}); if (messageReceived.getAttachments().size() > 0) {
dbusconnection.addSigHandler(Signal.ReceiptReceived.class, new DBusSigHandler<Signal.ReceiptReceived>() { System.out.println("Attachments: ");
@Override for (String attachment : messageReceived.getAttachments()) {
public void handle(Signal.ReceiptReceived s) { System.out.println("- Stored plaintext in: " + attachment);
System.out.print(String.format("Receipt from: %s\nTimestamp: %s\n", }
s.getSender(), DateUtils.formatTimestamp(s.getTimestamp())));
} }
System.out.println();
}); });
dbusconnection.addSigHandler(Signal.ReceiptReceived.class,
receiptReceived -> System.out.print(String.format("Receipt from: %s\nTimestamp: %s\n",
receiptReceived.getSender(), DateUtils.formatTimestamp(receiptReceived.getTimestamp()))));
} catch (UnsatisfiedLinkError e) { } catch (UnsatisfiedLinkError e) {
System.err.println("Missing native library dependency for dbus service: " + e.getMessage()); System.err.println("Missing native library dependency for dbus service: " + e.getMessage());
return 1; return 1;

2
src/main/java/org/asamk/signal/commands/RemovePinCommand.java
View file

@ -21,7 +21,7 @@ public class RemovePinCommand implements LocalCommand {
return 1; return 1;
} }
try { try {
m.setRegistrationLockPin(Optional.<String>absent()); m.setRegistrationLockPin(Optional.absent());
return 0; return 0;
} catch (IOException e) { } catch (IOException e) {
System.err.println("Remove pin error: " + e.getMessage()); System.err.println("Remove pin error: " + e.getMessage());

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

@ -61,7 +61,7 @@ public class SendCommand implements DbusCommand {
if (ns.getBoolean("endsession")) { if (ns.getBoolean("endsession")) {
try { try {
signal.sendEndSessionMessage(ns.<String>getList("recipient")); signal.sendEndSessionMessage(ns.getList("recipient"));
return 0; return 0;
} catch (IOException e) { } catch (IOException e) {
handleIOException(e); handleIOException(e);
@ -98,7 +98,7 @@ public class SendCommand implements DbusCommand {
byte[] groupId = Util.decodeGroupId(ns.getString("group")); byte[] groupId = Util.decodeGroupId(ns.getString("group"));
signal.sendGroupMessage(messageText, attachments, groupId); signal.sendGroupMessage(messageText, attachments, groupId);
} else { } else {
signal.sendMessage(messageText, attachments, ns.<String>getList("recipient")); signal.sendMessage(messageText, attachments, ns.getList("recipient"));
} }
return 0; return 0;
} catch (IOException e) { } catch (IOException e) {

2
src/main/java/org/asamk/signal/commands/SendReactionCommand.java
View file

@ -69,7 +69,7 @@ public class SendReactionCommand implements LocalCommand {
byte[] groupId = Util.decodeGroupId(ns.getString("group")); byte[] groupId = Util.decodeGroupId(ns.getString("group"));
m.sendGroupMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, groupId); m.sendGroupMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, groupId);
} else { } else {
m.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, ns.<String>getList("recipient")); m.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, ns.getList("recipient"));
} }
return 0; return 0;
} catch (IOException e) { } catch (IOException e) {

33
src/main/java/org/asamk/signal/manager/Manager.java
View file

@ -260,9 +260,9 @@ public class Manager implements Signal {
accountManager = getSignalServiceAccountManager(); accountManager = getSignalServiceAccountManager();
if (voiceVerification) { if (voiceVerification) {
accountManager.requestVoiceVerificationCode(Locale.getDefault(), Optional.<String>absent(), Optional.<String>absent()); accountManager.requestVoiceVerificationCode(Locale.getDefault(), Optional.absent(), Optional.absent());
} else { } else {
accountManager.requestSmsVerificationCode(false, Optional.<String>absent(), Optional.<String>absent()); accountManager.requestSmsVerificationCode(false, Optional.absent(), Optional.absent());
} }
account.setRegistered(false); account.setRegistered(false);
@ -291,7 +291,7 @@ public class Manager implements Signal {
// When setting an empty GCM id, the Signal-Server also sets the fetchesMessages property to false. // 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 master 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. // If this is a linked device, other users can still send messages, but this device doesn't receive them anymore.
accountManager.setGcmId(Optional.<String>absent()); accountManager.setGcmId(Optional.absent());
account.setRegistered(false); account.setRegistered(false);
account.save(); account.save();
@ -443,7 +443,7 @@ public class Manager implements Signal {
private SignalServiceMessageSender getMessageSender() { private SignalServiceMessageSender getMessageSender() {
return new SignalServiceMessageSender(BaseConfig.serviceConfiguration, null, username, account.getPassword(), return new SignalServiceMessageSender(BaseConfig.serviceConfiguration, null, username, account.getPassword(),
account.getDeviceId(), account.getSignalProtocolStore(), BaseConfig.USER_AGENT, account.isMultiDevice(), Optional.fromNullable(messagePipe), Optional.fromNullable(unidentifiedMessagePipe), Optional.<SignalServiceMessageSender.EventListener>absent()); account.getDeviceId(), account.getSignalProtocolStore(), BaseConfig.USER_AGENT, account.isMultiDevice(), Optional.fromNullable(messagePipe), Optional.fromNullable(unidentifiedMessagePipe), Optional.absent());
} }
private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(byte[] groupId) throws IOException { private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(byte[] groupId) throws IOException {
@ -891,7 +891,7 @@ public class Manager implements Signal {
private List<Optional<UnidentifiedAccessPair>> getAccessFor(Collection<SignalServiceAddress> recipients) { private List<Optional<UnidentifiedAccessPair>> getAccessFor(Collection<SignalServiceAddress> recipients) {
List<Optional<UnidentifiedAccessPair>> result = new ArrayList<>(recipients.size()); List<Optional<UnidentifiedAccessPair>> result = new ArrayList<>(recipients.size());
for (SignalServiceAddress recipient : recipients) { for (SignalServiceAddress recipient : recipients) {
result.add(Optional.<UnidentifiedAccessPair>absent()); result.add(Optional.absent());
} }
return result; return result;
} }
@ -1217,16 +1217,13 @@ public class Manager implements Signal {
Exception exception = null; Exception exception = null;
final long now = new Date().getTime(); final long now = new Date().getTime();
try { try {
envelope = messagePipe.read(timeout, unit, new SignalServiceMessagePipe.MessagePipeCallback() { envelope = messagePipe.read(timeout, unit, envelope1 -> {
@Override // store message on disk, before acknowledging receipt to the server
public void onMessage(SignalServiceEnvelope envelope) { try {
// store message on disk, before acknowledging receipt to the server File cacheFile = getMessageCacheFile(envelope1.getSourceE164().get(), now, envelope1.getTimestamp());
try { Utils.storeEnvelope(envelope1, cacheFile);
File cacheFile = getMessageCacheFile(envelope.getSourceE164().get(), now, envelope.getTimestamp()); } catch (IOException e) {
Utils.storeEnvelope(envelope, cacheFile); System.err.println("Failed to store encrypted message in disk cache, ignoring: " + e.getMessage());
} catch (IOException e) {
System.err.println("Failed to store encrypted message in disk cache, ignoring: " + e.getMessage());
}
} }
}); });
} catch (TimeoutException e) { } catch (TimeoutException e) {
@ -1633,10 +1630,10 @@ public class Manager implements Signal {
if (account.getProfileKey() != null) { if (account.getProfileKey() != null) {
// Send our own profile key as well // Send our own profile key as well
out.write(new DeviceContact(account.getSelfAddress(), out.write(new DeviceContact(account.getSelfAddress(),
Optional.<String>absent(), Optional.<SignalServiceAttachmentStream>absent(), Optional.absent(), Optional.absent(),
Optional.<String>absent(), Optional.<VerifiedMessage>absent(), Optional.absent(), Optional.absent(),
Optional.of(account.getProfileKey()), Optional.of(account.getProfileKey()),
false, Optional.<Integer>absent(), Optional.<Integer>absent(), false)); false, Optional.absent(), Optional.absent(), false));
} }
} }

2
src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
View file

@ -185,7 +185,7 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
} }
} }
public class Identity { public static class Identity {
IdentityKey identityKey; IdentityKey identityKey;
TrustLevel trustLevel; TrustLevel trustLevel;