Add version to user agent string

[signal-cli] / src / main / java / cli / Manager.java

diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java
index 5650921d5d568b750750ffff55f7ff0e883e7b32..846e0dc9de63ba36cd6a373350081d6f12859289 100644 (file)
--- a/src/main/java/cli/Manager.java
+++ b/src/main/java/cli/Manager.java
@@ -51,6 +51,10 @@ 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";
@@ -103,7 +107,7 @@ class Manager {
         }
         axolotlStore = new JsonAxolotlStore(in.getJSONObject("axolotlStore"));
         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() {
@@ -120,7 +124,7 @@ class Manager {
             writer.flush();
             writer.close();
         } catch (Exception e) {
-            System.out.println("Saving file error: " + e.getMessage());
+            System.err.println("Saving file error: " + e.getMessage());
         }
     }
 
@@ -138,7 +142,7 @@ class Manager {
     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();
@@ -201,7 +205,7 @@ class Manager {
     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;
@@ -218,7 +222,7 @@ class Manager {
     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);
     }
 
@@ -242,7 +246,7 @@ class Manager {
     }
 
     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 {
@@ -257,7 +261,7 @@ class Manager {
                     if (returnOnTimeout)
                         return;
                 } catch (InvalidVersionException e) {
-                    System.out.println("Ignoring error: " + e.getMessage());
+                    System.err.println("Ignoring error: " + e.getMessage());
                 }
                 save();
             }
@@ -268,7 +272,7 @@ class Manager {
     }
 
     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);
@@ -290,8 +294,26 @@ class Manager {
         } 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;
     }