Send and receive verified messages

Fixes #85

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 79174549db2eae188ad9c68d5285742d39f0319b..a9097fc96493b3213d48d97f0dd2bd26a2640a8c 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -992,6 +992,16 @@ public class Main {
                                 System.out.println(" - " + number);
                             }
                         }
                                 System.out.println(" - " + number);
                             }
                         }

+                        if (syncMessage.getVerified().isPresent()) {
+                            System.out.println("Received sync message with verified identities:");
+                            final List<VerifiedMessage> verifiedList = syncMessage.getVerified().get();
+                            for (VerifiedMessage v : verifiedList) {
+                                System.out.println(" - " + v.getDestination() + ": " + v.getVerified());
+                                String safetyNumber = formatSafetyNumber(m.computeSafetyNumber(v.getDestination(), v.getIdentityKey()));
+                                System.out.println("   " + safetyNumber);
+                            }
+
+                        }

                     }
                 }
             } else {
                     }
                 }
             } else {

diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java
index a38d313f516e2fa93f52a7f5b11dea02ce855c46..c9252f837152383a30cbe1955df47a4b85d7f7b5 100644 (file)
--- a/src/main/java/org/asamk/signal/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -96,7 +96,7 @@ class Manager implements Signal {
 
     private final static int PREKEY_MINIMUM_COUNT = 20;
     private static final int PREKEY_BATCH_SIZE = 100;
 
     private final static int PREKEY_MINIMUM_COUNT = 20;
     private static final int PREKEY_BATCH_SIZE = 100;

-    private static final int MAX_ATTACHMENT_SIZE = 150 * 1024  * 1024;
+    private static final int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;

 
     private final String settingsPath;
     private final String dataPath;
 
     private final String settingsPath;
     private final String dataPath;


@@ -559,7 +559,7 @@ class Manager implements Signal {
             mime = "application/octet-stream";
         }
         // TODO mabybe add a parameter to set the voiceNote and preview option
             mime = "application/octet-stream";
         }
         // TODO mabybe add a parameter to set the voiceNote and preview option

-        return new SignalServiceAttachmentStream(attachmentStream, mime, attachmentSize, Optional.of(attachmentFile.getName()), false, Optional.<byte[]>absent(),null);
+        return new SignalServiceAttachmentStream(attachmentStream, mime, attachmentSize, Optional.of(attachmentFile.getName()), false, Optional.<byte[]>absent(), null);

     }
 
     private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(byte[] groupId) throws IOException {
     }
 
     private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(byte[] groupId) throws IOException {


@@ -1199,6 +1199,7 @@ class Manager implements Signal {
                     if (rm.isContactsRequest()) {
                         try {
                             sendContacts();
                     if (rm.isContactsRequest()) {
                         try {
                             sendContacts();

+                            sendVerifiedMessage();

                         } catch (UntrustedIdentityException | IOException e) {
                             e.printStackTrace();
                         }
                         } catch (UntrustedIdentityException | IOException e) {
                             e.printStackTrace();
                         }


@@ -1288,6 +1289,12 @@ class Manager implements Signal {
                         }
                     }
                 }
                         }
                     }
                 }

+                if (syncMessage.getVerified().isPresent()) {
+                    final List<VerifiedMessage> verifiedList = syncMessage.getVerified().get();
+                    for (VerifiedMessage v : verifiedList) {
+                        signalProtocolStore.saveIdentity(v.getDestination(), v.getIdentityKey(), TrustLevel.fromVerifiedState(v.getVerified()));
+                    }
+                }

             }
         }
     }
             }
         }
     }


@@ -1523,6 +1530,26 @@ class Manager implements Signal {
         }
     }
 
         }
     }
 

+    private void sendVerifiedMessage() throws IOException, UntrustedIdentityException {
+        List<VerifiedMessage> verifiedMessages = new LinkedList<>();
+        for (Map.Entry<String, List<JsonIdentityKeyStore.Identity>> x : getIdentities().entrySet()) {
+            final String name = x.getKey();
+            for (JsonIdentityKeyStore.Identity id : x.getValue()) {
+                if (id.getTrustLevel() == TrustLevel.TRUSTED_UNVERIFIED) {
+                    continue;
+                }
+                VerifiedMessage verifiedMessage = new VerifiedMessage(name, id.getIdentityKey(), id.getTrustLevel().toVerifiedState());
+                verifiedMessages.add(verifiedMessage);
+            }
+        }
+        sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessages));
+    }
+
+    private void sendVerifiedMessage(String destination, IdentityKey identityKey, TrustLevel trustLevel) throws IOException, UntrustedIdentityException {
+        VerifiedMessage verifiedMessage = new VerifiedMessage(destination, identityKey, trustLevel.toVerifiedState());
+        sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage));
+    }
+

     public ContactInfo getContact(String number) {
         return contactStore.getContact(number);
     }
     public ContactInfo getContact(String number) {
         return contactStore.getContact(number);
     }


@@ -1556,6 +1583,11 @@ class Manager implements Signal {
             }
 
             signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
             }
 
             signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);

+            try {
+                sendVerifiedMessage(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
+            } catch (IOException | UntrustedIdentityException e) {
+                e.printStackTrace();
+            }

             save();
             return true;
         }
             save();
             return true;
         }


@@ -1579,6 +1611,11 @@ class Manager implements Signal {
             }
 
             signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
             }
 
             signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);

+            try {
+                sendVerifiedMessage(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
+            } catch (IOException | UntrustedIdentityException e) {
+                e.printStackTrace();
+            }

             save();
             return true;
         }
             save();
             return true;
         }


@@ -1598,6 +1635,11 @@ class Manager implements Signal {
         for (JsonIdentityKeyStore.Identity id : ids) {
             if (id.getTrustLevel() == TrustLevel.UNTRUSTED) {
                 signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_UNVERIFIED);
         for (JsonIdentityKeyStore.Identity id : ids) {
             if (id.getTrustLevel() == TrustLevel.UNTRUSTED) {
                 signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_UNVERIFIED);

+                try {
+                    sendVerifiedMessage(name, id.getIdentityKey(), TrustLevel.TRUSTED_UNVERIFIED);
+                } catch (IOException | UntrustedIdentityException e) {
+                    e.printStackTrace();
+                }

             }
         }
         save();
             }
         }
         save();

diff --git a/src/main/java/org/asamk/signal/TrustLevel.java b/src/main/java/org/asamk/signal/TrustLevel.java
index e9e7796de2821bdca74676342172c1e2279757cd..5eaf960af924fcea0bd7fb3256c97bbc444e1370 100644 (file)
--- a/src/main/java/org/asamk/signal/TrustLevel.java
+++ b/src/main/java/org/asamk/signal/TrustLevel.java
@@ -1,5 +1,7 @@
 package org.asamk.signal;
 
 package org.asamk.signal;
 

+import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
+

 public enum TrustLevel {
     UNTRUSTED,
     TRUSTED_UNVERIFIED,
 public enum TrustLevel {
     UNTRUSTED,
     TRUSTED_UNVERIFIED,


@@ -13,4 +15,28 @@ public enum TrustLevel {
         }
         return TrustLevel.cachedValues[i];
     }
         }
         return TrustLevel.cachedValues[i];
     }

+
+    public static TrustLevel fromVerifiedState(VerifiedMessage.VerifiedState verifiedState) {
+        switch (verifiedState) {
+            case DEFAULT:
+                return TRUSTED_UNVERIFIED;
+            case UNVERIFIED:
+                return UNTRUSTED;
+            case VERIFIED:
+                return TRUSTED_VERIFIED;
+        }
+        throw new RuntimeException("Unknown verified state: " + verifiedState);
+    }
+
+    public VerifiedMessage.VerifiedState toVerifiedState() {
+        switch (this) {
+            case TRUSTED_UNVERIFIED:
+                return VerifiedMessage.VerifiedState.DEFAULT;
+            case UNTRUSTED:
+                return VerifiedMessage.VerifiedState.UNVERIFIED;
+            case TRUSTED_VERIFIED:
+                return VerifiedMessage.VerifiedState.VERIFIED;
+        }
+        throw new RuntimeException("Unknown verified state: " + this);
+    }

 }
 }