Use SignalServiceAddress in more places

[signal-cli] / src / main / java / org / asamk / signal / manager / Utils.java

diff --git a/src/main/java/org/asamk/signal/manager/Utils.java b/src/main/java/org/asamk/signal/manager/Utils.java
index 38dd65b85fcb3a22ef133819ec8bed24fd0973dc..4396e0cadcb931a604c49754ab8809890d2179cb 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Utils.java
+++ b/src/main/java/org/asamk/signal/manager/Utils.java
@@ -16,8 +16,9 @@ import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.api.util.StreamDetails;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.api.util.StreamDetails;

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.util.Base64;

 
 

+import java.io.BufferedInputStream;

 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;


@@ -29,48 +30,56 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;

+import java.net.URLConnection;

 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.util.ArrayList;

-import java.util.Collection;

 import java.util.HashMap;
 import java.util.HashMap;

-import java.util.HashSet;

 import java.util.List;
 import java.util.Map;
 import java.util.List;
 import java.util.Map;

-import java.util.Set;

 
 import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
 
 class Utils {
 
     static List<SignalServiceAttachment> getSignalServiceAttachments(List<String> attachments) throws AttachmentInvalidException {
 
 import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
 
 class Utils {
 
     static List<SignalServiceAttachment> getSignalServiceAttachments(List<String> attachments) throws AttachmentInvalidException {

-        List<SignalServiceAttachment> SignalServiceAttachments = null;
+        List<SignalServiceAttachment> signalServiceAttachments = null;

         if (attachments != null) {
         if (attachments != null) {

-            SignalServiceAttachments = new ArrayList<>(attachments.size());
+            signalServiceAttachments = new ArrayList<>(attachments.size());

             for (String attachment : attachments) {
                 try {
             for (String attachment : attachments) {
                 try {

-                    SignalServiceAttachments.add(createAttachment(new File(attachment)));
+                    signalServiceAttachments.add(createAttachment(new File(attachment)));

                 } catch (IOException e) {
                     throw new AttachmentInvalidException(attachment, e);
                 }
             }
         }
                 } catch (IOException e) {
                     throw new AttachmentInvalidException(attachment, e);
                 }
             }
         }

-        return SignalServiceAttachments;
+        return signalServiceAttachments;

     }
 
     }
 

-    static SignalServiceAttachmentStream createAttachment(File attachmentFile) throws IOException {
-        InputStream attachmentStream = new FileInputStream(attachmentFile);
-        final long attachmentSize = attachmentFile.length();
-        String mime = Files.probeContentType(attachmentFile.toPath());
+    private static String getFileMimeType(File file) throws IOException {
+        String mime = Files.probeContentType(file.toPath());
+        if (mime == null) {
+            try (InputStream bufferedStream = new BufferedInputStream(new FileInputStream(file))) {
+                mime = URLConnection.guessContentTypeFromStream(bufferedStream);
+            }
+        }

         if (mime == null) {
             mime = "application/octet-stream";
         }
         if (mime == null) {
             mime = "application/octet-stream";
         }

+        return mime;
+    }
+
+    static SignalServiceAttachmentStream createAttachment(File attachmentFile) throws IOException {
+        InputStream attachmentStream = new FileInputStream(attachmentFile);
+        final long attachmentSize = attachmentFile.length();
+        final String mime = getFileMimeType(attachmentFile);

         // TODO mabybe add a parameter to set the voiceNote, preview, width, height and caption option
         Optional<byte[]> preview = Optional.absent();
         Optional<String> caption = Optional.absent();
         Optional<String> blurHash = Optional.absent();
         // TODO mabybe add a parameter to set the voiceNote, preview, width, height and caption option
         Optional<byte[]> preview = Optional.absent();
         Optional<String> caption = Optional.absent();
         Optional<String> blurHash = Optional.absent();

-        return new SignalServiceAttachmentStream(attachmentStream, mime, attachmentSize, Optional.of(attachmentFile.getName()), false, preview, 0, 0, caption, blurHash, null);
+        return new SignalServiceAttachmentStream(attachmentStream, mime, attachmentSize, Optional.of(attachmentFile.getName()), false, preview, 0, 0, caption, blurHash, null, null);

     }
 
     static StreamDetails createStreamDetailsFromFile(File file) throws IOException {
     }
 
     static StreamDetails createStreamDetailsFromFile(File file) throws IOException {


@@ -137,29 +146,10 @@ class Utils {
         return new DeviceLinkInfo(deviceIdentifier, deviceKey);
     }
 
         return new DeviceLinkInfo(deviceIdentifier, deviceKey);
     }
 

-    static Set<SignalServiceAddress> getSignalServiceAddresses(Collection<String> recipients, String localNumber) {
-        Set<SignalServiceAddress> recipientsTS = new HashSet<>(recipients.size());
-        for (String recipient : recipients) {
-            try {
-                recipientsTS.add(getPushAddress(recipient, localNumber));
-            } catch (InvalidNumberException e) {
-                System.err.println("Failed to add recipient \"" + recipient + "\": " + e.getMessage());
-                System.err.println("Aborting sending.");
-                return null;
-            }
-        }
-        return recipientsTS;
-    }
-

     static String canonicalizeNumber(String number, String localNumber) throws InvalidNumberException {
         return PhoneNumberFormatter.formatNumber(number, localNumber);
     }
 
     static String canonicalizeNumber(String number, String localNumber) throws InvalidNumberException {
         return PhoneNumberFormatter.formatNumber(number, localNumber);
     }
 

-    private static SignalServiceAddress getPushAddress(String number, String localNumber) throws InvalidNumberException {
-        String e164number = canonicalizeNumber(number, localNumber);
-        return new SignalServiceAddress(e164number);
-    }
-

     static SignalServiceEnvelope loadEnvelope(File file) throws IOException {
         try (FileInputStream f = new FileInputStream(file)) {
             DataInputStream in = new DataInputStream(f);
     static SignalServiceEnvelope loadEnvelope(File file) throws IOException {
         try (FileInputStream f = new FileInputStream(file)) {
             DataInputStream in = new DataInputStream(f);


@@ -196,7 +186,7 @@ class Utils {
                     uuid = null;
                 }
             }
                     uuid = null;
                 }
             }

-            return new SignalServiceEnvelope(type, source, sourceDevice, timestamp, legacyMessage, content, serverTimestamp, uuid);
+            return new SignalServiceEnvelope(type, Optional.of(new SignalServiceAddress(null, source)), sourceDevice, timestamp, legacyMessage, content, serverTimestamp, uuid);

         }
     }
 
         }
     }
 


@@ -205,7 +195,7 @@ class Utils {
             try (DataOutputStream out = new DataOutputStream(f)) {
                 out.writeInt(2); // version
                 out.writeInt(envelope.getType());
             try (DataOutputStream out = new DataOutputStream(f)) {
                 out.writeInt(2); // version
                 out.writeInt(envelope.getType());

-                out.writeUTF(envelope.getSource());
+                out.writeUTF(envelope.getSourceE164().get());

                 out.writeInt(envelope.getSourceDevice());
                 out.writeLong(envelope.getTimestamp());
                 if (envelope.hasContent()) {
                 out.writeInt(envelope.getSourceDevice());
                 out.writeLong(envelope.getTimestamp());
                 if (envelope.hasContent()) {


@@ -245,7 +235,9 @@ class Utils {
     }
 
     static String computeSafetyNumber(String ownUsername, IdentityKey ownIdentityKey, String theirUsername, IdentityKey theirIdentityKey) {
     }
 
     static String computeSafetyNumber(String ownUsername, IdentityKey ownIdentityKey, String theirUsername, IdentityKey theirIdentityKey) {

-        Fingerprint fingerprint = new NumericFingerprintGenerator(5200).createFor(ownUsername, ownIdentityKey, theirUsername, theirIdentityKey);
+        // Version 1: E164 user
+        // Version 2: UUID user
+        Fingerprint fingerprint = new NumericFingerprintGenerator(5200).createFor(1, ownUsername.getBytes(), ownIdentityKey, theirUsername.getBytes(), theirIdentityKey);

         return fingerprint.getDisplayableFingerprint().getDisplayText();
     }
 
         return fingerprint.getDisplayableFingerprint().getDisplayText();
     }