System.exit(1);
}
+ int res = handleCommands(ns);
+ System.exit(res);
+ }
+
+ private static int handleCommands(Namespace ns) {
final String username = ns.getString("username");
Manager m;
Signal ts;
if (dBusConn != null) {
dBusConn.disconnect();
}
- System.exit(3);
- return;
+ return 3;
}
} else {
String settingsPath = ns.getString("config");
m.load();
} catch (Exception e) {
System.err.println("Error loading state file \"" + m.getFileName() + "\": " + e.getMessage());
- System.exit(2);
- return;
+ return 2;
}
}
}
case "register":
if (dBusConn != null) {
System.err.println("register is not yet implemented via dbus");
- System.exit(1);
+ return 1;
}
if (!m.userHasKeys()) {
m.createNewIdentity();
m.register(ns.getBoolean("voice"));
} catch (IOException e) {
System.err.println("Request verify error: " + e.getMessage());
- System.exit(3);
+ return 3;
}
break;
case "verify":
if (dBusConn != null) {
System.err.println("verify is not yet implemented via dbus");
- System.exit(1);
+ return 1;
}
if (!m.userHasKeys()) {
System.err.println("User has no keys, first call register.");
- System.exit(1);
+ return 1;
}
if (m.isRegistered()) {
System.err.println("User registration is already verified");
- System.exit(1);
+ return 1;
}
try {
m.verifyAccount(ns.getString("verificationCode"));
} catch (IOException e) {
System.err.println("Verify error: " + e.getMessage());
- System.exit(3);
+ return 3;
}
break;
case "link":
if (dBusConn != null) {
System.err.println("link is not yet implemented via dbus");
- System.exit(1);
+ return 1;
}
// When linking, username is null and we always have to create keys
System.out.println("Associated with: " + m.getUsername());
} catch (TimeoutException e) {
System.err.println("Link request timed out, please try again.");
- System.exit(3);
+ return 3;
} catch (IOException e) {
System.err.println("Link request error: " + e.getMessage());
- System.exit(3);
+ return 3;
} catch (InvalidKeyException e) {
e.printStackTrace();
- System.exit(3);
+ return 2;
} catch (UserAlreadyExists e) {
System.err.println("The user " + e.getUsername() + " already exists\nDelete \"" + e.getFileName() + "\" before trying again.");
- System.exit(3);
+ return 1;
}
break;
case "addDevice":
if (dBusConn != null) {
System.err.println("link is not yet implemented via dbus");
- System.exit(1);
+ return 1;
}
if (!m.isRegistered()) {
System.err.println("User is not registered.");
- System.exit(1);
+ return 1;
}
try {
m.addDeviceLink(new URI(ns.getString("uri")));
} catch (IOException e) {
e.printStackTrace();
- System.exit(3);
+ return 3;
} catch (InvalidKeyException e) {
e.printStackTrace();
- System.exit(2);
+ return 2;
} catch (URISyntaxException e) {
e.printStackTrace();
- System.exit(2);
+ return 2;
}
break;
case "listDevices":
if (dBusConn != null) {
System.err.println("listDevices is not yet implemented via dbus");
- System.exit(1);
+ return 1;
}
if (!m.isRegistered()) {
System.err.println("User is not registered.");
- System.exit(1);
+ return 1;
}
try {
List<DeviceInfo> devices = m.getLinkedDevices();
}
} catch (IOException e) {
e.printStackTrace();
- System.exit(3);
+ return 3;
}
break;
case "removeDevice":
if (dBusConn != null) {
System.err.println("removeDevice is not yet implemented via dbus");
- System.exit(1);
+ return 1;
}
if (!m.isRegistered()) {
System.err.println("User is not registered.");
- System.exit(1);
+ return 1;
}
try {
int deviceId = ns.getInt("deviceId");
m.removeLinkedDevices(deviceId);
} catch (IOException e) {
e.printStackTrace();
- System.exit(3);
+ return 3;
}
break;
case "send":
if (dBusConn == null && !m.isRegistered()) {
System.err.println("User is not registered.");
- System.exit(1);
+ return 1;
}
if (ns.getBoolean("endsession")) {
if (ns.getList("recipient") == null) {
System.err.println("No recipients given");
System.err.println("Aborting sending.");
- System.exit(1);
+ return 1;
}
try {
ts.sendEndSessionMessage(ns.<String>getList("recipient"));
} catch (IOException e) {
handleIOException(e);
+ return 3;
} catch (EncapsulatedExceptions e) {
handleEncapsulatedExceptions(e);
+ return 3;
} catch (AssertionError e) {
handleAssertionError(e);
+ return 1;
} catch (DBusExecutionException e) {
handleDBusExecutionException(e);
- } catch (UntrustedIdentityException e) {
- e.printStackTrace();
+ return 1;
}
} else {
String messageText = ns.getString("message");
} catch (IOException e) {
System.err.println("Failed to read message from stdin: " + e.getMessage());
System.err.println("Aborting sending.");
- System.exit(1);
+ return 1;
}
}
}
} catch (IOException e) {
handleIOException(e);
+ return 3;
} catch (EncapsulatedExceptions e) {
handleEncapsulatedExceptions(e);
+ return 3;
} catch (AssertionError e) {
handleAssertionError(e);
+ return 1;
} catch (GroupNotFoundException e) {
handleGroupNotFoundException(e);
+ return 1;
} catch (AttachmentInvalidException e) {
System.err.println("Failed to add attachment: " + e.getMessage());
System.err.println("Aborting sending.");
- System.exit(1);
+ return 1;
} catch (DBusExecutionException e) {
handleDBusExecutionException(e);
- } catch (UntrustedIdentityException e) {
- e.printStackTrace();
+ return 1;
}
}
});
} catch (DBusException e) {
e.printStackTrace();
+ return 1;
}
while (true) {
try {
Thread.sleep(10000);
} catch (InterruptedException e) {
- System.exit(0);
+ return 0;
}
}
}
if (!m.isRegistered()) {
System.err.println("User is not registered.");
- System.exit(1);
+ return 1;
}
int timeout = 5;
if (ns.getInt("timeout") != null) {
m.receiveMessages(timeout, returnOnTimeout, new ReceiveMessageHandler(m));
} catch (IOException e) {
System.err.println("Error while receiving messages: " + e.getMessage());
- System.exit(3);
+ return 3;
} catch (AssertionError e) {
handleAssertionError(e);
+ return 1;
}
break;
case "quitGroup":
if (dBusConn != null) {
System.err.println("quitGroup is not yet implemented via dbus");
- System.exit(1);
+ return 1;
}
if (!m.isRegistered()) {
System.err.println("User is not registered.");
- System.exit(1);
+ return 1;
}
try {
m.sendQuitGroupMessage(decodeGroupId(ns.getString("group")));
} catch (IOException e) {
handleIOException(e);
+ return 3;
} catch (EncapsulatedExceptions e) {
handleEncapsulatedExceptions(e);
+ return 3;
} catch (AssertionError e) {
handleAssertionError(e);
+ return 1;
} catch (GroupNotFoundException e) {
handleGroupNotFoundException(e);
- } catch (UntrustedIdentityException e) {
- e.printStackTrace();
+ return 1;
}
break;
case "updateGroup":
if (dBusConn != null) {
System.err.println("updateGroup is not yet implemented via dbus");
- System.exit(1);
+ return 1;
}
if (!m.isRegistered()) {
System.err.println("User is not registered.");
- System.exit(1);
+ return 1;
}
try {
}
} catch (IOException e) {
handleIOException(e);
+ return 3;
} catch (AttachmentInvalidException e) {
System.err.println("Failed to add avatar attachment for group\": " + e.getMessage());
System.err.println("Aborting sending.");
- System.exit(1);
+ return 1;
} catch (GroupNotFoundException e) {
handleGroupNotFoundException(e);
+ return 1;
} catch (EncapsulatedExceptions e) {
handleEncapsulatedExceptions(e);
- } catch (UntrustedIdentityException e) {
- e.printStackTrace();
+ return 3;
}
break;
case "daemon":
if (dBusConn != null) {
System.err.println("Stop it.");
- System.exit(1);
+ return 1;
}
if (!m.isRegistered()) {
System.err.println("User is not registered.");
- System.exit(1);
+ return 1;
}
DBusConnection conn = null;
try {
conn.requestBusName(SIGNAL_BUSNAME);
} catch (DBusException e) {
e.printStackTrace();
- System.exit(3);
+ return 2;
}
try {
m.receiveMessages(3600, false, new DbusReceiveMessageHandler(m, conn));
} catch (IOException e) {
System.err.println("Error while receiving messages: " + e.getMessage());
- System.exit(3);
+ return 3;
} catch (AssertionError e) {
handleAssertionError(e);
+ return 1;
}
} finally {
if (conn != null) {
break;
}
- System.exit(0);
+ return 0;
} finally {
if (dBusConn != null) {
dBusConn.disconnect();
private static void handleGroupNotFoundException(GroupNotFoundException e) {
System.err.println("Failed to send to group: " + e.getMessage());
System.err.println("Aborting sending.");
- System.exit(1);
}
private static void handleDBusExecutionException(DBusExecutionException e) {
System.err.println("Cannot connect to dbus: " + e.getMessage());
System.err.println("Aborting.");
- System.exit(1);
}
private static byte[] decodeGroupId(String groupId) {
System.err.println("Failed to send/receive message (Assertion): " + e.getMessage());
e.printStackTrace();
System.err.println("If you use an Oracle JRE please check if you have unlimited strength crypto enabled, see README");
- System.exit(1);
}
private static void handleEncapsulatedExceptions(EncapsulatedExceptions e) {
}
@Override
- public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, GroupInfo group) {
+ public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content) {
SignalServiceAddress source = envelope.getSourceAddress();
ContactInfo sourceContact = m.getContact(source.getNumber());
System.out.println(String.format("Envelope from: %s (device: %d)", (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + source.getNumber(), envelope.getSourceDevice()));
} else {
if (content.getDataMessage().isPresent()) {
SignalServiceDataMessage message = content.getDataMessage().get();
- handleSignalServiceDataMessage(message, group);
+ handleSignalServiceDataMessage(message);
}
if (content.getSyncMessage().isPresent()) {
System.out.println("Received a sync message");
}
System.out.println("To: " + to + " , Message timestamp: " + sentTranscriptMessage.getTimestamp());
SignalServiceDataMessage message = sentTranscriptMessage.getMessage();
- handleSignalServiceDataMessage(message, null);
+ handleSignalServiceDataMessage(message);
}
}
}
System.out.println();
}
- // TODO remove group parameter
- private void handleSignalServiceDataMessage(SignalServiceDataMessage message, GroupInfo group) {
+ private void handleSignalServiceDataMessage(SignalServiceDataMessage message) {
System.out.println("Message timestamp: " + message.getTimestamp());
if (message.getBody().isPresent()) {
SignalServiceGroup groupInfo = message.getGroupInfo().get();
System.out.println("Group info:");
System.out.println(" Id: " + Base64.encodeBytes(groupInfo.getGroupId()));
- if (groupInfo.getName().isPresent()) {
+ if (groupInfo.getType() == SignalServiceGroup.Type.UPDATE && groupInfo.getName().isPresent()) {
System.out.println(" Name: " + groupInfo.getName().get());
- } else if (group != null) {
- System.out.println(" Name: " + group.name);
} else {
- System.out.println(" Name: <Unknown group>");
+ GroupInfo group = m.getGroup(groupInfo.getGroupId());
+ if (group != null) {
+ System.out.println(" Name: " + group.name);
+ } else {
+ System.out.println(" Name: <Unknown group>");
+ }
}
System.out.println(" Type: " + groupInfo.getType());
if (groupInfo.getMembers().isPresent()) {
}
@Override
- public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, GroupInfo group) {
- super.handleMessage(envelope, content, group);
+ public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content) {
+ super.handleMessage(envelope, content);
if (!envelope.isReceipt() && content != null && content.getDataMessage().isPresent()) {
SignalServiceDataMessage message = content.getDataMessage().get();
git.nmode.ca / signal-cli / blobdiff
