From 2ba0321bfc0d255cc167c0c9686428b00cf43388 Mon Sep 17 00:00:00 2001 From: Luca Conte Date: Tue, 17 May 2016 11:19:50 +0200 Subject: [PATCH 1/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a0a22a08..16a79640 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ usage: signal-cli [-h] [-v] [--config CONFIG] [-u USERNAME | --dbus | --dbus-sys * Create a group - signal-cli -u USERNAME updateGroup -n "Group name" -m [MEMBER [MEMBER ...]] + signal-cli -u USERNAME updateGroup -name "Group name" -member [MEMBER [MEMBER ...]] * Update a group From be31eed294f94ff85e5bc7113e6182915c3e0c3f Mon Sep 17 00:00:00 2001 From: Luca Conte Date: Tue, 17 May 2016 11:26:02 +0200 Subject: [PATCH 2/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 16a79640..a0a22a08 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ usage: signal-cli [-h] [-v] [--config CONFIG] [-u USERNAME | --dbus | --dbus-sys * Create a group - signal-cli -u USERNAME updateGroup -name "Group name" -member [MEMBER [MEMBER ...]] + signal-cli -u USERNAME updateGroup -n "Group name" -m [MEMBER [MEMBER ...]] * Update a group From 11baf18faeff8c9674d5b936a8ac1ba3a688f51f Mon Sep 17 00:00:00 2001 From: conte Date: Wed, 18 May 2016 15:14:38 +0200 Subject: [PATCH 3/8] Added Quit group option --- src/main/java/org/asamk/signal/Main.java | 9 ++++++--- src/main/java/org/asamk/signal/Manager.java | 17 +++++++++++++---- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java index 8aede3d6..4e0fc3b8 100644 --- a/src/main/java/org/asamk/signal/Main.java +++ b/src/main/java/org/asamk/signal/Main.java @@ -403,7 +403,7 @@ public class Main { if (ns.getString("group") != null) { groupId = decodeGroupId(ns.getString("group")); } - byte[] newGroupId = m.sendUpdateGroupMessage(groupId, ns.getString("name"), ns.getList("member"), ns.getString("avatar")); + byte[] newGroupId = m.sendUpdateGroupMessage(groupId, ns.getString("name"), ns.getList("member"), ns.getString("avatar"), ns.getString("quit")!=null); if (groupId == null) { System.out.println("Creating new group \"" + Base64.encodeBytes(newGroupId) + "\" …"); } @@ -504,7 +504,7 @@ public class Main { .help("Show package version.") .action(Arguments.version()); parser.addArgument("--config") - .help("Set the path, where to store the config (Default: $HOME/.config/signal-cli)."); + .help("Set the path, where to store the config (Default: $HOME/.config/signal)."); MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup(); mut.addArgument("-u", "--username") @@ -550,7 +550,7 @@ public class Main { Subparser parserSend = subparsers.addParser("send"); parserSend.addArgument("-g", "--group") - .help("Specify the recipient group ID."); + .help("Specify the recipient group ID. If '-m' parameter is not present the messag is read from STDIN and yuo have to type CTRL+D (aka EOF) in order to stop reading and sending the content"); parserSend.addArgument("recipient") .help("Specify the recipients' phone number.") .nargs("*"); @@ -575,6 +575,9 @@ public class Main { .help("Specify the new group name."); parserUpdateGroup.addArgument("-a", "--avatar") .help("Specify a new group avatar image file"); + parserUpdateGroup.addArgument("-q", "--quit") + .help("Quit from the group") + .action(Arguments.storeTrue()); parserUpdateGroup.addArgument("-m", "--member") .nargs("*") .help("Specify one or more members to add to the group"); diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java index 6295f730..456fd84a 100644 --- a/src/main/java/org/asamk/signal/Manager.java +++ b/src/main/java/org/asamk/signal/Manager.java @@ -63,8 +63,16 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; class Manager implements Signal { - private final static String URL = "https://textsecure-service.whispersystems.org"; - private final static TrustStore TRUST_STORE = new WhisperTrustStore(); + // private final static String URL = "https://10.1.4.252:8080"; + // private final static TrustStore TRUST_STORE = new TenOneFourTwohundredfiftyfourTrustStore(); + + // private final static String URL = "https://127.0.0.1:8080"; + // private final static TrustStore TRUST_STORE = new LoopbackTrustStore(); + + private final static String URL = "https://signal.sinesy.it:8080"; + private final static TrustStore TRUST_STORE = new SinesyTrustStore(); + //private final static String URL = "https://textsecure-service.whispersystems.org"; + //private final static TrustStore TRUST_STORE = new WhisperTrustStore(); public final static String PROJECT_NAME = Manager.class.getPackage().getImplementationTitle(); public final static String PROJECT_VERSION = Manager.class.getPackage().getImplementationVersion(); @@ -456,7 +464,7 @@ class Manager implements Signal { sendMessage(message, g.members); } - public byte[] sendUpdateGroupMessage(byte[] groupId, String name, Collection members, String avatarFile) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, UntrustedIdentityException { + public byte[] sendUpdateGroupMessage(byte[] groupId, String name, Collection members, String avatarFile, boolean quit) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, UntrustedIdentityException { GroupInfo g; if (groupId == null) { // Create new group @@ -482,11 +490,12 @@ class Manager implements Signal { } } - SignalServiceGroup.Builder group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.UPDATE) + SignalServiceGroup.Builder group = SignalServiceGroup.newBuilder(quit?SignalServiceGroup.Type.QUIT:SignalServiceGroup.Type.UPDATE) .withId(g.groupId) .withName(g.name) .withMembers(new ArrayList<>(g.members)); + if (avatarFile != null) { try { group.withAvatar(createAttachment(avatarFile)); From 2a7f83ff118eb64850f4a273653e9b5909b2146c Mon Sep 17 00:00:00 2001 From: Luca Conte Date: Wed, 18 May 2016 15:25:01 +0200 Subject: [PATCH 4/8] Update README.md quit option --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index a0a22a08..17f11a38 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,10 @@ usage: signal-cli [-h] [-v] [--config CONFIG] [-u USERNAME | --dbus | --dbus-sys * Send a message to a group signal-cli -u USERNAME send -m "This is a message" -g GROUP_ID + + * Leave a group + + -u USERNAME updateGroup -g GROUP_ID -q * Linking other devices (Provisioning) From f7c2099498393f5120f0859faac67a7ce9bb991b Mon Sep 17 00:00:00 2001 From: Luca Conte Date: Wed, 18 May 2016 15:26:03 +0200 Subject: [PATCH 5/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 17f11a38..5dccac9d 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ usage: signal-cli [-h] [-v] [--config CONFIG] [-u USERNAME | --dbus | --dbus-sys * Leave a group - -u USERNAME updateGroup -g GROUP_ID -q + -u USERNAME updateGroup -g GROUP_ID -q * Linking other devices (Provisioning) From 776b2331f3b24f8294e4f48cf9c4631e17d7b15d Mon Sep 17 00:00:00 2001 From: Luca Conte Date: Wed, 18 May 2016 15:26:57 +0200 Subject: [PATCH 6/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5dccac9d..122b8a6f 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ usage: signal-cli [-h] [-v] [--config CONFIG] [-u USERNAME | --dbus | --dbus-sys * Leave a group - -u USERNAME updateGroup -g GROUP_ID -q + signal-cli -u USERNAME updateGroup -g GROUP_ID -q * Linking other devices (Provisioning) From 3549e3b51e80ae8cd650c4840fd343d6bc99ec7f Mon Sep 17 00:00:00 2001 From: conte Date: Wed, 18 May 2016 15:33:13 +0200 Subject: [PATCH 7/8] Added Quit group option --- src/main/java/org/asamk/signal/Main.java | 2 +- src/main/java/org/asamk/signal/Manager.java | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java index 4e0fc3b8..797a8763 100644 --- a/src/main/java/org/asamk/signal/Main.java +++ b/src/main/java/org/asamk/signal/Main.java @@ -550,7 +550,7 @@ public class Main { Subparser parserSend = subparsers.addParser("send"); parserSend.addArgument("-g", "--group") - .help("Specify the recipient group ID. If '-m' parameter is not present the messag is read from STDIN and yuo have to type CTRL+D (aka EOF) in order to stop reading and sending the content"); + .help("Specify the recipient group ID. If '-m' parameter is not CTRL+D (aka EOF) in order to stop reading from STDIN and send the content"); parserSend.addArgument("recipient") .help("Specify the recipients' phone number.") .nargs("*"); diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java index 456fd84a..2369dfb4 100644 --- a/src/main/java/org/asamk/signal/Manager.java +++ b/src/main/java/org/asamk/signal/Manager.java @@ -63,16 +63,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; class Manager implements Signal { - // private final static String URL = "https://10.1.4.252:8080"; - // private final static TrustStore TRUST_STORE = new TenOneFourTwohundredfiftyfourTrustStore(); - // private final static String URL = "https://127.0.0.1:8080"; - // private final static TrustStore TRUST_STORE = new LoopbackTrustStore(); - - private final static String URL = "https://signal.sinesy.it:8080"; - private final static TrustStore TRUST_STORE = new SinesyTrustStore(); - //private final static String URL = "https://textsecure-service.whispersystems.org"; - //private final static TrustStore TRUST_STORE = new WhisperTrustStore(); + private final static String URL = "https://textsecure-service.whispersystems.org"; + private final static TrustStore TRUST_STORE = new WhisperTrustStore(); public final static String PROJECT_NAME = Manager.class.getPackage().getImplementationTitle(); public final static String PROJECT_VERSION = Manager.class.getPackage().getImplementationVersion(); From e33e3ba8f46e2cebb2a229f2dda48fdde2c8e3d1 Mon Sep 17 00:00:00 2001 From: conte Date: Wed, 18 May 2016 15:37:09 +0200 Subject: [PATCH 8/8] Added Quit group option --- src/main/java/org/asamk/signal/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java index 797a8763..a14b6070 100644 --- a/src/main/java/org/asamk/signal/Main.java +++ b/src/main/java/org/asamk/signal/Main.java @@ -550,7 +550,7 @@ public class Main { Subparser parserSend = subparsers.addParser("send"); parserSend.addArgument("-g", "--group") - .help("Specify the recipient group ID. If '-m' parameter is not CTRL+D (aka EOF) in order to stop reading from STDIN and send the content"); + .help("Specify the recipient group ID. If there is no '-m', use CTRL+D (aka EOF) in order to stop reading from STDIN and send the content"); parserSend.addArgument("recipient") .help("Specify the recipients' phone number.") .nargs("*");