*/
package cli;
-import org.apache.commons.io.IOUtils;
-import org.json.JSONObject;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+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 org.whispersystems.libaxolotl.*;
import org.whispersystems.libaxolotl.ecc.Curve;
import org.whispersystems.libaxolotl.ecc.ECKeyPair;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-public class Manager {
+class Manager {
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();
+ private final static String USER_AGENT = PROJECT_NAME + " " + PROJECT_VERSION;
+
private final static String settingsPath = System.getProperty("user.home") + "/.config/textsecure";
private final static String dataPath = settingsPath + "/data";
private final static String attachmentsPath = settingsPath + "/attachments";
+ private final ObjectMapper jsonProcessot = new ObjectMapper();
private String username;
private String password;
private String signalingKey;
private boolean registered = false;
private JsonAxolotlStore axolotlStore;
- TextSecureAccountManager accountManager;
+ private TextSecureAccountManager accountManager;
public Manager(String username) {
this.username = username;
+ jsonProcessot.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE); // disable autodetect
+ jsonProcessot.enable(SerializationFeature.INDENT_OUTPUT); // for pretty print, you can disable it.
+ jsonProcessot.enable(SerializationFeature.WRITE_NULL_MAP_VALUES);
+ jsonProcessot.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
}
public String getFileName() {
public boolean userExists() {
File f = new File(getFileName());
- if (!f.exists() || f.isDirectory()) {
- return false;
- }
- return true;
+ return !(!f.exists() || f.isDirectory());
}
public boolean userHasKeys() {
return axolotlStore != null;
}
+ private JsonNode getNotNullNode(JsonNode parent, String name) throws InvalidObjectException {
+ JsonNode node = parent.get(name);
+ if (node == null) {
+ throw new InvalidObjectException(String.format("Incorrect file format: expected parameter %s not found ", name));
+ }
+
+ return node;
+ }
+
+
public void load() throws IOException, InvalidKeyException {
- JSONObject in = new JSONObject(IOUtils.toString(new FileInputStream(getFileName())));
- username = in.getString("username");
- password = in.getString("password");
- if (in.has("signalingKey")) {
- signalingKey = in.getString("signalingKey");
+ JsonNode rootNode = jsonProcessot.readTree(new File(getFileName()));
+
+ username = getNotNullNode(rootNode, "username").asText();
+ password = getNotNullNode(rootNode, "password").asText();
+ if (rootNode.has("signalingKey")) {
+ signalingKey = getNotNullNode(rootNode, "signalingKey").asText();
}
- if (in.has("preKeyIdOffset")) {
- preKeyIdOffset = in.getInt("preKeyIdOffset");
+ if (rootNode.has("preKeyIdOffset")) {
+ preKeyIdOffset = getNotNullNode(rootNode, "preKeyIdOffset").asInt(0);
} else {
preKeyIdOffset = 0;
}
- if (in.has("nextSignedPreKeyId")) {
- nextSignedPreKeyId = in.getInt("nextSignedPreKeyId");
+ if (rootNode.has("nextSignedPreKeyId")) {
+ nextSignedPreKeyId = getNotNullNode(rootNode, "nextSignedPreKeyId").asInt();
} else {
nextSignedPreKeyId = 0;
}
- axolotlStore = new JsonAxolotlStore(in.getJSONObject("axolotlStore"));
- registered = in.getBoolean("registered");
- accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password);
+ axolotlStore = jsonProcessot.convertValue(getNotNullNode(rootNode, "axolotlStore"), JsonAxolotlStore.class); //new JsonAxolotlStore(in.getJSONObject("axolotlStore"));
+ registered = getNotNullNode(rootNode, "registered").asBoolean();
+ accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password, USER_AGENT);
}
public void save() {
- String out = new JSONObject().put("username", username)
+ ObjectNode rootNode = jsonProcessot.createObjectNode();
+ rootNode.put("username", username)
.put("password", password)
.put("signalingKey", signalingKey)
.put("preKeyIdOffset", preKeyIdOffset)
.put("nextSignedPreKeyId", nextSignedPreKeyId)
- .put("axolotlStore", axolotlStore.getJson())
- .put("registered", registered).toString();
+ .put("registered", registered)
+ .putPOJO("axolotlStore", axolotlStore)
+ ;
try {
- OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(getFileName()));
- writer.write(out);
- writer.flush();
- writer.close();
+ jsonProcessot.writeValue(new File(getFileName()), rootNode);
} catch (Exception e) {
- System.out.println("Saving file error: " + e.getMessage());
- return;
+ System.err.println(String.format("Error saving file: %s", e.getMessage()));
}
}
public void register(boolean voiceVerication) throws IOException {
password = Util.getSecret(18);
- accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password);
+ accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password, USER_AGENT);
if (voiceVerication)
accountManager.requestVoiceVerificationCode();
public void verifyAccount(String verificationCode) throws IOException {
verificationCode = verificationCode.replace("-", "");
signalingKey = Util.getSecret(52);
- accountManager.verifyAccount(verificationCode, signalingKey, false, axolotlStore.getLocalRegistrationId());
+ accountManager.verifyAccountWithCode(verificationCode, signalingKey, axolotlStore.getLocalRegistrationId(), false);
//accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
registered = true;
public void sendMessage(List<TextSecureAddress> recipients, TextSecureDataMessage message)
throws IOException, EncapsulatedExceptions {
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);
}
}
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;
try {
if (returnOnTimeout)
return;
} catch (InvalidVersionException e) {
- System.out.println("Ignoring error: " + e.getMessage());
+ System.err.println("Ignoring error: " + e.getMessage());
}
save();
}
}
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");
InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile);
} finally {
if (output != null) {
output.close();
+ output = null;
+ }
+ if (!tmpFile.delete()) {
+ System.err.println("Failed to delete temp file: " + tmpFile);
+ }
+ }
+ if (pointer.getPreview().isPresent()) {
+ File previewFile = new File(outputFile + ".preview");
+ try {
+ output = new FileOutputStream(previewFile);
+ byte[] preview = pointer.getPreview().get();
+ output.write(preview, 0, preview.length);
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ return null;
+ } finally {
+ if (output != null) {
+ output.close();
+ }
}
- tmpFile.delete();
}
return outputFile;
}
- public String canonicalizeNumber(String number) throws InvalidNumberException {
+ private String canonicalizeNumber(String number) throws InvalidNumberException {
String localNumber = username;
return PhoneNumberFormatter.formatNumber(number, localNumber);
}
- protected TextSecureAddress getPushAddress(String number) throws InvalidNumberException {
+ TextSecureAddress getPushAddress(String number) throws InvalidNumberException {
String e164number = canonicalizeNumber(number);
return new TextSecureAddress(e164number);
}
git.nmode.ca / signal-cli / blobdiff
