Re-generate protos

SessionMessagingKit/Protos/SessionProtos.proto

@@ -14,9 +14,11 @@ message Envelope {
   // @required
   required Type   type            = 1;
   optional string source          = 2;
+  optional uint32 sourceDevice    = 7;
   // @required
   optional uint64 timestamp       = 5;
   optional bytes  content         = 8;
+  optional uint64 serverTimestamp = 10;
 }
 
 message TypingMessage {
@@ -34,6 +36,7 @@ message TypingMessage {
 
 message Content {
   optional DataMessage              dataMessage           = 1;
+  optional SyncMessage              syncMessage           = 2;
   optional ReceiptMessage           receiptMessage        = 5;
   optional TypingMessage            typingMessage         = 6;
 }
@@ -215,6 +218,20 @@ message ReceiptMessage {
   repeated uint64 timestamp = 2;
 }
 
+message SyncMessage {
+
+   message Sent {
+     optional string                     destination              = 1;
+     optional uint64                     timestamp                = 2;
+     optional DataMessage                message                  = 3;
+     optional uint64                     expirationStartTimestamp = 4;
+     optional bool                       isRecipientUpdate        = 6 [default = false];
+   }
+
+   optional Sent             sent          = 1;
+   optional bytes            padding       = 8;
+ }
+
 message AttachmentPointer {
 
   enum Flags {

SessionMessagingKit/To Do/OWSRecipientIdentity.h

@@ -15,10 +15,6 @@ typedef NS_ENUM(NSUInteger, OWSVerificationState) {
 @class SNProtoVerified;
 
 NSString *OWSVerificationStateToString(OWSVerificationState verificationState);
-SNProtoVerified *_Nullable BuildVerifiedProtoWithRecipientId(NSString *destinationRecipientId,
-    NSData *identityKey,
-    OWSVerificationState verificationState,
-    NSUInteger paddingBytesLength);
 
 @interface OWSRecipientIdentity : TSYapDatabaseObject
 

SessionMessagingKit/To Do/OWSRecipientIdentity.m

@@ -23,45 +23,6 @@ NSString *OWSVerificationStateToString(OWSVerificationState verificationState)
     }
 }
 
-SNProtoVerifiedState OWSVerificationStateToProtoState(OWSVerificationState verificationState)
-{
-    switch (verificationState) {
-        case OWSVerificationStateDefault:
-            return SNProtoVerifiedStateDefault;
-        case OWSVerificationStateVerified:
-            return SNProtoVerifiedStateVerified;
-        case OWSVerificationStateNoLongerVerified:
-            return SNProtoVerifiedStateUnverified;
-    }
-}
-
-SNProtoVerified *_Nullable BuildVerifiedProtoWithRecipientId(NSString *destinationRecipientId,
-    NSData *identityKey,
-    OWSVerificationState verificationState,
-    NSUInteger paddingBytesLength)
-{
-
-    SNProtoVerifiedBuilder *verifiedBuilder = [SNProtoVerified builderWithDestination:destinationRecipientId];
-    verifiedBuilder.identityKey = identityKey;
-    verifiedBuilder.state = OWSVerificationStateToProtoState(verificationState);
-
-    if (paddingBytesLength > 0) {
-        // We add the same amount of padding in the VerificationStateSync message and it's coresponding NullMessage so
-        // that the sync message is indistinguishable from an outgoing Sent transcript corresponding to the NullMessage.
-        // We pad the NullMessage so as to obscure it's content. The sync message (like all sync messages) will be
-        // *additionally* padded by the superclass while being sent. The end result is we send a NullMessage of a
-        // non-distinct size, and a verification sync which is ~1-512 bytes larger then that.
-        verifiedBuilder.nullMessage = [Cryptography generateRandomBytes:paddingBytesLength];
-    }
-
-    NSError *error;
-    SNProtoVerified *_Nullable verifiedProto = [verifiedBuilder buildAndReturnError:&error];
-    if (error || !verifiedProto) {
-        return nil;
-    }
-    return verifiedProto;
-}
-
 @interface OWSRecipientIdentity ()
 
 @property (atomic) OWSVerificationState verificationState;

SessionMessagingKit/Utilities/ProtoUtils.m

@@ -45,15 +45,6 @@ NS_ASSUME_NONNULL_BEGIN
     [dataMessageBuilder setProfileKey:self.localProfileKey.keyData];
 }
 
-+ (void)addLocalProfileKeyIfNecessary:(TSThread *)thread
-                          recipientId:(NSString *)recipientId
-                   callMessageBuilder:(SNProtoCallMessageBuilder *)callMessageBuilder
-{
-    if ([self shouldMessageHaveLocalProfileKey:thread recipientId:recipientId]) {
-        [callMessageBuilder setProfileKey:self.localProfileKey.keyData];
-    }
-}
-
 @end
 
 NS_ASSUME_NONNULL_END