Match iOS protobuf

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiverHandler.kt

@@ -233,13 +233,11 @@ fun MessageReceiver.handleVisibleMessage(message: VisibleMessage, proto: SignalS
 private fun MessageReceiver.handleClosedGroupControlMessage(message: ClosedGroupControlMessage) {
     when (message.kind!!) {
         is ClosedGroupControlMessage.Kind.New -> handleNewClosedGroup(message)
-        is ClosedGroupControlMessage.Kind.Update -> handleClosedGroupUpdated(message)
         is ClosedGroupControlMessage.Kind.EncryptionKeyPair -> handleClosedGroupEncryptionKeyPair(message)
         is ClosedGroupControlMessage.Kind.NameChange -> handleClosedGroupNameChanged(message)
         is ClosedGroupControlMessage.Kind.MembersAdded -> handleClosedGroupMembersAdded(message)
         is ClosedGroupControlMessage.Kind.MembersRemoved -> handleClosedGroupMembersRemoved(message)
         is ClosedGroupControlMessage.Kind.MemberLeft -> handleClosedGroupMemberLeft(message)
-        is ClosedGroupControlMessage.Kind.EncryptionKeyPairRequest -> handleClosedGroupEncryptionKeyPairRequest(message)
     }
 }
 
@@ -283,59 +281,6 @@ private fun handleNewClosedGroup(sender: String, sentTimestamp: Long, groupPubli
     PushNotificationAPI.performOperation(PushNotificationAPI.ClosedGroupOperation.Subscribe, groupPublicKey, storage.getUserPublicKey()!!)
 }
 
-private fun MessageReceiver.handleClosedGroupUpdated(message: ClosedGroupControlMessage) {
-    // Prepare
-    val context = MessagingConfiguration.shared.context
-    val storage = MessagingConfiguration.shared.storage
-    val senderPublicKey = message.sender ?: return
-    val kind = message.kind!! as? ClosedGroupControlMessage.Kind.Update ?: return
-    val groupPublicKey = message.groupPublicKey ?: return
-    val userPublicKey = storage.getUserPublicKey()!!
-    // Unwrap the message
-    val name = kind.name
-    val members = kind.members.map { it.toByteArray().toHexString() }
-    val groupID = GroupUtil.doubleEncodeGroupID(groupPublicKey)
-    val group = storage.getGroup(groupID) ?: run {
-        Log.d("Loki", "Ignoring closed group info message for nonexistent group.")
-        return
-    }
-    if (!group.isActive) {
-        Log.d("Loki", "Ignoring closed group info message for inactive group")
-        return
-    }
-    val oldMembers = group.members.map { it.serialize() }
-    // Check common group update logic
-    if (!isValidGroupUpdate(group, message.sentTimestamp!!, senderPublicKey)) {
-        return
-    }
-    // Check that the admin wasn't removed unless the group was destroyed entirely
-    if (!members.contains(group.admins.first().toString()) && members.isNotEmpty()) {
-        android.util.Log.d("Loki", "Ignoring invalid closed group update message.")
-        return
-    }
-    // Remove the group from the user's set of public keys to poll for if the current user was removed
-    val wasCurrentUserRemoved = !members.contains(userPublicKey)
-    if (wasCurrentUserRemoved) {
-        disableLocalGroupAndUnsubscribe(groupPublicKey, groupID, userPublicKey)
-    }
-    // Generate and distribute a new encryption key pair if needed
-    val wasAnyUserRemoved = (members.toSet().intersect(oldMembers) != oldMembers.toSet())
-    val isCurrentUserAdmin = group.admins.map { it.toString() }.contains(userPublicKey)
-    if (wasAnyUserRemoved && isCurrentUserAdmin) {
-        MessageSender.generateAndSendNewEncryptionKeyPair(groupPublicKey, members)
-    }
-    // Update the group
-    storage.updateTitle(groupID, name)
-    if (!wasCurrentUserRemoved) {
-        // The call below sets isActive to true, so if the user is leaving we have to use groupDB.remove(...) instead
-        storage.updateMembers(groupID, members.map { Address.fromSerialized(it) })
-    }
-    // Notify the user
-    val wasSenderRemoved = !members.contains(senderPublicKey)
-    val type = if (wasSenderRemoved) SignalServiceGroup.Type.QUIT else SignalServiceGroup.Type.MEMBER_REMOVED
-    storage.insertIncomingInfoMessage(context, senderPublicKey, groupID, type, name, members, group.admins.map { it.toString() }, message.sentTimestamp!!)
-}
-
 private fun MessageReceiver.handleClosedGroupEncryptionKeyPair(message: ClosedGroupControlMessage) {
     // Prepare
     val storage = MessagingConfiguration.shared.storage
@@ -565,31 +510,6 @@ private fun MessageReceiver.handleClosedGroupMemberLeft(message: ClosedGroupCont
     }
 }
 
-private fun MessageReceiver.handleClosedGroupEncryptionKeyPairRequest(message: ClosedGroupControlMessage) {
-    val storage = MessagingConfiguration.shared.storage
-    val senderPublicKey = message.sender ?: return
-    val userPublicKey = storage.getUserPublicKey()!!
-    if (message.kind!! !is ClosedGroupControlMessage.Kind.EncryptionKeyPairRequest) return
-    if (senderPublicKey == userPublicKey) {
-        Log.d("Loki", "Ignoring invalid closed group update.")
-        return
-    }
-    val groupPublicKey = message.groupPublicKey ?: return
-    val groupID = GroupUtil.doubleEncodeGroupID(groupPublicKey)
-    val group = storage.getGroup(groupID) ?: run {
-        Log.d("Loki", "Ignoring closed group info message for nonexistent group.")
-        return
-    }
-    if (!isValidGroupUpdate(group, message.sentTimestamp!!, senderPublicKey)) { return }
-    val encryptionKeyPair = pendingKeyPair[groupPublicKey]?.orNull()
-            ?: storage.getLatestClosedGroupEncryptionKeyPair(groupPublicKey)
-    if (encryptionKeyPair == null) {
-        Log.d("Loki", "Couldn't get encryption key pair for closed group.")
-    } else {
-        MessageSender.sendEncryptionKeyPair(groupPublicKey, encryptionKeyPair, setOf(senderPublicKey), targetUser = senderPublicKey, force = false)
-    }
-}
-
 private fun isValidGroupUpdate(group: GroupRecord,
                                sentTimestamp: Long,
                                senderPublicKey: String): Boolean  {

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt

@@ -135,11 +135,11 @@ object MessageSender {
             val senderPublicKey: String
             when (destination) {
                 is Destination.Contact -> {
-                    kind = SignalServiceProtos.Envelope.Type.UNIDENTIFIED_SENDER
+                    kind = SignalServiceProtos.Envelope.Type.SESSION_MESSAGE
                     senderPublicKey = ""
                 }
                 is Destination.ClosedGroup -> {
-                    kind = SignalServiceProtos.Envelope.Type.CLOSED_GROUP_CIPHERTEXT
+                    kind = SignalServiceProtos.Envelope.Type.CLOSED_GROUP_MESSAGE
                     senderPublicKey = destination.groupPublicKey
                 }
                 is Destination.OpenGroup -> throw Error.PreconditionFailure("Destination should not be open groups!")

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroup.kt

@@ -278,23 +278,6 @@ fun MessageSender.sendEncryptionKeyPair(groupPublicKey: String, newKeyPair: ECKe
     }
 }
 
-/// Note: Shouldn't currently be in use.
-fun MessageSender.requestEncryptionKeyPair(groupPublicKey: String) {
-    val storage = MessagingConfiguration.shared.storage
-    val groupID = GroupUtil.doubleEncodeGroupID(groupPublicKey)
-    val group = storage.getGroup(groupID) ?: run {
-        Log.d("Loki", "Can't request encryption key pair for nonexistent closed group.")
-        throw Error.NoThread
-    }
-    val members = group.members.map { it.serialize() }.toSet()
-    if (!members.contains(storage.getUserPublicKey()!!)) return
-    // Send the request to the group
-    val sentTime = System.currentTimeMillis()
-    val closedGroupControlMessage = ClosedGroupControlMessage(ClosedGroupControlMessage.Kind.EncryptionKeyPairRequest())
-    closedGroupControlMessage.sentTimestamp = sentTime
-    send(closedGroupControlMessage, Address.fromSerialized(groupID))
-}
-
 fun MessageSender.sendLatestEncryptionKeyPair(publicKey: String, groupPublicKey: String) {
     val storage = MessagingConfiguration.shared.storage
     val groupID = GroupUtil.doubleEncodeGroupID(groupPublicKey)

libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt

@@ -46,7 +46,7 @@ object SnodeAPI {
     private val targetSwarmSnodeCount = 2
     private val useOnionRequests = true
 
-    internal val useTestnet = true
+    internal val useTestnet = false
 
     // Error
     internal sealed class Error(val description: String) : Exception(description) {

libsignal/protobuf/Makefile

@@ -1,4 +1,3 @@
 
 all:
 	protoc25 --java_out=../src/main/java/ SignalService.proto WebSocketResources.proto
-	protoc25 --java_out=../src/main/java/ UnidentifiedDelivery.proto

libsignal/protobuf/SignalService.proto

@@ -8,8 +8,8 @@ option java_outer_classname = "SignalServiceProtos";
 message Envelope {
 
   enum Type {
-    UNIDENTIFIED_SENDER     = 6;
+    SESSION_MESSAGE      = 6;
-    CLOSED_GROUP_CIPHERTEXT = 7;
+    CLOSED_GROUP_MESSAGE = 7;
   }
 
   // @required
@@ -17,39 +17,32 @@ message Envelope {
   optional string source          = 2;
   optional uint32 sourceDevice    = 7;
   // @required
-  optional uint64 timestamp       = 5;
+  required uint64 timestamp       = 5;
   optional bytes  content         = 8;
   optional uint64 serverTimestamp = 10;
 }
 
 message TypingMessage {
 
-  enum Action {
+    enum Action {
-    STARTED = 0;
+        STARTED = 0;
-    STOPPED = 1;
+        STOPPED = 1;
-  }
+    }
 
-  // @required
+    // @required
-  optional uint64 timestamp = 1;
+    required uint64 timestamp = 1;
-  // @required
+    // @required
-  optional Action action = 2;
+    required Action action    = 2;
 }
 
 message Content {
-  optional DataMessage                dataMessage          = 1;
+  optional DataMessage                dataMessage                = 1;
-  optional ReceiptMessage             receiptMessage       = 5;
+  optional ReceiptMessage             receiptMessage             = 5;
-  optional TypingMessage              typingMessage        = 6;
+  optional TypingMessage              typingMessage              = 6;
-  optional ConfigurationMessage       configurationMessage = 7;
+  optional ConfigurationMessage       configurationMessage       = 7;
   optional DataExtractionNotification dataExtractionNotification = 82;
 }
 
-message ClosedGroupCiphertextMessageWrapper {
-  // @required
-  optional bytes ciphertext = 1;
-  // @required
-  optional bytes ephemeralPublicKey = 2;
-}
-
 message KeyPair {
   // @required
   required bytes publicKey  = 1;
@@ -90,87 +83,16 @@ message DataMessage {
     }
 
     // @required
-    optional uint64            id          = 1;
+    required uint64            id          = 1;
     // @required
-    optional string            author      = 2;
+    required string            author      = 2;
     optional string            text        = 3;
     repeated QuotedAttachment  attachments = 4;
   }
 
-  message Contact {
-
-    message Name {
-      optional string givenName   = 1;
-      optional string familyName  = 2;
-      optional string prefix      = 3;
-      optional string suffix      = 4;
-      optional string middleName  = 5;
-      optional string displayName = 6;
-    }
-
-    message Phone {
-
-      enum Type {
-        HOME   = 1;
-        MOBILE = 2;
-        WORK   = 3;
-        CUSTOM = 4;
-      }
-
-      optional string value = 1;
-      optional Type   type  = 2;
-      optional string label = 3;
-    }
-
-    message Email {
-
-      enum Type {
-        HOME   = 1;
-        MOBILE = 2;
-        WORK   = 3;
-        CUSTOM = 4;
-      }
-
-      optional string value = 1;
-      optional Type   type  = 2;
-      optional string label = 3;
-    }
-
-    message PostalAddress {
-
-      enum Type {
-        HOME   = 1;
-        WORK   = 2;
-        CUSTOM = 3;
-      }
-
-      optional Type   type         = 1;
-      optional string label        = 2;
-      optional string street       = 3;
-      optional string pobox        = 4;
-      optional string neighborhood = 5;
-      optional string city         = 6;
-      optional string region       = 7;
-      optional string postcode     = 8;
-      optional string country      = 9;
-    }
-
-    message Avatar {
-      optional AttachmentPointer avatar    = 1;
-      optional bool              isProfile = 2;
-    }
-
-    optional Name              name            = 1;
-    repeated Phone             number          = 3;
-    repeated Email             email           = 4;
-    repeated PostalAddress     address         = 5;
-    optional Avatar            avatar          = 6;
-    optional string            organization    = 7;
-  }
-
   message Preview {
     // @required
-    optional string            url   = 1;
+    required string            url   = 1;
     optional string            title = 2;
     optional AttachmentPointer image = 3;
   }
@@ -184,13 +106,11 @@ message DataMessage {
 
     enum Type {
       NEW                         = 1; // publicKey, name, encryptionKeyPair, members, admins
-      UPDATE                      = 2; // name, members
       ENCRYPTION_KEY_PAIR         = 3; // publicKey, wrappers
       NAME_CHANGE                 = 4; // name
       MEMBERS_ADDED               = 5; // members
       MEMBERS_REMOVED             = 6; // members
       MEMBER_LEFT                 = 7;
-      ENCRYPTION_KEY_PAIR_REQUEST = 8;
     }
 
     message KeyPairWrapper {
@@ -218,12 +138,10 @@ message DataMessage {
   optional bytes                     profileKey                = 6;
   optional uint64                    timestamp                 = 7;
   optional Quote                     quote                     = 8;
-  repeated Contact                   contact                   = 9;
   repeated Preview                   preview                   = 10;
   optional LokiProfile               profile                   = 101;
   optional ClosedGroupControlMessage closedGroupControlMessage = 104;
   optional string                    syncTarget                = 105;
-  optional PublicChatInfo            publicChatInfo            = 999;
 }
 
 message ConfigurationMessage {
@@ -261,7 +179,7 @@ message ReceiptMessage {
   }
 
   // @required
-  optional Type   type      = 1;
+  required Type   type      = 1;
   repeated uint64 timestamp = 2;
 }
 
@@ -272,7 +190,7 @@ message AttachmentPointer {
   }
 
   // @required
-  optional fixed64 id          = 1;
+  required fixed64 id          = 1;
   optional string  contentType = 2;
   optional bytes   key         = 3;
   optional uint32  size        = 4;
@@ -304,51 +222,4 @@ message GroupContext {
   repeated string            members = 4;
   optional AttachmentPointer avatar  = 5;
   repeated string            admins  = 6;
-
-  // Loki - These fields are only used internally for the Android code base.
-  // This is so that we can differentiate adding/kicking.
-  // DO NOT USE WHEN SENDING MESSAGES.
-  repeated string           newMembers     = 998;
-  repeated string           removedMembers = 999;
-}
-
-message ContactDetails {
-
-  message Avatar {
-    optional string contentType = 1;
-    optional uint32 length      = 2;
-  }
-
-  // @required
-  optional string   number      = 1;
-  optional string   name        = 2;
-  optional Avatar   avatar      = 3;
-  optional string   color       = 4;
-  optional bytes    profileKey  = 6;
-  optional bool     blocked     = 7;
-  optional uint32   expireTimer = 8;
-  optional string   nickname    = 101;
-}
-
-message GroupDetails {
-
-  message Avatar {
-    optional string contentType = 1;
-    optional uint32 length      = 2;
-  }
-
-  // @required
-  optional bytes  id          = 1;
-  optional string name        = 2;
-  repeated string members     = 3;
-  optional Avatar avatar      = 4;
-  optional bool   active      = 5 [default = true];
-  optional uint32 expireTimer = 6;
-  optional string color       = 7;
-  optional bool   blocked     = 8;
-  repeated string admins      = 9;
-}
-
-message PublicChatInfo { // Intended for internal use only
-  optional uint64 serverID = 1;
 }

libsignal/protobuf/UnidentifiedDelivery.proto

@@ -1,40 +0,0 @@
-syntax = "proto2";
-
-package signal;
-
-option java_package = "org.session.libsignal.metadata";
-option java_outer_classname = "SignalProtos";
-
-message ServerCertificate {
-    message Certificate {
-        optional uint32 id  = 1;
-        optional bytes  key = 2;
-    }
-
-    optional bytes certificate = 1;
-    optional bytes signature   = 2;
-}
-
-message SenderCertificate {
-    optional string sender       = 1;
-    optional uint32 senderDevice = 2;
-}
-
-message UnidentifiedSenderMessage {
-
-    message Message {
-        enum Type {
-            PREKEY_MESSAGE          = 1;
-            MESSAGE                 = 2;
-            FALLBACK_MESSAGE        = 3;
-        }
-
-        optional Type              type              = 1;
-        optional SenderCertificate senderCertificate = 2;
-        optional bytes             content           = 3;
-    }
-
-    optional bytes ephemeralPublic  = 1;
-    optional bytes encryptedStatic  = 2;
-    optional bytes encryptedMessage = 3;
-}

libsignal/src/main/java/org/session/libsignal/service/api/crypto/SignalServiceCipher.java

@@ -36,6 +36,7 @@ import org.session.libsignal.service.loki.api.crypto.SessionProtocol;
 import org.session.libsignal.service.loki.api.crypto.SessionProtocolUtilities;
 import org.session.libsignal.service.loki.database.LokiAPIDatabaseProtocol;
 
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -153,7 +154,6 @@ public class SignalServiceCipher {
     List<SignalServiceAttachment>  attachments                 = new LinkedList<SignalServiceAttachment>();
     boolean                        expirationUpdate            = ((content.getFlags() & DataMessage.Flags.EXPIRATION_TIMER_UPDATE_VALUE) != 0);
     SignalServiceDataMessage.Quote quote                       = createQuote(content);
-    List<SharedContact>            sharedContacts              = createSharedContacts(content);
     List<Preview>                  previews                    = createPreviews(content);
     ClosedGroupControlMessage      closedGroupControlMessage   = content.getClosedGroupControlMessage();
     String                         syncTarget                  = content.getSyncTarget();
@@ -176,7 +176,7 @@ public class SignalServiceCipher {
             expirationUpdate,
             content.hasProfileKey() ? content.getProfileKey().toByteArray() : null,
             quote,
-            sharedContacts,
+            new ArrayList<>(),
             previews,
             closedGroupControlMessage,
             syncTarget);
@@ -245,101 +245,6 @@ public class SignalServiceCipher {
     return results;
   }
 
-  private List<SharedContact> createSharedContacts(DataMessage content) {
-    if (content.getContactCount() <= 0) return null;
-
-    List<SharedContact> results = new LinkedList<SharedContact>();
-
-    for (DataMessage.Contact contact : content.getContactList()) {
-      SharedContact.Builder builder = SharedContact.newBuilder()
-              .setName(SharedContact.Name.newBuilder()
-                      .setDisplay(contact.getName().getDisplayName())
-                      .setFamily(contact.getName().getFamilyName())
-                      .setGiven(contact.getName().getGivenName())
-                      .setMiddle(contact.getName().getMiddleName())
-                      .setPrefix(contact.getName().getPrefix())
-                      .setSuffix(contact.getName().getSuffix())
-                      .build());
-
-      if (contact.getAddressCount() > 0) {
-        for (DataMessage.Contact.PostalAddress address : contact.getAddressList()) {
-          SharedContact.PostalAddress.Type type = SharedContact.PostalAddress.Type.HOME;
-
-          switch (address.getType()) {
-            case WORK:   type = SharedContact.PostalAddress.Type.WORK;   break;
-            case HOME:   type = SharedContact.PostalAddress.Type.HOME;   break;
-            case CUSTOM: type = SharedContact.PostalAddress.Type.CUSTOM; break;
-          }
-
-          builder.withAddress(SharedContact.PostalAddress.newBuilder()
-                  .setCity(address.getCity())
-                  .setCountry(address.getCountry())
-                  .setLabel(address.getLabel())
-                  .setNeighborhood(address.getNeighborhood())
-                  .setPobox(address.getPobox())
-                  .setPostcode(address.getPostcode())
-                  .setRegion(address.getRegion())
-                  .setStreet(address.getStreet())
-                  .setType(type)
-                  .build());
-        }
-      }
-
-      if (contact.getNumberCount() > 0) {
-        for (DataMessage.Contact.Phone phone : contact.getNumberList()) {
-          SharedContact.Phone.Type type = SharedContact.Phone.Type.HOME;
-
-          switch (phone.getType()) {
-            case HOME:   type = SharedContact.Phone.Type.HOME;   break;
-            case WORK:   type = SharedContact.Phone.Type.WORK;   break;
-            case MOBILE: type = SharedContact.Phone.Type.MOBILE; break;
-            case CUSTOM: type = SharedContact.Phone.Type.CUSTOM; break;
-          }
-
-          builder.withPhone(SharedContact.Phone.newBuilder()
-                  .setLabel(phone.getLabel())
-                  .setType(type)
-                  .setValue(phone.getValue())
-                  .build());
-        }
-      }
-
-      if (contact.getEmailCount() > 0) {
-        for (DataMessage.Contact.Email email : contact.getEmailList()) {
-          SharedContact.Email.Type type = SharedContact.Email.Type.HOME;
-
-          switch (email.getType()) {
-            case HOME:   type = SharedContact.Email.Type.HOME;   break;
-            case WORK:   type = SharedContact.Email.Type.WORK;   break;
-            case MOBILE: type = SharedContact.Email.Type.MOBILE; break;
-            case CUSTOM: type = SharedContact.Email.Type.CUSTOM; break;
-          }
-
-          builder.withEmail(SharedContact.Email.newBuilder()
-                  .setLabel(email.getLabel())
-                  .setType(type)
-                  .setValue(email.getValue())
-                  .build());
-        }
-      }
-
-      if (contact.hasAvatar()) {
-        builder.setAvatar(SharedContact.Avatar.newBuilder()
-                .withAttachment(createAttachmentPointer(contact.getAvatar().getAvatar()))
-                .withProfileFlag(contact.getAvatar().getIsProfile())
-                .build());
-      }
-
-      if (contact.hasOrganization()) {
-        builder.withOrganization(contact.getOrganization());
-      }
-
-      results.add(builder.build());
-    }
-
-    return results;
-  }
-
   private SignalServiceAttachmentPointer createAttachmentPointer(AttachmentPointer pointer) {
     return new SignalServiceAttachmentPointer(pointer.getId(),
             pointer.getContentType(),

libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java

@@ -133,10 +133,10 @@ public class SignalServiceEnvelope {
   }
 
   public boolean isUnidentifiedSender() {
-    return envelope.getType().getNumber() == Envelope.Type.UNIDENTIFIED_SENDER_VALUE;
+    return envelope.getType().getNumber() == Envelope.Type.SESSION_MESSAGE_VALUE;
   }
 
   public boolean isClosedGroupCiphertext() {
-      return envelope.getType().getNumber() == Envelope.Type.CLOSED_GROUP_CIPHERTEXT_VALUE;
+      return envelope.getType().getNumber() == Envelope.Type.CLOSED_GROUP_MESSAGE_VALUE;
   }
 }