X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/9f5b55fa7e2ef893cbb841d75c9fe9589f57942d..6c02004326e59ebe2f43fd327d45e79bfc21969f:/src/main/java/cli/Manager.java?ds=sidebyside diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java index 2398f3bc..77e89556 100644 --- a/src/main/java/cli/Manager.java +++ b/src/main/java/cli/Manager.java @@ -35,9 +35,11 @@ import org.whispersystems.textsecure.api.TextSecureMessageReceiver; import org.whispersystems.textsecure.api.TextSecureMessageSender; import org.whispersystems.textsecure.api.crypto.TextSecureCipher; import org.whispersystems.textsecure.api.messages.TextSecureContent; +import org.whispersystems.textsecure.api.messages.TextSecureDataMessage; import org.whispersystems.textsecure.api.messages.TextSecureEnvelope; import org.whispersystems.textsecure.api.push.TextSecureAddress; import org.whispersystems.textsecure.api.push.TrustStore; +import org.whispersystems.textsecure.api.push.exceptions.EncapsulatedExceptions; import org.whispersystems.textsecure.api.util.InvalidNumberException; import org.whispersystems.textsecure.api.util.PhoneNumberFormatter; @@ -68,7 +70,7 @@ public class Manager { this.username = username; } - private String getFileName() { + public String getFileName() { String path = settingsPath + "/data"; new File(path).mkdirs(); return path + "/" + username; @@ -218,9 +220,11 @@ public class Manager { accountManager.setPreKeys(axolotlStore.getIdentityKeyPair().getPublicKey(), lastResortKey, signedPreKeyRecord, oneTimePreKeys); } - public TextSecureMessageSender getMessageSender() { - return new TextSecureMessageSender(URL, TRUST_STORE, username, password, + public void sendMessage(List recipients, TextSecureDataMessage message) + throws IOException, EncapsulatedExceptions { + TextSecureMessageSender messageSender = new TextSecureMessageSender(URL, TRUST_STORE, username, password, axolotlStore, Optional.absent()); + messageSender.sendMessage(recipients, message); } public TextSecureContent decryptMessage(TextSecureEnvelope envelope) {