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

Add possibility to send messages via dbus daemon

Browse source
This commit is contained in:
AsamK 2015-12-12 22:56:30 +01:00
parent a69e8facd2
commit 5859e7b9f7
3 changed files with 263 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

97
src/main/java/cli/Main.java
View file

@ -33,6 +33,8 @@ import org.whispersystems.textsecure.api.util.PhoneNumberFormatter;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.security.Security; import java.security.Security;
import java.util.ArrayList;
import java.util.List;
public class Main { public class Main {
@ -46,18 +48,51 @@ public class Main {
} }
final String username = ns.getString("username"); final String username = ns.getString("username");
final Manager m = new Manager(username); Manager m;
TextSecure ts;
DBusConnection dBusConn = null;
try {
if (ns.getBoolean("dbus") || ns.getBoolean("dbus_system")) {
try {
m = null;
int busType;
if (ns.getBoolean("dbus_system")) {
busType = DBusConnection.SYSTEM;
} else {
busType = DBusConnection.SESSION;
}
dBusConn = DBusConnection.getConnection(busType);
ts = (TextSecure) dBusConn.getRemoteObject(
"org.asamk.TextSecure", "/org/asamk/TextSecure",
TextSecure.class);
} catch (DBusException e) {
e.printStackTrace();
if (dBusConn != null) {
dBusConn.disconnect();
}
System.exit(3);
return;
}
} else {
m = new Manager(username);
ts = m;
if (m.userExists()) { if (m.userExists()) {
try { try {
m.load(); m.load();
} catch (Exception e) { } catch (Exception e) {
System.err.println("Error loading state file \"" + m.getFileName() + "\": " + e.getMessage()); System.err.println("Error loading state file \"" + m.getFileName() + "\": " + e.getMessage());
System.exit(2); System.exit(2);
return;
}
} }
} }
switch (ns.getString("command")) { switch (ns.getString("command")) {
case "register": case "register":
if (dBusConn != null) {
System.err.println("register is not yet implementd via dbus");
System.exit(1);
}
if (!m.userHasKeys()) { if (!m.userHasKeys()) {
m.createNewIdentity(); m.createNewIdentity();
} }
@ -69,6 +104,10 @@ public class Main {
} }
break; break;
case "verify": case "verify":
if (dBusConn != null) {
System.err.println("verify is not yet implementd via dbus");
System.exit(1);
}
if (!m.userHasKeys()) { if (!m.userHasKeys()) {
System.err.println("User has no keys, first call register."); System.err.println("User has no keys, first call register.");
System.exit(1); System.exit(1);
@ -85,7 +124,7 @@ public class Main {
} }
break; break;
case "send": case "send":
if (!m.isRegistered()) { if (dBusConn == null && !m.isRegistered()) {
System.err.println("User is not registered."); System.err.println("User is not registered.");
System.exit(1); System.exit(1);
} }
@ -97,7 +136,7 @@ public class Main {
System.exit(1); System.exit(1);
} }
try { try {
m.sendEndSessionMessage(ns.<String>getList("recipient")); ts.sendEndSessionMessage(ns.<String>getList("recipient"));
} catch (IOException e) { } catch (IOException e) {
handleIOException(e); handleIOException(e);
} catch (EncapsulatedExceptions e) { } catch (EncapsulatedExceptions e) {
@ -118,11 +157,15 @@ public class Main {
} }
try { try {
List<String> attachments = ns.getList("attachment");
if (attachments == null) {
attachments = new ArrayList<>();
}
if (ns.getString("group") != null) { if (ns.getString("group") != null) {
byte[] groupId = decodeGroupId(ns.getString("group")); byte[] groupId = decodeGroupId(ns.getString("group"));
m.sendGroupMessage(messageText, ns.<String>getList("attachment"), groupId); ts.sendGroupMessage(messageText, attachments, groupId);
} else { } else {
m.sendMessage(messageText, ns.<String>getList("attachment"), ns.<String>getList("recipient")); ts.sendMessage(messageText, attachments, ns.<String>getList("recipient"));
} }
} catch (IOException e) { } catch (IOException e) {
handleIOException(e); handleIOException(e);
@ -141,6 +184,10 @@ public class Main {
break; break;
case "receive": case "receive":
if (dBusConn != null) {
System.err.println("receive is not yet implementd via dbus");
System.exit(1);
}
if (!m.isRegistered()) { if (!m.isRegistered()) {
System.err.println("User is not registered."); System.err.println("User is not registered.");
System.exit(1); System.exit(1);
@ -164,6 +211,10 @@ public class Main {
} }
break; break;
case "quitGroup": case "quitGroup":
if (dBusConn != null) {
System.err.println("quitGroup is not yet implementd via dbus");
System.exit(1);
}
if (!m.isRegistered()) { if (!m.isRegistered()) {
System.err.println("User is not registered."); System.err.println("User is not registered.");
System.exit(1); System.exit(1);
@ -183,6 +234,10 @@ public class Main {
break; break;
case "updateGroup": case "updateGroup":
if (dBusConn != null) {
System.err.println("updateGroup is not yet implementd via dbus");
System.exit(1);
}
if (!m.isRegistered()) { if (!m.isRegistered()) {
System.err.println("User is not registered."); System.err.println("User is not registered.");
System.exit(1); System.exit(1);
@ -211,10 +266,16 @@ public class Main {
break; break;
case "daemon": case "daemon":
if (dBusConn != null) {
System.err.println("Stop it.");
System.exit(1);
}
if (!m.isRegistered()) { if (!m.isRegistered()) {
System.err.println("User is not registered."); System.err.println("User is not registered.");
System.exit(1); System.exit(1);
} }
DBusConnection conn = null;
try {
try { try {
int busType; int busType;
if (ns.getBoolean("system")) { if (ns.getBoolean("system")) {
@ -222,7 +283,7 @@ public class Main {
} else { } else {
busType = DBusConnection.SESSION; busType = DBusConnection.SESSION;
} }
DBusConnection conn = DBusConnection.getConnection(busType); conn = DBusConnection.getConnection(busType);
conn.requestBusName("org.asamk.TextSecure"); conn.requestBusName("org.asamk.TextSecure");
conn.exportObject("/org/asamk/TextSecure", m); conn.exportObject("/org/asamk/TextSecure", m);
} catch (DBusException e) { } catch (DBusException e) {
@ -237,10 +298,20 @@ public class Main {
} catch (AssertionError e) { } catch (AssertionError e) {
handleAssertionError(e); handleAssertionError(e);
} }
} finally {
if (conn != null) {
conn.disconnect();
}
}
break; break;
} }
System.exit(0); System.exit(0);
} finally {
if (dBusConn != null) {
dBusConn.disconnect();
}
}
} }
private static void handleGroupNotFoundException(GroupNotFoundException e) { private static void handleGroupNotFoundException(GroupNotFoundException e) {
@ -266,12 +337,20 @@ public class Main {
.description("Commandline interface for TextSecure.") .description("Commandline interface for TextSecure.")
.version(Manager.PROJECT_NAME + " " + Manager.PROJECT_VERSION); .version(Manager.PROJECT_NAME + " " + Manager.PROJECT_VERSION);
parser.addArgument("-u", "--username")
.help("Specify your phone number, that will be used for verification.");
parser.addArgument("-v", "--version") parser.addArgument("-v", "--version")
.help("Show package version.") .help("Show package version.")
.action(Arguments.version()); .action(Arguments.version());
MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup();
mut.addArgument("-u", "--username")
.help("Specify your phone number, that will be used for verification.");
mut.addArgument("--dbus")
.help("Make request via user dbus.")
.action(Arguments.storeTrue());
mut.addArgument("--dbus-system")
.help("Make request via system dbus.")
.action(Arguments.storeTrue());
Subparsers subparsers = parser.addSubparsers() Subparsers subparsers = parser.addSubparsers()
.title("subcommands") .title("subcommands")
.dest("command") .dest("command")
@ -330,6 +409,7 @@ public class Main {
try { try {
Namespace ns = parser.parseArgs(args); Namespace ns = parser.parseArgs(args);
if (!ns.getBoolean("dbus") && !ns.getBoolean("dbus_system")) {
if (ns.getString("username") == null) { if (ns.getString("username") == null) {
parser.printUsage(); parser.printUsage();
System.err.println("You need to specify a username (phone number)"); System.err.println("You need to specify a username (phone number)");
@ -339,6 +419,7 @@ public class Main {
System.err.println("Invalid username (phone number), make sure you include the country code."); System.err.println("Invalid username (phone number), make sure you include the country code.");
System.exit(2); System.exit(2);
} }
}
if (ns.getList("recipient") != null && !ns.getList("recipient").isEmpty() && ns.getString("group") != null) { if (ns.getList("recipient") != null && !ns.getList("recipient").isEmpty() && ns.getString("group") != null) {
System.err.println("You cannot specify recipients by phone number and groups a the same time"); System.err.println("You cannot specify recipients by phone number and groups a the same time");
System.exit(2); System.exit(2);

4
src/main/java/cli/Manager.java
View file

@ -367,8 +367,9 @@ class Manager implements TextSecure {
sendMessage(message, attachments, recipients); sendMessage(message, attachments, recipients);
} }
@Override
public void sendMessage(String messageText, List<String> attachments, public void sendMessage(String messageText, List<String> attachments,
Collection<String> recipients) List<String> recipients)
throws IOException, EncapsulatedExceptions, AttachmentInvalidException { throws IOException, EncapsulatedExceptions, AttachmentInvalidException {
final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder().withBody(messageText); final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder().withBody(messageText);
if (attachments != null) { if (attachments != null) {
@ -379,6 +380,7 @@ class Manager implements TextSecure {
sendMessage(message, recipients); sendMessage(message, recipients);
} }
@Override
public void sendEndSessionMessage(List<String> recipients) throws IOException, EncapsulatedExceptions { public void sendEndSessionMessage(List<String> recipients) throws IOException, EncapsulatedExceptions {
TextSecureDataMessage message = TextSecureDataMessage.newBuilder() TextSecureDataMessage message = TextSecureDataMessage.newBuilder()
.asEndSessionMessage() .asEndSessionMessage()

4
src/main/java/cli/TextSecure.java
View file

@ -9,5 +9,9 @@ import java.util.List;
public interface TextSecure extends DBusInterface { public interface TextSecure extends DBusInterface {
void sendMessage(String message, List<String> attachments, String recipient) throws EncapsulatedExceptions, AttachmentInvalidException, IOException; void sendMessage(String message, List<String> attachments, String recipient) throws EncapsulatedExceptions, AttachmentInvalidException, IOException;
void sendMessage(String message, List<String> attachments, List<String> recipients) throws EncapsulatedExceptions, AttachmentInvalidException, IOException;
void sendEndSessionMessage(List<String> recipients) throws IOException, EncapsulatedExceptions;
void sendGroupMessage(String message, List<String> attachments, byte[] groupId) throws EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, IOException; void sendGroupMessage(String message, List<String> attachments, byte[] groupId) throws EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, IOException;
} }