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

Update textescure-java to 1.7

Browse source 
Adapt code:
- Add USER_AGENT
- verifyAccount renamed to verifyAccountWithCode
This commit is contained in:
AsamK 2015-09-15 13:03:49 +02:00
parent 0e4fe8bc8f
commit 2796fff56d
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -10,7 +10,7 @@ repositories {
} }
dependencies { dependencies {
compile 'org.whispersystems:textsecure-java:1.6.2' compile 'org.whispersystems:textsecure-java:1.7.0'
compile 'com.madgag.spongycastle:prov:1.52.0.0' compile 'com.madgag.spongycastle:prov:1.52.0.0'
compile 'org.json:json:20141113' compile 'org.json:json:20141113'
compile 'commons-io:commons-io:2.4' compile 'commons-io:commons-io:2.4'

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

@ -51,6 +51,8 @@ class Manager {
private final static String URL = "https://textsecure-service.whispersystems.org"; private final static String URL = "https://textsecure-service.whispersystems.org";
private final static TrustStore TRUST_STORE = new WhisperTrustStore(); private final static TrustStore TRUST_STORE = new WhisperTrustStore();
private final static String USER_AGENT = "textsecure-cli";
private final static String settingsPath = System.getProperty("user.home") + "/.config/textsecure"; private final static String settingsPath = System.getProperty("user.home") + "/.config/textsecure";
private final static String dataPath = settingsPath + "/data"; private final static String dataPath = settingsPath + "/data";
private final static String attachmentsPath = settingsPath + "/attachments"; private final static String attachmentsPath = settingsPath + "/attachments";
@ -103,7 +105,7 @@ class Manager {
} }
axolotlStore = new JsonAxolotlStore(in.getJSONObject("axolotlStore")); axolotlStore = new JsonAxolotlStore(in.getJSONObject("axolotlStore"));
registered = in.getBoolean("registered"); registered = in.getBoolean("registered");
accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password); accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password, USER_AGENT);
} }
public void save() { public void save() {
@ -138,7 +140,7 @@ class Manager {
public void register(boolean voiceVerication) throws IOException { public void register(boolean voiceVerication) throws IOException {
password = Util.getSecret(18); password = Util.getSecret(18);
accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password); accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password, USER_AGENT);
if (voiceVerication) if (voiceVerication)
accountManager.requestVoiceVerificationCode(); accountManager.requestVoiceVerificationCode();
@ -201,7 +203,7 @@ class Manager {
public void verifyAccount(String verificationCode) throws IOException { public void verifyAccount(String verificationCode) throws IOException {
verificationCode = verificationCode.replace("-", ""); verificationCode = verificationCode.replace("-", "");
signalingKey = Util.getSecret(52); signalingKey = Util.getSecret(52);
accountManager.verifyAccount(verificationCode, signalingKey, false, axolotlStore.getLocalRegistrationId()); accountManager.verifyAccountWithCode(verificationCode, signalingKey, axolotlStore.getLocalRegistrationId());
//accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID))); //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
registered = true; registered = true;
@ -218,7 +220,7 @@ class Manager {
public void sendMessage(List<TextSecureAddress> recipients, TextSecureDataMessage message) public void sendMessage(List<TextSecureAddress> recipients, TextSecureDataMessage message)
throws IOException, EncapsulatedExceptions { throws IOException, EncapsulatedExceptions {
TextSecureMessageSender messageSender = new TextSecureMessageSender(URL, TRUST_STORE, username, password, TextSecureMessageSender messageSender = new TextSecureMessageSender(URL, TRUST_STORE, username, password,
axolotlStore, Optional.<TextSecureMessageSender.EventListener>absent()); axolotlStore, USER_AGENT, Optional.<TextSecureMessageSender.EventListener>absent());
messageSender.sendMessage(recipients, message); messageSender.sendMessage(recipients, message);
} }
@ -242,7 +244,7 @@ class Manager {
} }
public void receiveMessages(int timeoutSeconds, boolean returnOnTimeout, ReceiveMessageHandler handler) throws IOException { public void receiveMessages(int timeoutSeconds, boolean returnOnTimeout, ReceiveMessageHandler handler) throws IOException {
final TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey); final TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey, USER_AGENT);
TextSecureMessagePipe messagePipe = null; TextSecureMessagePipe messagePipe = null;
try { try {
@ -268,7 +270,7 @@ class Manager {
} }
public File retrieveAttachment(TextSecureAttachmentPointer pointer) throws IOException, InvalidMessageException { public File retrieveAttachment(TextSecureAttachmentPointer pointer) throws IOException, InvalidMessageException {
final TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey); final TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey, USER_AGENT);
File tmpFile = File.createTempFile("ts_attach_" + pointer.getId(), ".tmp"); File tmpFile = File.createTempFile("ts_attach_" + pointer.getId(), ".tmp");
InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile); InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile);