diff --git a/protos/SignalService.proto b/protos/SignalService.proto index e4c36fe68..6734fa9a2 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -179,34 +179,34 @@ message DataMessage { message ClosedGroupControlMessage { - enum Type { - NEW = 1; // TODO: should get rid of this once closed group redesign has been released for a while + enum Type { + NEW = 1; // TODO: should get rid of this once closed group redesign has been released for a while ENCRYPTION_KEY_PAIR = 3; // TODO: should get rid of this once closed group redesign has been released for a while NAME_CHANGE = 4; // TODO: should get rid of this once closed group redesign has been released for a while MEMBERS_ADDED = 5; // TODO: should get rid of this once closed group redesign has been released for a while MEMBERS_REMOVED = 6; // TODO: should get rid of this once closed group redesign has been released for a while MEMBER_LEFT = 7; ENCRYPTION_KEY_PAIR_REQUEST = 8; // TODO: should get rid of this once closed group redesign has been released for a while - } + } // TODO: should get rid of this once closed group redesign has been released for a while - message KeyPairWrapper { - // @required - required bytes publicKey = 1; // The public key of the user the key pair is meant for - // @required - required bytes encryptedKeyPair = 2; // The encrypted key pair - } - - // @required - required Type type = 1; - optional bytes publicKey = 2; - optional string name = 3; - optional KeyPair encryptionKeyPair = 4; // TODO: should get rid of this once closed group redesign has been released for a while - repeated bytes members = 5; - repeated bytes admins = 6; // TODO: should get rid of this once closed group redesign has been released for a while - repeated KeyPairWrapper wrappers = 7; // TODO: should get rid of this once closed group redesign has been released for a while + message KeyPairWrapper { + // @required + required bytes publicKey = 1; // The public key of the user the key pair is meant for + // @required + required bytes encryptedKeyPair = 2; // The encrypted key pair + } + + // @required + required Type type = 1; + optional bytes publicKey = 2; + optional string name = 3; + optional KeyPair encryptionKeyPair = 4; // TODO: should get rid of this once closed group redesign has been released for a while + repeated bytes members = 5; + repeated bytes admins = 6; // TODO: should get rid of this once closed group redesign has been released for a while + repeated KeyPairWrapper wrappers = 7; // TODO: should get rid of this once closed group redesign has been released for a while optional uint32 expireTimer = 8; // TODO: should get rid of this once closed group redesign has been released for a while - } + }