Rename to signal-cli

Changes experimental dbus interface from
org.asamk.TextSecure to org.asamk.Signal

diff --git a/README.md b/README.md
index 1f4597d508069b3b6aad84be9fdfc8d469683554..f951669deeab03b4fe979ed93d93398a96fcda0b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,72 +1,72 @@
-# textsecure-cli
+# signal-cli

 
 

-textsecure-cli is a commandline interface for [libtextsecure-java](https://github.com/WhisperSystems/libtextsecure-java). It supports registering, verifying, sending and receiving messages. To be able to receiving messages textsecure-cli uses a [patched libtextsecure-java](https://github.com/AsamK/libtextsecure-java), because libtextsecure-java [does not yet support registering for the websocket support](https://github.com/WhisperSystems/libtextsecure-java/pull/5). For registering you need a phone number where you can receive SMS or incoming calls.
+signal-cli is a commandline interface for [libtextsecure-java](https://github.com/WhisperSystems/libtextsecure-java). It supports registering, verifying, sending and receiving messages. To be able to receiving messages signal-cli uses a [patched libtextsecure-java](https://github.com/AsamK/libtextsecure-java), because libtextsecure-java [does not yet support registering for the websocket support](https://github.com/WhisperSystems/libtextsecure-java/pull/5). For registering you need a phone number where you can receive SMS or incoming calls.

 It is primarily intended to be used on servers to notify admins of important events. For this use-case, it has a dbus interface, that can be used to send messages from any programming language that has dbus bindings.
 
 ## Usage
 
 It is primarily intended to be used on servers to notify admins of important events. For this use-case, it has a dbus interface, that can be used to send messages from any programming language that has dbus bindings.
 
 ## Usage
 

-usage: textsecure-cli [-h] [-u USERNAME] [-v] {register,verify,send,quitGroup,updateGroup,receive} ...
+usage: signal-cli [-h] [-u USERNAME] [-v] {register,verify,send,quitGroup,updateGroup,receive} ...

 
 * Register a number (with SMS verification)
 
 
 * Register a number (with SMS verification)
 

-        textsecure-cli -u USERNAME register
+        signal-cli -u USERNAME register

 
 * Register a number (with voice verification)
 
 
 * Register a number (with voice verification)
 

-        textsecure-cli -u USERNAME register -v
+        signal-cli -u USERNAME register -v

 
 * Verify the number using the code received via SMS or voice
 
 
 * Verify the number using the code received via SMS or voice
 

-        textsecure-cli -u USERNAME verify CODE
+        signal-cli -u USERNAME verify CODE

 
 * Send a message to one or more recipients
 
 
 * Send a message to one or more recipients
 

-        textsecure-cli -u USERNAME send -m "This is a message" [RECIPIENT [RECIPIENT ...]] [-a [ATTACHMENT [ATTACHMENT ...]]]
+        signal-cli -u USERNAME send -m "This is a message" [RECIPIENT [RECIPIENT ...]] [-a [ATTACHMENT [ATTACHMENT ...]]]

 
 * Pipe the message content from another process.
 
 
 * Pipe the message content from another process.
 

-        uname -a | textsecure-cli -u USERNAME send [RECIPIENT [RECIPIENT ...]]
+        uname -a | signal-cli -u USERNAME send [RECIPIENT [RECIPIENT ...]]

 
 * Groups
 
  * Create a group
 
 
 * Groups
 
  * Create a group
 

-          textsecure-cli -u USERNAME updateGroup -n "Group name" -m [MEMBER [MEMBER ...]]
+          signal-cli -u USERNAME updateGroup -n "Group name" -m [MEMBER [MEMBER ...]]

 
  * Update a group
 
 
  * Update a group
 

-          textsecure-cli -u USERNAME updateGroup -g GROUP_ID -n "New group name"
+          signal-cli -u USERNAME updateGroup -g GROUP_ID -n "New group name"

 
  * Send a message to a group
 
 
  * Send a message to a group
 

-          textsecure-cli -u USERNAME send -m "This is a message" -g GROUP_ID
+          signal-cli -u USERNAME send -m "This is a message" -g GROUP_ID

 
 ## DBus service
 
 
 ## DBus service
 

-textsecure-cli can run in daemon mode and provides an experimental dbus interface.
+signal-cli can run in daemon mode and provides an experimental dbus interface.

 For dbus support you need jni/unix-java.so installed on your system (Debian: libunixsocket-java ArchLinux: libmatthew-unix-java (AUR)).
 
 * Run in daemon mode (dbus session bus)
 
 For dbus support you need jni/unix-java.so installed on your system (Debian: libunixsocket-java ArchLinux: libmatthew-unix-java (AUR)).
 
 * Run in daemon mode (dbus session bus)
 

-          textsecure-cli -u USERNAME daemon
+          signal-cli -u USERNAME daemon

 
 * Send a message via dbus
 
 
 * Send a message via dbus
 

-          textsecure-cli --dbus send -m "Message" [RECIPIENT [RECIPIENT ...]] [-a [ATTACHMENT [ATTACHMENT ...]]]
+          signal-cli --dbus send -m "Message" [RECIPIENT [RECIPIENT ...]] [-a [ATTACHMENT [ATTACHMENT ...]]]

 
 ### System bus
 
 To run on the system bus you need to take some additional steps.
 
 ### System bus
 
 To run on the system bus you need to take some additional steps.

-It’s advisable to run textsecure-cli as a separate unix user, the following steps assume you created a user named *textsecure-cli*.
+It’s advisable to run signal-cli as a separate unix user, the following steps assume you created a user named *signal-cli*.

 These steps, executed as root, should work on all distributions using systemd.
 
 ```bash
 These steps, executed as root, should work on all distributions using systemd.
 
 ```bash

-cp data/org.asamk.TextSecure.conf /etc/dbus-1/system.d/
-cp data/org.asamk.TextSecure.service /usr/share/dbus-1/system-services/
-cp data/textsecure.service /etc/systemd/system/
-sed -i -e "s|%dir%|<INSERT_INSTALL_PATH>|" -e "s|%number%|<INSERT_YOUR_NUMBER>|" /etc/systemd/system/textsecure.service
+cp data/org.asamk.Signal.conf /etc/dbus-1/system.d/
+cp data/org.asamk.Signal.service /usr/share/dbus-1/system-services/
+cp data/signal.service /etc/systemd/system/
+sed -i -e "s|%dir%|<INSERT_INSTALL_PATH>|" -e "s|%number%|<INSERT_YOUR_NUMBER>|" /etc/systemd/system/signal.service

 systemctl daemon-reload
 systemctl daemon-reload

-systemctl enable textsecure.service
+systemctl enable signal.service

 systemctl reload dbus.service
 ```
 
 systemctl reload dbus.service
 ```
 


@@ -76,7 +76,7 @@ Then just execute the send command from above, the service will be autostarted b
 
 The password and cryptographic keys are created when registering and stored in the current users home directory:
 
 
 The password and cryptographic keys are created when registering and stored in the current users home directory:
 

-        $HOME/.config/textsecure/data/
+        $HOME/.config/signal/data/

 
 ## Building
 
 
 ## Building
 


@@ -85,13 +85,13 @@ dependencies.
 
 1. Checkout the source somewhere on your filesystem with
 
 
 1. Checkout the source somewhere on your filesystem with
 

-        git clone https://github.com/AsamK/textsecure-cli.git
+        git clone https://github.com/AsamK/signal-cli.git

 
 2. Execute Gradle:
 
         ./gradlew build
 
 
 2. Execute Gradle:
 
         ./gradlew build
 

-3. Create shell wrapper in *build/install/textsecure-cli/bin*:
+3. Create shell wrapper in *build/install/signal-cli/bin*:

 
         ./gradlew installDist
 
 
         ./gradlew installDist
 

diff --git a/build.gradle b/build.gradle
index 7d9d96550dcdfeba87eacef8241ccb280e51999a..8402bd05ab5386468a23ad93f6c1620dacd84741 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'application'
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 

-mainClassName = 'org.asamk.textsecure.Main'
+mainClassName = 'org.asamk.signal.Main'

 
 version = '0.2.1'
 
 
 version = '0.2.1'
 

diff --git a/data/org.asamk.Signal.conf b/data/org.asamk.Signal.conf
new file mode 100644 (file)
index 0000000..a30c501
--- /dev/null
+++ b/data/org.asamk.Signal.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0"?> <!--*-nxml-*-->
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<busconfig>
+        <policy user="signal-cli">
+                <allow own="org.asamk.Signal"/>
+                <allow send_destination="org.asamk.Signal"/>
+                <allow receive_sender="org.asamk.Signal"/>
+        </policy>
+
+        <policy context="default">
+                <allow send_destination="org.asamk.Signal"/>
+                <allow receive_sender="org.asamk.Signal"/>
+        </policy>
+</busconfig>

diff --git a/data/org.asamk.Signal.service b/data/org.asamk.Signal.service
new file mode 100644 (file)
index 0000000..89bffd8
--- /dev/null
+++ b/data/org.asamk.Signal.service
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.asamk.Signal
+Exec=/bin/false
+SystemdService=dbus-org.asamk.Signal.service

diff --git a/data/org.asamk.TextSecure.conf b/data/org.asamk.TextSecure.conf
deleted file mode 100644 (file)
index 7988375..0000000
--- a/data/org.asamk.TextSecure.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?> <!--*-nxml-*-->
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-<busconfig>
-        <policy user="textsecure-cli">
-                <allow own="org.asamk.TextSecure"/>
-                <allow send_destination="org.asamk.TextSecure"/>
-                <allow receive_sender="org.asamk.TextSecure"/>
-        </policy>
-
-        <policy context="default">
-                <allow send_destination="org.asamk.TextSecure"/>
-                <allow receive_sender="org.asamk.TextSecure"/>
-        </policy>
-</busconfig>

diff --git a/data/org.asamk.TextSecure.service b/data/org.asamk.TextSecure.service
deleted file mode 100644 (file)
index a031626..0000000
--- a/data/org.asamk.TextSecure.service
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.asamk.TextSecure
-Exec=/bin/false
-SystemdService=dbus-org.asamk.TextSecure.service

diff --git a/data/signal-cli@.service b/data/signal-cli@.service
new file mode 100644 (file)
index 0000000..34409f6
--- /dev/null
+++ b/data/signal-cli@.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Send secure messages to Signal clients
+Requires=dbus.socket
+After=dbus.socket
+Wants=network.target
+After=network.target
+
+[Service]
+Type=dbus
+Environment=SIGNAL_CLI_OPTS="-Xms2m"
+ExecStart=%dir%/bin/signal-cli -u %I --config /var/lib/signal-cli daemon --system
+User=signal-cli
+BusName=org.asamk.Signal
+
+[Install]
+WantedBy=multi-user.target

diff --git a/data/signal.service b/data/signal.service
new file mode 100644 (file)
index 0000000..126bbd2
--- /dev/null
+++ b/data/signal.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Send secure messages to Signal clients
+
+[Service]
+Type=dbus
+Environment=SIGNAL_CLI_OPTS="-Xms2m"
+ExecStart=%dir%/bin/signal-cli -u %number% --config /var/lib/signal-cli daemon --system
+User=signal-cli
+BusName=org.asamk.Signal
+
+[Install]
+Alias=dbus-org.asamk.Signal.service

diff --git a/data/textsecure-cli@.service b/data/textsecure-cli@.service
deleted file mode 100644 (file)
index 3e39571..0000000
--- a/data/textsecure-cli@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Send secure messages to TextSecure/Signal clients
-Requires=dbus.socket
-After=dbus.socket
-Wants=network.target
-After=network.target
-
-[Service]
-Type=dbus
-Environment=TEXTSECURE_CLI_OPTS="-Xms2m"
-ExecStart=%dir%/bin/textsecure-cli -u %I --config /var/lib/textsecure-cli daemon --system
-User=textsecure-cli
-BusName=org.asamk.TextSecure
-
-[Install]
-WantedBy=multi-user.target

diff --git a/data/textsecure.service b/data/textsecure.service
deleted file mode 100644 (file)
index 8b302d8..0000000
--- a/data/textsecure.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Send secure messages to TextSecure/Signal clients
-
-[Service]
-Type=dbus
-Environment=TEXTSECURE_CLI_OPTS="-Xms2m"
-ExecStart=%dir%/bin/textsecure-cli -u %number% --config /var/lib/textsecure-cli daemon --system
-User=textsecure-cli
-BusName=org.asamk.TextSecure
-
-[Install]
-Alias=dbus-org.asamk.TextSecure.service

diff --git a/settings.gradle b/settings.gradle
index a2c308d34636d8346b7e316352ce3901415170b3..9f877185129b1720bad9354b43636e989dcc0226 100644 (file)
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,4 +15,4 @@ include 'api'
 include 'services:webservice'
 */
 
 include 'services:webservice'
 */
 

-rootProject.name = 'textsecure-cli'
+rootProject.name = 'signal-cli'

diff --git a/src/main/java/org/asamk/TextSecure.java b/src/main/java/org/asamk/Signal.java
similarity index 87%
rename from src/main/java/org/asamk/TextSecure.java
rename to src/main/java/org/asamk/Signal.java
index 991342b7b7eb72139c54671cc85f33c540514d49..cb2025ab58ea2c9f1a9dc24a19f07d27b12e6296 100644 (file)
--- a/src/main/java/org/asamk/TextSecure.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -1,7 +1,7 @@
 package org.asamk;
 
 package org.asamk;
 

-import org.asamk.textsecure.AttachmentInvalidException;
-import org.asamk.textsecure.GroupNotFoundException;
+import org.asamk.signal.AttachmentInvalidException;
+import org.asamk.signal.GroupNotFoundException;

 import org.freedesktop.dbus.DBusInterface;
 import org.freedesktop.dbus.DBusSignal;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.DBusInterface;
 import org.freedesktop.dbus.DBusSignal;
 import org.freedesktop.dbus.exceptions.DBusException;


@@ -10,7 +10,7 @@ import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptio
 import java.io.IOException;
 import java.util.List;
 
 import java.io.IOException;
 import java.util.List;
 

-public interface TextSecure extends DBusInterface {
+public interface Signal extends DBusInterface {

     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 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;

diff --git a/src/main/java/org/asamk/textsecure/AttachmentInvalidException.java b/src/main/java/org/asamk/signal/AttachmentInvalidException.java
similarity index 92%
rename from src/main/java/org/asamk/textsecure/AttachmentInvalidException.java
rename to src/main/java/org/asamk/signal/AttachmentInvalidException.java
index 5afa67e37356658e583f61e4e5f1c2a379a188dd..8a023f6283fac5c7da87d2b5bfb093d1c1f36f83 100644 (file)
--- a/src/main/java/org/asamk/textsecure/AttachmentInvalidException.java
+++ b/src/main/java/org/asamk/signal/AttachmentInvalidException.java
@@ -1,4 +1,4 @@
-package org.asamk.textsecure;
+package org.asamk.signal;

 
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 
 
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 

diff --git a/src/main/java/org/asamk/textsecure/Base64.java b/src/main/java/org/asamk/signal/Base64.java
similarity index 99%
rename from src/main/java/org/asamk/textsecure/Base64.java
rename to src/main/java/org/asamk/signal/Base64.java
index f8f6b4cd674cabc72c7ebeb674784d9a74aff61e..517bb7ddd7ef595b9ea1c7dfa5598bfbd9c27b2b 100644 (file)
--- a/src/main/java/org/asamk/textsecure/Base64.java
+++ b/src/main/java/org/asamk/signal/Base64.java
@@ -1,4 +1,4 @@
-package org.asamk.textsecure;
+package org.asamk.signal;

 
 /**
  * <p>Encodes and decodes to and from Base64 notation.</p>
 
 /**
  * <p>Encodes and decodes to and from Base64 notation.</p>

diff --git a/src/main/java/org/asamk/textsecure/GroupInfo.java b/src/main/java/org/asamk/signal/GroupInfo.java
similarity index 96%
rename from src/main/java/org/asamk/textsecure/GroupInfo.java
rename to src/main/java/org/asamk/signal/GroupInfo.java
index dd6cacf7d9bccca0610af0548acc3e8454b9b951..4ad7003e831a5bdaa62c4375677a4f77311b5ef6 100644 (file)
--- a/src/main/java/org/asamk/textsecure/GroupInfo.java
+++ b/src/main/java/org/asamk/signal/GroupInfo.java
@@ -1,4 +1,4 @@
-package org.asamk.textsecure;
+package org.asamk.signal;

 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/src/main/java/org/asamk/textsecure/GroupNotFoundException.java b/src/main/java/org/asamk/signal/GroupNotFoundException.java
similarity index 91%
rename from src/main/java/org/asamk/textsecure/GroupNotFoundException.java
rename to src/main/java/org/asamk/signal/GroupNotFoundException.java
index 6c4cf5b13462d5d0714f8032dc4029e931841751..0218c508df00e715166d43dfbf64fddb1e258860 100644 (file)
--- a/src/main/java/org/asamk/textsecure/GroupNotFoundException.java
+++ b/src/main/java/org/asamk/signal/GroupNotFoundException.java
@@ -1,4 +1,4 @@
-package org.asamk.textsecure;
+package org.asamk.signal;

 
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 
 
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 

diff --git a/src/main/java/org/asamk/textsecure/JsonGroupStore.java b/src/main/java/org/asamk/signal/JsonGroupStore.java
similarity index 98%
rename from src/main/java/org/asamk/textsecure/JsonGroupStore.java
rename to src/main/java/org/asamk/signal/JsonGroupStore.java
index 17a59f87bd42a44386616ebcf2485d5a5b028ce5..a75c5148b1fef14c45acd380da691ce548d205df 100644 (file)
--- a/src/main/java/org/asamk/textsecure/JsonGroupStore.java
+++ b/src/main/java/org/asamk/signal/JsonGroupStore.java
@@ -1,4 +1,4 @@
-package org.asamk.textsecure;
+package org.asamk.signal;

 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;

diff --git a/src/main/java/org/asamk/textsecure/JsonIdentityKeyStore.java b/src/main/java/org/asamk/signal/JsonIdentityKeyStore.java
similarity index 99%
rename from src/main/java/org/asamk/textsecure/JsonIdentityKeyStore.java
rename to src/main/java/org/asamk/signal/JsonIdentityKeyStore.java
index eaf973883a13b48187c5de6f9186ca52db994163..c1ef428b6a59a7da50516db85288c879d52f415a 100644 (file)
--- a/src/main/java/org/asamk/textsecure/JsonIdentityKeyStore.java
+++ b/src/main/java/org/asamk/signal/JsonIdentityKeyStore.java
@@ -1,4 +1,4 @@
-package org.asamk.textsecure;
+package org.asamk.signal;

 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;

diff --git a/src/main/java/org/asamk/textsecure/JsonPreKeyStore.java b/src/main/java/org/asamk/signal/JsonPreKeyStore.java
similarity index 99%
rename from src/main/java/org/asamk/textsecure/JsonPreKeyStore.java
rename to src/main/java/org/asamk/signal/JsonPreKeyStore.java
index a522f177bd7e5d42d65893411c90d1ef2d57e2ed..d4c8d521a7991a93f2ffd25fcac346e537882937 100644 (file)
--- a/src/main/java/org/asamk/textsecure/JsonPreKeyStore.java
+++ b/src/main/java/org/asamk/signal/JsonPreKeyStore.java
@@ -1,4 +1,4 @@
-package org.asamk.textsecure;
+package org.asamk.signal;

 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;

diff --git a/src/main/java/org/asamk/textsecure/JsonSessionStore.java b/src/main/java/org/asamk/signal/JsonSessionStore.java
similarity index 99%
rename from src/main/java/org/asamk/textsecure/JsonSessionStore.java
rename to src/main/java/org/asamk/signal/JsonSessionStore.java
index 2fec85a37e37e88964abf672b01c5cca571cfb0a..cd4d55ad61dd12e790abee3dbbfd1105bd9843d0 100644 (file)
--- a/src/main/java/org/asamk/textsecure/JsonSessionStore.java
+++ b/src/main/java/org/asamk/signal/JsonSessionStore.java
@@ -1,4 +1,4 @@
-package org.asamk.textsecure;
+package org.asamk.signal;

 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;

diff --git a/src/main/java/org/asamk/textsecure/JsonSignalProtocolStore.java b/src/main/java/org/asamk/signal/JsonSignalProtocolStore.java
similarity index 99%
rename from src/main/java/org/asamk/textsecure/JsonSignalProtocolStore.java
rename to src/main/java/org/asamk/signal/JsonSignalProtocolStore.java
index f440a709acd5c3de25030e4a8f9315db4dae33f0..0d9c4b6946440d993ab3546c341eed67a05cdfe9 100644 (file)
--- a/src/main/java/org/asamk/textsecure/JsonSignalProtocolStore.java
+++ b/src/main/java/org/asamk/signal/JsonSignalProtocolStore.java
@@ -1,4 +1,4 @@
-package org.asamk.textsecure;
+package org.asamk.signal;

 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;

diff --git a/src/main/java/org/asamk/textsecure/JsonSignedPreKeyStore.java b/src/main/java/org/asamk/signal/JsonSignedPreKeyStore.java
similarity index 99%
rename from src/main/java/org/asamk/textsecure/JsonSignedPreKeyStore.java
rename to src/main/java/org/asamk/signal/JsonSignedPreKeyStore.java
index f890fe8836fdfb885cd001b69c2c07e0d0ad7d1c..cdcd506b2b55a1bf727b5d008ebf6074aa0ab77a 100644 (file)
--- a/src/main/java/org/asamk/textsecure/JsonSignedPreKeyStore.java
+++ b/src/main/java/org/asamk/signal/JsonSignedPreKeyStore.java
@@ -1,4 +1,4 @@
-package org.asamk.textsecure;
+package org.asamk.signal;

 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;

diff --git a/src/main/java/org/asamk/textsecure/Main.java b/src/main/java/org/asamk/signal/Main.java
similarity index 97%
rename from src/main/java/org/asamk/textsecure/Main.java
rename to src/main/java/org/asamk/signal/Main.java
index 404a89889d25cd81ccf2d3d02365a7d6a30d3092..a4e50bb46ebea6ee95c30bf150b2b0f473505424 100644 (file)
--- a/src/main/java/org/asamk/textsecure/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -14,14 +14,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */

-package org.asamk.textsecure;
+package org.asamk.signal;

 
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.*;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.util.TextUtils;
 
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.*;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.util.TextUtils;

-import org.asamk.TextSecure;
+import org.asamk.Signal;

 import org.freedesktop.dbus.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.freedesktop.dbus.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;


@@ -41,8 +41,8 @@ import java.util.List;
 
 public class Main {
 
 
 public class Main {
 

-    public static final String TEXTSECURE_BUSNAME = "org.asamk.TextSecure";
-    public static final String TEXTSECURE_OBJECTPATH = "/org/asamk/TextSecure";
+    public static final String SIGNAL_BUSNAME = "org.asamk.Signal";
+    public static final String SIGNAL_OBJECTPATH = "/org/asamk/Signal";

 
     public static void main(String[] args) {
         // Workaround for BKS truststore
 
     public static void main(String[] args) {
         // Workaround for BKS truststore


@@ -55,7 +55,7 @@ public class Main {
 
         final String username = ns.getString("username");
         Manager m;
 
         final String username = ns.getString("username");
         Manager m;

-        TextSecure ts;
+        Signal ts;

         DBusConnection dBusConn = null;
         try {
             if (ns.getBoolean("dbus") || ns.getBoolean("dbus_system")) {
         DBusConnection dBusConn = null;
         try {
             if (ns.getBoolean("dbus") || ns.getBoolean("dbus_system")) {


@@ -68,9 +68,9 @@ public class Main {
                         busType = DBusConnection.SESSION;
                     }
                     dBusConn = DBusConnection.getConnection(busType);
                         busType = DBusConnection.SESSION;
                     }
                     dBusConn = DBusConnection.getConnection(busType);

-                    ts = (TextSecure) dBusConn.getRemoteObject(
-                            TEXTSECURE_BUSNAME, TEXTSECURE_OBJECTPATH,
-                            TextSecure.class);
+                    ts = (Signal) dBusConn.getRemoteObject(
+                            SIGNAL_BUSNAME, SIGNAL_OBJECTPATH,
+                            Signal.class);

                 } catch (DBusException e) {
                     e.printStackTrace();
                     if (dBusConn != null) {
                 } catch (DBusException e) {
                     e.printStackTrace();
                     if (dBusConn != null) {


@@ -82,7 +82,7 @@ public class Main {
             } else {
                 String settingsPath = ns.getString("config");
                 if (TextUtils.isEmpty(settingsPath)) {
             } else {
                 String settingsPath = ns.getString("config");
                 if (TextUtils.isEmpty(settingsPath)) {

-                    settingsPath = System.getProperty("user.home") + "/.config/textsecure";
+                    settingsPath = System.getProperty("user.home") + "/.config/signal";

                 }
 
                 m = new Manager(username, settingsPath);
                 }
 
                 m = new Manager(username, settingsPath);


@@ -299,8 +299,8 @@ public class Main {
                                 busType = DBusConnection.SESSION;
                             }
                             conn = DBusConnection.getConnection(busType);
                                 busType = DBusConnection.SESSION;
                             }
                             conn = DBusConnection.getConnection(busType);

-                            conn.exportObject(TEXTSECURE_OBJECTPATH, m);
-                            conn.requestBusName(TEXTSECURE_BUSNAME);
+                            conn.exportObject(SIGNAL_OBJECTPATH, m);
+                            conn.requestBusName(SIGNAL_BUSNAME);

                         } catch (DBusException e) {
                             e.printStackTrace();
                             System.exit(3);
                         } catch (DBusException e) {
                             e.printStackTrace();
                             System.exit(3);


@@ -353,16 +353,16 @@ public class Main {
     }
 
     private static Namespace parseArgs(String[] args) {
     }
 
     private static Namespace parseArgs(String[] args) {

-        ArgumentParser parser = ArgumentParsers.newArgumentParser("textsecure-cli")
+        ArgumentParser parser = ArgumentParsers.newArgumentParser("signal-cli")

                 .defaultHelp(true)
                 .defaultHelp(true)

-                .description("Commandline interface for TextSecure.")
+                .description("Commandline interface for Signal.")

                 .version(Manager.PROJECT_NAME + " " + Manager.PROJECT_VERSION);
 
         parser.addArgument("-v", "--version")
                 .help("Show package version.")
                 .action(Arguments.version());
         parser.addArgument("--config")
                 .version(Manager.PROJECT_NAME + " " + Manager.PROJECT_VERSION);
 
         parser.addArgument("-v", "--version")
                 .help("Show package version.")
                 .action(Arguments.version());
         parser.addArgument("--config")

-                .help("Set the path, where to store the config (Default: $HOME/.config/textsecure-cli).");
+                .help("Set the path, where to store the config (Default: $HOME/.config/signal-cli).");

 
         MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup();
         mut.addArgument("-u", "--username")
 
         MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup();
         mut.addArgument("-u", "--username")


@@ -630,8 +630,8 @@ public class Main {
                         if (!message.isEndSession() &&
                                 !(message.getGroupInfo().isPresent() && message.getGroupInfo().get().getType() != SignalServiceGroup.Type.DELIVER)) {
                             try {
                         if (!message.isEndSession() &&
                                 !(message.getGroupInfo().isPresent() && message.getGroupInfo().get().getType() != SignalServiceGroup.Type.DELIVER)) {
                             try {

-                                conn.sendSignal(new TextSecure.MessageReceived(
-                                        TEXTSECURE_OBJECTPATH,
+                                conn.sendSignal(new Signal.MessageReceived(
+                                        SIGNAL_OBJECTPATH,

                                         envelope.getSource(),
                                         message.getGroupInfo().isPresent() ? message.getGroupInfo().get().getGroupId() : new byte[0],
                                         message.getBody().isPresent() ? message.getBody().get() : "",
                                         envelope.getSource(),
                                         message.getGroupInfo().isPresent() ? message.getGroupInfo().get().getGroupId() : new byte[0],
                                         message.getBody().isPresent() ? message.getBody().get() : "",

diff --git a/src/main/java/org/asamk/textsecure/Manager.java b/src/main/java/org/asamk/signal/Manager.java
similarity index 99%
rename from src/main/java/org/asamk/textsecure/Manager.java
rename to src/main/java/org/asamk/signal/Manager.java
index 2d67517051c8bdb7f93fd3e12c9c09b0a4532df3..94bb555af37c0b8e191a9b0b6dfdf6ec181e41e3 100644 (file)
--- a/src/main/java/org/asamk/textsecure/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */

-package org.asamk.textsecure;
+package org.asamk.signal;

 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;


@@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.node.ObjectNode;

-import org.asamk.TextSecure;
+import org.asamk.Signal;

 import org.whispersystems.libsignal.*;
 import org.whispersystems.libsignal.ecc.Curve;
 import org.whispersystems.libsignal.ecc.ECKeyPair;
 import org.whispersystems.libsignal.*;
 import org.whispersystems.libsignal.ecc.Curve;
 import org.whispersystems.libsignal.ecc.ECKeyPair;


@@ -52,8 +52,8 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 

-class Manager implements TextSecure {
-    private final static String URL = "https://SignalService-service.whispersystems.org";
+class Manager implements Signal {
+    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();
     private final static TrustStore TRUST_STORE = new WhisperTrustStore();
 
     public final static String PROJECT_NAME = Manager.class.getPackage().getImplementationTitle();

diff --git a/src/main/java/org/asamk/textsecure/Util.java b/src/main/java/org/asamk/signal/Util.java
similarity index 95%
rename from src/main/java/org/asamk/textsecure/Util.java
rename to src/main/java/org/asamk/signal/Util.java
index 7cbc851ec129225f126e8edc2b8420d51b970be2..66a08731963258f58c1afa1b7eff55ea0c778280 100644 (file)
--- a/src/main/java/org/asamk/textsecure/Util.java
+++ b/src/main/java/org/asamk/signal/Util.java
@@ -1,4 +1,4 @@
-package org.asamk.textsecure;
+package org.asamk.signal;

 
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;

diff --git a/src/main/java/org/asamk/textsecure/WhisperTrustStore.java b/src/main/java/org/asamk/signal/WhisperTrustStore.java
similarity index 92%
rename from src/main/java/org/asamk/textsecure/WhisperTrustStore.java
rename to src/main/java/org/asamk/signal/WhisperTrustStore.java
index 1f129c5a6efab92193eb7c9e5c7afe000806f7d5..e9468c2e12f8997696ccdfe878cf9d04f640ecfa 100644 (file)
--- a/src/main/java/org/asamk/textsecure/WhisperTrustStore.java
+++ b/src/main/java/org/asamk/signal/WhisperTrustStore.java
@@ -1,4 +1,4 @@
-package org.asamk.textsecure;
+package org.asamk.signal;

 
 import org.whispersystems.signalservice.api.push.TrustStore;
 
 
 import org.whispersystems.signalservice.api.push.TrustStore;
 

diff --git a/src/main/resources/org/asamk/textsecure/whisper.store b/src/main/resources/org/asamk/signal/whisper.store
similarity index 100%
rename from src/main/resources/org/asamk/textsecure/whisper.store
rename to src/main/resources/org/asamk/signal/whisper.store