diff --git a/AxolotlKit/AxolotlKit/Classes/Crypto/AES-CBC.h b/AxolotlKit/AxolotlKit/Classes/Crypto/AES-CBC.h
index 5fc96fd5..87d8de36 100644
--- a/AxolotlKit/AxolotlKit/Classes/Crypto/AES-CBC.h
+++ b/AxolotlKit/AxolotlKit/Classes/Crypto/AES-CBC.h
@@ -8,6 +8,8 @@
 
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface AES_CBC : NSObject
 
 /**
@@ -20,7 +22,7 @@
  *  @return         ciphertext
  */
 
-+(NSData*)encryptCBCMode:(NSData*)data withKey:(NSData*)key withIV:(NSData*)iv;
++ (NSData *)encryptCBCMode:(NSData *)data withKey:(NSData *)key withIV:(NSData *)iv;
 
 /**
  *  Decrypts with AES in CBC mode
@@ -32,6 +34,8 @@
  *  @return         plaintext
  */
 
-+(NSData*)decryptCBCMode:(NSData*)data withKey:(NSData*)key withIV:(NSData*)iv;
++ (NSData *)decryptCBCMode:(NSData *)data withKey:(NSData *)key withIV:(NSData *)iv;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/AxolotlKit/AxolotlKit/Classes/Crypto/AES-CBC.m b/AxolotlKit/AxolotlKit/Classes/Crypto/AES-CBC.m
index 0d24c981..fb63e6c1 100644
--- a/AxolotlKit/AxolotlKit/Classes/Crypto/AES-CBC.m
+++ b/AxolotlKit/AxolotlKit/Classes/Crypto/AES-CBC.m
@@ -6,66 +6,105 @@
 //  Copyright (c) 2014 Frederic Jacobs. All rights reserved.
 //
 
+#import "AES-CBC.h"
 #import "AxolotlExceptions.h"
 #import "MessageKeys.h"
-#import "AES-CBC.h"
-#import <Security/Security.h>
-#import <CommonCrypto/CommonHMAC.h>
 #import <CommonCrypto/CommonCryptor.h>
+#import <CommonCrypto/CommonHMAC.h>
+#import <Security/Security.h>
+
+NS_ASSUME_NONNULL_BEGIN
 
 @implementation AES_CBC
 
 #pragma mark AESCBC Mode
 
-+(NSData*)encryptCBCMode:(NSData*)data withKey:(NSData*)key withIV:(NSData*)iv{
-    NSAssert(data, @"Missing data to encrypt");
-    NSAssert([key length] == 32, @"AES key should be 256 bits");
-    NSAssert([iv  length] == 16, @"AES-CBC IV should be 128 bits");
-    
-    size_t bufferSize           = [data length] + kCCBlockSizeAES128;
-    void* buffer                = malloc(bufferSize);
-    
-    size_t bytesEncrypted    = 0;
-    CCCryptorStatus cryptStatus = CCCrypt(kCCEncrypt, kCCAlgorithmAES128, kCCOptionPKCS7Padding,
-                                          [key bytes], [key length],
-                                          [iv bytes],
-                                          [data bytes], [data length],
-                                          buffer, bufferSize,
-                                          &bytesEncrypted);
-    
-    if (cryptStatus == kCCSuccess){
-        NSData *data = [NSData dataWithBytes:buffer length:bytesEncrypted];
-        free(buffer);
-        
-        return data;
-    } else{
-        free(buffer);
-        @throw [NSException exceptionWithName:CipherException reason:@"We encountered an issue while encrypting." userInfo:nil];
++ (NSData *)encryptCBCMode:(NSData *)data withKey:(NSData *)key withIV:(NSData *)iv
+{
+    if (!data) {
+        @throw [NSException exceptionWithName:CipherException reason:@"Missing data to encrypt." userInfo:nil];
+    }
+    if (data.length >= SIZE_MAX - kCCBlockSizeAES128) {
+        @throw [NSException exceptionWithName:CipherException reason:@"Oversize data." userInfo:nil];
+    }
+    if (key.length != 32) {
+        @throw [NSException exceptionWithName:CipherException reason:@"AES key should be 256 bits." userInfo:nil];
+    }
+    if (iv.length != 16) {
+        @throw [NSException exceptionWithName:CipherException reason:@"AES-CBC IV should be 128 bits." userInfo:nil];
+    }
+
+    size_t bufferSize = [data length] + kCCBlockSizeAES128;
+    NSMutableData *_Nullable bufferData = [NSMutableData dataWithLength:bufferSize];
+    if (!bufferData) {
+        @throw [NSException exceptionWithName:CipherException reason:@"Couldn't allocate buffer." userInfo:nil];
     }
-}
 
-+(NSData*) decryptCBCMode:(NSData*)data withKey:(NSData*)key withIV:(NSData*)iv {
+    size_t bytesEncrypted = 0;
+    CCCryptorStatus cryptStatus = CCCrypt(kCCEncrypt,
+        kCCAlgorithmAES128,
+        kCCOptionPKCS7Padding,
+        [key bytes],
+        [key length],
+        [iv bytes],
+        [data bytes],
+        [data length],
+        bufferData.mutableBytes,
+        bufferSize,
+        &bytesEncrypted);
 
-    size_t bufferSize           = [data length] + kCCBlockSizeAES128;
-    void* buffer                = malloc(bufferSize);
-    
-    size_t bytesDecrypted    = 0;
-    CCCryptorStatus cryptStatus = CCCrypt(kCCDecrypt, kCCAlgorithmAES128, kCCOptionPKCS7Padding,
-                                          [key bytes], [key length],
-                                          [iv bytes],
-                                          [data bytes], [data length],
-                                          buffer, bufferSize,
-                                          &bytesDecrypted);
-    
     if (cryptStatus == kCCSuccess) {
-        NSData *plaintext = [NSData dataWithBytes:buffer length:bytesDecrypted];
-        free(buffer);
+        return [bufferData subdataWithRange:NSMakeRange(0, bytesEncrypted)];
+    } else {
+        @throw [NSException exceptionWithName:CipherException
+                                       reason:@"We encountered an issue while encrypting."
+                                     userInfo:nil];
+    }
+}
+
++ (NSData *)decryptCBCMode:(NSData *)data withKey:(NSData *)key withIV:(NSData *)iv
+{
+    if (!data) {
+        @throw [NSException exceptionWithName:CipherException reason:@"Missing data to decrypt." userInfo:nil];
+    }
+    if (data.length >= SIZE_MAX - kCCBlockSizeAES128) {
+        @throw [NSException exceptionWithName:CipherException reason:@"Oversize data." userInfo:nil];
+    }
+    if (key.length != 32) {
+        @throw [NSException exceptionWithName:CipherException reason:@"AES key should be 256 bits." userInfo:nil];
+    }
+    if (iv.length != 16) {
+        @throw [NSException exceptionWithName:CipherException reason:@"AES-CBC IV should be 128 bits." userInfo:nil];
+    }
+
+    size_t bufferSize = [data length] + kCCBlockSizeAES128;
+    NSMutableData *_Nullable bufferData = [NSMutableData dataWithLength:bufferSize];
+    if (!bufferData) {
+        @throw [NSException exceptionWithName:CipherException reason:@"Couldn't allocate buffer." userInfo:nil];
+    }
 
-        return plaintext;
-    } else{
-        free(buffer);
-        @throw [NSException exceptionWithName:CipherException reason:@"We encountered an issue while decrypting." userInfo:nil];
+    size_t bytesDecrypted = 0;
+    CCCryptorStatus cryptStatus = CCCrypt(kCCDecrypt,
+        kCCAlgorithmAES128,
+        kCCOptionPKCS7Padding,
+        [key bytes],
+        [key length],
+        [iv bytes],
+        [data bytes],
+        [data length],
+        bufferData.mutableBytes,
+        bufferSize,
+        &bytesDecrypted);
+
+    if (cryptStatus == kCCSuccess) {
+        return [bufferData subdataWithRange:NSMakeRange(0, bytesDecrypted)];
+    } else {
+        @throw [NSException exceptionWithName:CipherException
+                                       reason:@"We encountered an issue while decrypting."
+                                     userInfo:nil];
     }
 }
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/AxolotlKit/AxolotlKit/Classes/Ratchet/ChainKey.h b/AxolotlKit/AxolotlKit/Classes/Ratchet/ChainKey.h
index 049b95ba..b3eb199b 100644
--- a/AxolotlKit/AxolotlKit/Classes/Ratchet/ChainKey.h
+++ b/AxolotlKit/AxolotlKit/Classes/Ratchet/ChainKey.h
@@ -10,17 +10,19 @@
 #import "MessageKeys.h"
 #import <Foundation/Foundation.h>
 
-@interface ChainKey : NSObject <NSSecureCoding>
+NS_ASSUME_NONNULL_BEGIN
 
--(instancetype)initWithData:(NSData*)chainKey index:(int)index;
+@interface ChainKey : NSObject <NSSecureCoding>
 
--(instancetype)nextChainKey;
+@property (nonatomic, readonly) int index;
+@property (nonatomic, readonly) NSData *key;
 
--(MessageKeys*)messageKeys;
+- (instancetype)initWithData:(NSData *)chainKey index:(int)index;
 
--(NSData*)baseMaterial:(NSData*)seed;
+- (instancetype)nextChainKey;
 
-@property (readonly) int index;
-@property (readonly) NSData *key;
+- (MessageKeys *)messageKeys;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/AxolotlKit/AxolotlKit/Classes/Ratchet/ChainKey.m b/AxolotlKit/AxolotlKit/Classes/Ratchet/ChainKey.m
index d8b92261..b8c26b47 100644
--- a/AxolotlKit/AxolotlKit/Classes/Ratchet/ChainKey.m
+++ b/AxolotlKit/AxolotlKit/Classes/Ratchet/ChainKey.m
@@ -4,71 +4,102 @@
 
 #import "ChainKey.h"
 #import "TSDerivedSecrets.h"
-#import <Curve25519Kit/Curve25519.h>
 #import <CommonCrypto/CommonCrypto.h>
+#import <Curve25519Kit/Curve25519.h>
+
+NS_ASSUME_NONNULL_BEGIN
 
 @implementation ChainKey
 
-static NSString* const kCoderKey     = @"kCoderKey";
-static NSString* const kCoderIndex   = @"kCoderIndex";
+static NSString *const kCoderKey = @"kCoderKey";
+static NSString *const kCoderIndex = @"kCoderIndex";
 
 #define kTSKeySeedLength 1
 
-static uint8_t kMessageKeySeed[kTSKeySeedLength]    = {01};
-static uint8_t kChainKeySeed[kTSKeySeedLength]      = {02};
+static uint8_t kMessageKeySeed[kTSKeySeedLength] = { 01 };
+static uint8_t kChainKeySeed[kTSKeySeedLength] = { 02 };
 
-+ (BOOL)supportsSecureCoding{
++ (BOOL)supportsSecureCoding
+{
     return YES;
 }
 
-- (id)initWithCoder:(NSCoder *)aDecoder{
-    self   = [super init];
-    
+- (nullable id)initWithCoder:(NSCoder *)aDecoder
+{
+    self = [super init];
+
     if (self) {
-        _key   = [aDecoder decodeObjectOfClass:[NSData class] forKey:kCoderKey];
+        _key = [aDecoder decodeObjectOfClass:[NSData class] forKey:kCoderKey];
         _index = [aDecoder decodeIntForKey:kCoderIndex];
     }
-    
+
     return self;
 }
 
-- (void)encodeWithCoder:(NSCoder *)aCoder{
+- (void)encodeWithCoder:(NSCoder *)aCoder
+{
     [aCoder encodeObject:_key forKey:kCoderKey];
-    [aCoder encodeInt:_index  forKey:kCoderIndex];
+    [aCoder encodeInt:_index forKey:kCoderIndex];
 }
 
--(instancetype)initWithData:(NSData *)chainKey index:(int)index{
+- (instancetype)initWithData:(NSData *)chainKey index:(int)index
+{
     SPKAssert(chainKey.length == ECCKeyLength);
 
     self = [super init];
-    
+
     if (self) {
-        _key   = chainKey;
+        _key = chainKey;
         _index = index;
     }
-    
+
     return self;
 }
 
-- (instancetype) nextChainKey{
-    NSData* nextCK = [self baseMaterial:[NSData dataWithBytes:kChainKeySeed length:kTSKeySeedLength]];
-    
-    return [[ChainKey alloc] initWithData:nextCK index:self.index+1];
+- (instancetype)nextChainKey
+{
+    NSData *nextCK = [self baseMaterial:[NSData dataWithBytes:kChainKeySeed length:kTSKeySeedLength]];
+
+    return [[ChainKey alloc] initWithData:nextCK index:self.index + 1];
 }
 
-- (MessageKeys*)messageKeys{
+- (MessageKeys *)messageKeys
+{
     NSData *inputKeyMaterial = [self baseMaterial:[NSData dataWithBytes:kMessageKeySeed length:kTSKeySeedLength]];
     TSDerivedSecrets *derivedSecrets = [TSDerivedSecrets derivedMessageKeysWithData:inputKeyMaterial];
-    return [[MessageKeys alloc] initWithCipherKey:derivedSecrets.cipherKey macKey:derivedSecrets.macKey iv:derivedSecrets.iv index:self.index];
+    return [[MessageKeys alloc] initWithCipherKey:derivedSecrets.cipherKey
+                                           macKey:derivedSecrets.macKey
+                                               iv:derivedSecrets.iv
+                                            index:self.index];
 }
 
-- (NSData*)baseMaterial:(NSData*)seed{
-    uint8_t result[CC_SHA256_DIGEST_LENGTH] = {0};
+- (NSData *)baseMaterial:(NSData *)seed
+{
+    if (!self.key) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Missing key." userInfo:nil];
+    }
+    if (self.key.length >= SIZE_MAX) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Oversize key." userInfo:nil];
+    }
+    if (!seed) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Missing seed." userInfo:nil];
+    }
+    if (seed.length >= SIZE_MAX) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Oversize seed." userInfo:nil];
+    }
+
+    NSMutableData *_Nullable bufferData = [NSMutableData dataWithLength:CC_SHA256_DIGEST_LENGTH];
+    if (!bufferData) {
+        @throw [NSException exceptionWithName:NSGenericException reason:@"Couldn't allocate buffer." userInfo:nil];
+    }
+
     CCHmacContext ctx;
     CCHmacInit(&ctx, kCCHmacAlgSHA256, [self.key bytes], [self.key length]);
     CCHmacUpdate(&ctx, [seed bytes], [seed length]);
-    CCHmacFinal(&ctx, result);
-    return [NSData dataWithBytes:result length:sizeof(result)];
+    CCHmacFinal(&ctx, bufferData.mutableBytes);
+    return [bufferData copy];
 }
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/AxolotlKit/AxolotlKit/Classes/Utility/SerializationUtilities.h b/AxolotlKit/AxolotlKit/Classes/Utility/SerializationUtilities.h
index 1b5c916c..853adb00 100644
--- a/AxolotlKit/AxolotlKit/Classes/Utility/SerializationUtilities.h
+++ b/AxolotlKit/AxolotlKit/Classes/Utility/SerializationUtilities.h
@@ -4,6 +4,8 @@
 
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 #define MAC_LENGTH 8
 
 @interface SerializationUtilities : NSObject
@@ -14,6 +16,12 @@
 
 + (Byte)intsToByteHigh:(int)highValue low:(int)lowValue;
 
-+ (NSData*)macWithVersion:(int)version identityKey:(NSData*)senderIdentityKey receiverIdentityKey:(NSData*)receiverIdentityKey macKey:(NSData*)macKey serialized:(NSData*)serialized;
++ (NSData *)macWithVersion:(int)version
+               identityKey:(NSData *)senderIdentityKey
+       receiverIdentityKey:(NSData *)receiverIdentityKey
+                    macKey:(NSData *)macKey
+                serialized:(NSData *)serialized;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/AxolotlKit/AxolotlKit/Classes/Utility/SerializationUtilities.m b/AxolotlKit/AxolotlKit/Classes/Utility/SerializationUtilities.m
index 2f0234bb..df560e09 100644
--- a/AxolotlKit/AxolotlKit/Classes/Utility/SerializationUtilities.m
+++ b/AxolotlKit/AxolotlKit/Classes/Utility/SerializationUtilities.m
@@ -5,33 +5,78 @@
 #import "SerializationUtilities.h"
 #import <CommonCrypto/CommonCrypto.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @implementation SerializationUtilities
 
-+ (int)highBitsToIntFromByte:(Byte)byte{
++ (int)highBitsToIntFromByte:(Byte)byte
+{
     return (byte & 0xFF) >> 4;
 }
 
-+ (int)lowBitsToIntFromByte:(Byte)byte{
++ (int)lowBitsToIntFromByte:(Byte)byte
+{
     return (byte & 0xF);
 }
 
-+ (Byte)intsToByteHigh:(int)highValue low:(int)lowValue{
++ (Byte)intsToByteHigh:(int)highValue low:(int)lowValue
+{
     return (Byte)((highValue << 4 | lowValue) & 0xFF);
 }
 
-+ (NSData*)macWithVersion:(int)version identityKey:(NSData*)senderIdentityKey receiverIdentityKey:(NSData*)receiverIdentityKey macKey:(NSData*)macKey serialized:(NSData*)serialized {
-    
-    uint8_t ourHmac[CC_SHA256_DIGEST_LENGTH] = {0};
++ (NSData *)macWithVersion:(int)version
+               identityKey:(NSData *)senderIdentityKey
+       receiverIdentityKey:(NSData *)receiverIdentityKey
+                    macKey:(NSData *)macKey
+                serialized:(NSData *)serialized
+{
+    if (!macKey) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Missing macKey." userInfo:nil];
+    }
+    if (macKey.length >= SIZE_MAX) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Oversize macKey." userInfo:nil];
+    }
+    if (!senderIdentityKey) {
+        @throw
+            [NSException exceptionWithName:NSInvalidArgumentException reason:@"Missing senderIdentityKey" userInfo:nil];
+    }
+    if (senderIdentityKey.length >= SIZE_MAX) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException
+                                       reason:@"Oversize senderIdentityKey"
+                                     userInfo:nil];
+    }
+    if (!receiverIdentityKey) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException
+                                       reason:@"Missing receiverIdentityKey"
+                                     userInfo:nil];
+    }
+    if (receiverIdentityKey.length >= SIZE_MAX) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException
+                                       reason:@"Oversize receiverIdentityKey"
+                                     userInfo:nil];
+    }
+    if (!serialized) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Missing serialized." userInfo:nil];
+    }
+    if (serialized.length >= SIZE_MAX) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Oversize serialized." userInfo:nil];
+    }
+
+    NSMutableData *_Nullable bufferData = [NSMutableData dataWithLength:CC_SHA256_DIGEST_LENGTH];
+    if (!bufferData) {
+        @throw [NSException exceptionWithName:NSGenericException reason:@"Couldn't allocate buffer." userInfo:nil];
+    }
+
     CCHmacContext context;
-    CCHmacInit  (&context, kCCHmacAlgSHA256, [macKey bytes], [macKey length]);
+    CCHmacInit(&context, kCCHmacAlgSHA256, [macKey bytes], [macKey length]);
     CCHmacUpdate(&context, [senderIdentityKey bytes], [senderIdentityKey length]);
     CCHmacUpdate(&context, [receiverIdentityKey bytes], [receiverIdentityKey length]);
     CCHmacUpdate(&context, [serialized bytes], [serialized length]);
-    CCHmacFinal (&context, &ourHmac);
-    
-    return [NSData dataWithBytes:ourHmac length:MAC_LENGTH];
-}
-
+    CCHmacFinal(&context, bufferData.mutableBytes);
 
+    return [bufferData subdataWithRange:NSMakeRange(0, MAC_LENGTH)];
+}
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Curve25519Kit/Classes/Curve25519.h b/Curve25519Kit/Classes/Curve25519.h
index bc422587..4be834e1 100644
--- a/Curve25519Kit/Classes/Curve25519.h
+++ b/Curve25519Kit/Classes/Curve25519.h
@@ -1,26 +1,28 @@
 //
-//  Curve25519.h
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
-//  Created by Frederic Jacobs on 22/07/14.
-//  Copyright (c) 2014 Open Whisper Systems. All rights reserved.
-//
-
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 #define ECCKeyLength 32
 #define ECCSignatureLength 64
 
-@interface ECKeyPair : NSObject <NSSecureCoding> {
-    uint8_t publicKey [ECCKeyLength];
-    uint8_t privateKey[ECCKeyLength];
-}
+@interface ECKeyPair : NSObject <NSSecureCoding>
 
--(NSData*) publicKey;
+@property (atomic, readonly) NSData *publicKey;
+@property (atomic, readonly) NSData *privateKey;
+
+- (instancetype)init NS_UNAVAILABLE;
 
 @end
 
+#pragma mark -
+
 @interface Curve25519 : NSObject
 
+- (instancetype)init NS_UNAVAILABLE;
+
 /**
  *  Generate a 32-byte shared secret from a public key and a key pair using curve25519.
  *
@@ -29,15 +31,15 @@
  *
  *  @return 32-byte shared secret derived from ECDH with curve25519 public key and key pair.
  */
-
-+ (NSData*)generateSharedSecretFromPublicKey:(NSData*)theirPublicKey andKeyPair:(ECKeyPair*)keyPair;
++ (NSData *)generateSharedSecretFromPublicKey:(NSData *)theirPublicKey andKeyPair:(ECKeyPair *)keyPair;
 
 /**
  *  Generate a curve25519 key pair
  *
  *  @return curve25519 key pair.
  */
-
-+ (ECKeyPair*)generateKeyPair;
++ (ECKeyPair *)generateKeyPair;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Curve25519Kit/Classes/Curve25519.m b/Curve25519Kit/Classes/Curve25519.m
index 8e3e697f..03daf8ef 100644
--- a/Curve25519Kit/Classes/Curve25519.m
+++ b/Curve25519Kit/Classes/Curve25519.m
@@ -1,37 +1,38 @@
 //
-//  Curve25519.m
-//  BuildTests
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
-//  Created by Frederic Jacobs on 22/07/14.
-//  Copyright (c) 2014 Open Whisper Systems. All rights reserved.
-//
-
 #import "Curve25519.h"
 #import "Randomness.h"
 
-NSString * const TSECKeyPairPublicKey   = @"TSECKeyPairPublicKey";
-NSString * const TSECKeyPairPrivateKey  = @"TSECKeyPairPrivateKey";
-NSString * const TSECKeyPairPreKeyId    = @"TSECKeyPairPreKeyId";
+NS_ASSUME_NONNULL_BEGIN
+
+NSString *const TSECKeyPairPublicKey = @"TSECKeyPairPublicKey";
+NSString *const TSECKeyPairPrivateKey = @"TSECKeyPairPrivateKey";
+NSString *const TSECKeyPairPreKeyId = @"TSECKeyPairPreKeyId";
 
 extern void curve25519_donna(unsigned char *output, const unsigned char *a, const unsigned char *b);
 
-extern int  curve25519_sign(unsigned char* signature_out, /* 64 bytes */
-                     const unsigned char* curve25519_privkey, /* 32 bytes */
-                     const unsigned char* msg, const unsigned long msg_len,
-                     const unsigned char* random); /* 64 bytes */
+extern int curve25519_sign(unsigned char *signature_out, /* 64 bytes */
+    const unsigned char *curve25519_privkey, /* 32 bytes */
+    const unsigned char *msg,
+    const unsigned long msg_len,
+    const unsigned char *random); /* 64 bytes */
 
 @implementation ECKeyPair
 
-+ (BOOL)supportsSecureCoding{
++ (BOOL)supportsSecureCoding
+{
     return YES;
 }
 
--(void)encodeWithCoder:(NSCoder *)coder {
-    [coder encodeBytes:self->publicKey length:ECCKeyLength forKey:TSECKeyPairPublicKey];
-    [coder encodeBytes:self->privateKey length:ECCKeyLength forKey:TSECKeyPairPrivateKey];
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+    [coder encodeBytes:self.publicKey.bytes length:ECCKeyLength forKey:TSECKeyPairPublicKey];
+    [coder encodeBytes:self.privateKey.bytes length:ECCKeyLength forKey:TSECKeyPairPrivateKey];
 }
 
--(id)initWithCoder:(NSCoder *)coder {
+- (nullable instancetype)initWithCoder:(NSCoder *)coder
+{
     self = [super init];
     if (self) {
         NSUInteger returnedLength = 0;
@@ -41,84 +42,107 @@ -(id)initWithCoder:(NSCoder *)coder {
         if (returnedLength != ECCKeyLength) {
             return nil;
         }
-        memcpy(self->publicKey, returnedBuffer, ECCKeyLength);
-        
+        _publicKey = [NSData dataWithBytes:returnedBuffer length:returnedLength];
+
         // De-serialize private key
         returnedBuffer = [coder decodeBytesForKey:TSECKeyPairPrivateKey returnedLength:&returnedLength];
         if (returnedLength != ECCKeyLength) {
             return nil;
         }
-        memcpy(self->privateKey, returnedBuffer, ECCKeyLength);
+        _privateKey = [NSData dataWithBytes:returnedBuffer length:returnedLength];
     }
     return self;
 }
 
-
-+(ECKeyPair*)generateKeyPair{
-    ECKeyPair* keyPair =[[ECKeyPair alloc] init];
-    
-    // Generate key pair as described in https://code.google.com/p/curve25519-donna/
-    memcpy(keyPair->privateKey, [[Randomness  generateRandomBytes:32] bytes], 32);
-    keyPair->privateKey[0]  &= 248;
-    keyPair->privateKey[31] &= 127;
-    keyPair->privateKey[31] |= 64;
-    
-    static const uint8_t basepoint[ECCKeyLength] = {9};
-    curve25519_donna(keyPair->publicKey, keyPair->privateKey, basepoint);
-    
-    return keyPair;
+- (nullable id)initWithPublicKey:(NSData *)publicKey privateKey:(NSData *)privateKey
+{
+    if (self = [super init]) {
+        if (publicKey.length != ECCKeyLength || privateKey.length != ECCKeyLength) {
+            return nil;
+        }
+        _publicKey = publicKey;
+        _privateKey = privateKey;
+    }
+    return self;
 }
 
--(NSData*) publicKey {
-    return [NSData dataWithBytes:self->publicKey length:32];
++ (ECKeyPair *)generateKeyPair
+{
+    // Generate key pair as described in
+    // https://code.google.com/p/curve25519-donna/
+    NSMutableData *privateKey = [[Randomness generateRandomBytes:ECCKeyLength] mutableCopy];
+    uint8_t *privateKeyBytes = privateKey.mutableBytes;
+    privateKeyBytes[0] &= 248;
+    privateKeyBytes[31] &= 127;
+    privateKeyBytes[31] |= 64;
+
+    static const uint8_t basepoint[ECCKeyLength] = { 9 };
+
+    NSMutableData *publicKey = [NSMutableData new];
+    publicKey.length = ECCKeyLength;
+
+    curve25519_donna(publicKey.mutableBytes, privateKey.mutableBytes, basepoint);
+
+    return [[ECKeyPair alloc] initWithPublicKey:[publicKey copy] privateKey:[privateKey copy]];
 }
 
--(NSData*) sign:(NSData*)data{
-    Byte signatureBuffer[ECCSignatureLength];
+- (NSData *)sign:(NSData *)data
+{
+    NSMutableData *signatureData = [NSMutableData dataWithLength:ECCSignatureLength];
+    if (!signatureData) {
+        @throw
+            [NSException exceptionWithName:NSInvalidArgumentException reason:@"Could not allocate buffer" userInfo:nil];
+    }
+
     NSData *randomBytes = [Randomness generateRandomBytes:64];
-    
-    if(curve25519_sign(signatureBuffer, self->privateKey, [data bytes], [data length], [randomBytes bytes]) == -1 ){
-        @throw [NSException exceptionWithName:NSInternalInconsistencyException reason:@"Message couldn't be signed." userInfo:nil];
+
+    if (curve25519_sign(
+            signatureData.mutableBytes, self.privateKey.bytes, [data bytes], [data length], [randomBytes bytes])
+        == -1) {
+        @throw [NSException exceptionWithName:NSInternalInconsistencyException
+                                       reason:@"Message couldn't be signed."
+                                     userInfo:nil];
     }
-    
-    NSData *signature = [NSData dataWithBytes:signatureBuffer length:ECCSignatureLength];
-    
-    return signature;
+
+    return [signatureData copy];
 }
 
--(NSData*) generateSharedSecretFromPublicKey:(NSData*)theirPublicKey {
-    unsigned char *sharedSecret = NULL;
-    
-    if ([theirPublicKey length] != 32) {
-        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"The supplied public key does not contain 32 bytes" userInfo:nil];
+- (NSData *)generateSharedSecretFromPublicKey:(NSData *)theirPublicKey
+{
+
+    if ([theirPublicKey length] != ECCKeyLength) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException
+                                       reason:@"The supplied public key does not contain 32 bytes"
+                                     userInfo:nil];
     }
-    
-    sharedSecret = malloc(32);
-    
-    if (sharedSecret == NULL) {
-        free(sharedSecret);
-        return nil;
+
+    NSMutableData *sharedSecretData = [NSMutableData dataWithLength:32];
+    if (!sharedSecretData) {
+        @throw
+            [NSException exceptionWithName:NSInvalidArgumentException reason:@"Could not allocate buffer" userInfo:nil];
     }
-    
-    curve25519_donna(sharedSecret,self->privateKey, [theirPublicKey bytes]);
-    
-    NSData *sharedSecretData = [NSData dataWithBytes:sharedSecret length:32];
-    
-    free(sharedSecret);
-    
-    return sharedSecretData;
+
+    curve25519_donna(sharedSecretData.mutableBytes, self.privateKey.bytes, [theirPublicKey bytes]);
+
+    return [sharedSecretData copy];
 }
 
 @end
 
+#pragma mark -
+
 @implementation Curve25519
 
-+(ECKeyPair*)generateKeyPair{
++ (ECKeyPair *)generateKeyPair
+{
     return [ECKeyPair generateKeyPair];
 }
 
-+(NSData*)generateSharedSecretFromPublicKey:(NSData *)theirPublicKey andKeyPair:(ECKeyPair *)keyPair{
++ (NSData *)generateSharedSecretFromPublicKey:(NSData *)theirPublicKey andKeyPair:(ECKeyPair *)keyPair
+{
     return [keyPair generateSharedSecretFromPublicKey:theirPublicKey];
 }
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Curve25519Kit/Classes/Ed25519.h b/Curve25519Kit/Classes/Ed25519.h
index 909b5cc6..966034ce 100644
--- a/Curve25519Kit/Classes/Ed25519.h
+++ b/Curve25519Kit/Classes/Ed25519.h
@@ -1,8 +1,5 @@
 //
-//  Ed25519.h
-//
-//  Created by Frederic Jacobs on 22/07/14.
-//  Copyright (c) 2014 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
@@ -19,8 +16,7 @@
  *
  *  @return The ed25519 64-bytes signature.
  */
-
-+(NSData*)sign:(NSData*)data withKeyPair:(ECKeyPair*)keyPair;
++ (NSData *)sign:(NSData *)data withKeyPair:(ECKeyPair *)keyPair;
 
 /**
  *  Verify ed25519 signature with 32-bytes Curve25519 key pair. Throws an NSInvalid
@@ -31,7 +27,6 @@
  *
  *  @return Returns TRUE if the signature is valid, false if it's not.
  */
-
-+(BOOL)verifySignature:(NSData*)signature publicKey:(NSData*)pubKey data:(NSData*)data;
++ (BOOL)verifySignature:(NSData *)signature publicKey:(NSData *)pubKey data:(NSData *)data;
 
 @end
diff --git a/Curve25519Kit/Classes/Ed25519.m b/Curve25519Kit/Classes/Ed25519.m
index b03d7db8..1a4d5adc 100644
--- a/Curve25519Kit/Classes/Ed25519.m
+++ b/Curve25519Kit/Classes/Ed25519.m
@@ -1,49 +1,60 @@
 //
-//  Ed25519.m
-//  BuildTests
-//
-//  Created by Frederic Jacobs on 22/07/14.
-//  Copyright (c) 2014 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import "Ed25519.h"
 #import "Curve25519.h"
 
+extern int curve25519_verify(const unsigned char *signature, /* 64 bytes */
+    const unsigned char *curve25519_pubkey, /* 32 bytes */
+    const unsigned char *msg,
+    const unsigned long msg_len);
+
 @interface ECKeyPair ()
--(NSData*) sign:(NSData*)data;
+
+- (NSData *)sign:(NSData *)data;
+
 @end
 
-extern int curve25519_verify(const unsigned char* signature, /* 64 bytes */
-                      const unsigned char* curve25519_pubkey, /* 32 bytes */
-                      const unsigned char* msg, const unsigned long msg_len);
+#pragma mark -
 
 @implementation Ed25519
 
-+(NSData*)sign:(NSData*)data withKeyPair:(ECKeyPair*)keyPair{
-    
++ (NSData *)sign:(NSData *)data withKeyPair:(ECKeyPair *)keyPair
+{
+
     if ([data length] < 1) {
-        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Data needs to be at least one byte" userInfo:nil];
+        @throw [NSException exceptionWithName:NSInvalidArgumentException
+                                       reason:@"Data needs to be at least one byte"
+                                     userInfo:nil];
     }
-    
+
     return [keyPair sign:data];
 }
 
-+(BOOL)verifySignature:(NSData*)signature publicKey:(NSData*)pubKey data:(NSData*)data{
-    
++ (BOOL)verifySignature:(NSData *)signature publicKey:(NSData *)pubKey data:(NSData *)data
+{
+
     if ([data length] < 1) {
-        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Data needs to be at least one byte" userInfo:nil];
+        @throw [NSException exceptionWithName:NSInvalidArgumentException
+                                       reason:@"Data needs to be at least one byte"
+                                     userInfo:nil];
+    }
+    if ([data length] >= ULONG_MAX) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Data is too long" userInfo:nil];
     }
-    
+
     if ([pubKey length] != ECCKeyLength) {
-        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Public Key isn't 32 bytes" userInfo:nil];
+        @throw
+            [NSException exceptionWithName:NSInvalidArgumentException reason:@"Public Key isn't 32 bytes" userInfo:nil];
     }
-    
+
     if ([signature length] != ECCSignatureLength) {
-        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Signature isn't 64 bytes" userInfo:nil];
+        @throw
+            [NSException exceptionWithName:NSInvalidArgumentException reason:@"Signature isn't 64 bytes" userInfo:nil];
     }
-    
+
     BOOL success = (curve25519_verify([signature bytes], [pubKey bytes], [data bytes], [data length]) == 0);
-    
     return success;
 }
 
diff --git a/Curve25519Kit/Classes/Randomness.h b/Curve25519Kit/Classes/Randomness.h
index e05828b5..f74b525e 100644
--- a/Curve25519Kit/Classes/Randomness.h
+++ b/Curve25519Kit/Classes/Randomness.h
@@ -1,9 +1,5 @@
 //
-//  Randomness.h
-//  AxolotlKit
-//
-//  Created by Frederic Jacobs on 21/07/14.
-//  Copyright (c) 2014 Frederic Jacobs. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
@@ -18,7 +14,7 @@
  *  @return Random Bytes.
  */
 
-+(NSData*) generateRandomBytes:(int)numberBytes;
++ (NSData *)generateRandomBytes:(int)numberBytes;
 
 
 @end
diff --git a/Curve25519Kit/Classes/Randomness.m b/Curve25519Kit/Classes/Randomness.m
index f8b6c85d..5451a97b 100644
--- a/Curve25519Kit/Classes/Randomness.m
+++ b/Curve25519Kit/Classes/Randomness.m
@@ -1,24 +1,23 @@
 //
-//  Randomness.m
-//  AxolotlKit
-//
-//  Created by Frederic Jacobs on 21/07/14.
-//  Copyright (c) 2014 Frederic Jacobs. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import "Randomness.h"
 
 @implementation Randomness
 
-+(NSData*) generateRandomBytes:(int)numberBytes {
-    /* used to generate db master key, and to generate signaling key, both at install */
-    NSMutableData* randomBytes = [NSMutableData dataWithLength:numberBytes];
++ (NSData *)generateRandomBytes:(int)numberBytes
+{
+    NSMutableData *_Nullable randomBytes = [NSMutableData dataWithLength:numberBytes];
+    if (!randomBytes) {
+        @throw [NSException exceptionWithName:@"random problem" reason:@"problem generating the random " userInfo:nil];
+    }
     int err = 0;
-    err = SecRandomCopyBytes(kSecRandomDefault,numberBytes,[randomBytes mutableBytes]);
-    if(err != noErr && [randomBytes length] != numberBytes) {
+    err = SecRandomCopyBytes(kSecRandomDefault, numberBytes, [randomBytes mutableBytes]);
+    if (err != noErr && randomBytes.length != numberBytes) {
         @throw [NSException exceptionWithName:@"random problem" reason:@"problem generating the random " userInfo:nil];
     }
-    return [NSData dataWithData:randomBytes];
+    return [randomBytes copy];
 }
 
 @end
diff --git a/HKDFKit/HKDFKit/HKDFKit/HKDFKit.h b/HKDFKit/HKDFKit/HKDFKit/HKDFKit.h
index 0ee8a427..27479285 100644
--- a/HKDFKit/HKDFKit/HKDFKit/HKDFKit.h
+++ b/HKDFKit/HKDFKit/HKDFKit/HKDFKit.h
@@ -8,6 +8,8 @@
 
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface HKDFKit : NSObject
 
 /**
@@ -20,8 +22,7 @@
  *
  *  @return The derived key material
  */
-
-+ (NSData*)deriveKey:(NSData*)seed info:(NSData*)info salt:(NSData*)salt outputSize:(int)outputSize;
++ (NSData *)deriveKey:(NSData *)seed info:(nullable NSData *)info salt:(NSData *)salt outputSize:(int)outputSize;
 
 /**
  *  TextSecure v2 HKDF implementation
@@ -33,8 +34,11 @@
  *
  *  @return The derived key material
  */
-
-+ (NSData*)TextSecureV2deriveKey:(NSData*)seed info:(NSData*)info salt:(NSData*)salt outputSize:(int)outputSize;
-
++ (NSData *)TextSecureV2deriveKey:(NSData *)seed
+                             info:(nullable NSData *)info
+                             salt:(NSData *)salt
+                       outputSize:(int)outputSize;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/HKDFKit/HKDFKit/HKDFKit/HKDFKit.m b/HKDFKit/HKDFKit/HKDFKit/HKDFKit.m
index 1eb0290f..8918c5ea 100644
--- a/HKDFKit/HKDFKit/HKDFKit/HKDFKit.m
+++ b/HKDFKit/HKDFKit/HKDFKit/HKDFKit.m
@@ -9,39 +9,82 @@
 #import "HKDFKit.h"
 #import <CommonCrypto/CommonCrypto.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 #define HKDF_HASH_ALG kCCHmacAlgSHA256
 #define HKDF_HASH_LEN CC_SHA256_DIGEST_LENGTH
 
 @implementation HKDFKit
 
-+ (NSData *)deriveKey:(NSData *)seed info:(NSData *)info salt:(NSData *)salt outputSize:(int)outputSize{
++ (NSData *)deriveKey:(NSData *)seed info:(nullable NSData *)info salt:(NSData *)salt outputSize:(int)outputSize
+{
     return [self deriveKey:seed info:info salt:salt outputSize:outputSize offset:1];
 }
 
-+ (NSData*)TextSecureV2deriveKey:(NSData*)seed info:(NSData*)info salt:(NSData*)salt outputSize:(int)outputSize{
++ (NSData *)TextSecureV2deriveKey:(NSData *)seed
+                             info:(nullable NSData *)info
+                             salt:(NSData *)salt
+                       outputSize:(int)outputSize
+{
     return [self deriveKey:seed info:info salt:salt outputSize:outputSize offset:0];
 }
 
 #pragma mark Private Methods
 
-+ (NSData *)deriveKey:(NSData *)seed info:(NSData *)info salt:(NSData *)salt outputSize:(int)outputSize offset:(int)offset{
++ (NSData *)deriveKey:(NSData *)seed
+                 info:(nullable NSData *)info
+                 salt:(NSData *)salt
+           outputSize:(int)outputSize
+               offset:(int)offset
+{
     NSData *prk = [self extract:seed salt:salt];
     NSData *okm = [self expand:prk info:info outputSize:outputSize offset:offset];
     return okm;
 }
 
-+ (NSData*)extract:(NSData*)data salt:(NSData*)salt{
-    char prk[HKDF_HASH_LEN] = {0};
-    CCHmac(HKDF_HASH_ALG, [salt bytes], [salt length], [data bytes], [data length], prk);
-    return [NSData dataWithBytes:prk length:sizeof(prk)];
++ (NSData *)extract:(NSData *)data salt:(NSData *)salt
+{
+    if (!salt) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Missing salt." userInfo:nil];
+    }
+    if (salt.length >= SIZE_MAX) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Oversize salt." userInfo:nil];
+    }
+    if (!data) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Missing data." userInfo:nil];
+    }
+    if (data.length >= SIZE_MAX) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Oversize data." userInfo:nil];
+    }
+
+    NSMutableData *prkData = [[NSMutableData alloc] initWithLength:HKDF_HASH_LEN];
+    CCHmac(HKDF_HASH_ALG, [salt bytes], [salt length], [data bytes], [data length], prkData.mutableBytes);
+    return [prkData copy];
 }
 
-+ (NSData*)expand:(NSData*)data info:(NSData*)info outputSize:(int)outputSize offset:(int)offset{
-    int             iterations = (int)ceil((double)outputSize/(double)HKDF_HASH_LEN);
-    NSData          *mixin = [NSData data];
-    NSMutableData   *results = [NSMutableData data];
++ (NSData *)expand:(NSData *)data info:(nullable NSData *)info outputSize:(int)outputSize offset:(int)offset
+{
+    if (!data) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Missing data." userInfo:nil];
+    }
+    if (data.length >= SIZE_MAX) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Oversize data." userInfo:nil];
+    }
+    if (info != nil && info.length >= SIZE_MAX) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Oversize info." userInfo:nil];
+    }
+    if (outputSize >= NSUIntegerMax) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Oversize outputSize." userInfo:nil];
+    }
+    if (outputSize < 1) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Invalid outputSize." userInfo:nil];
+    }
+
+    int iterations = (int)ceil((double)outputSize / (double)HKDF_HASH_LEN);
+    NSData *mixin = [NSData data];
+    NSMutableData *results = [NSMutableData data];
 
-    for (int i=offset; i<(iterations+offset); i++) {
+    for (int i = offset; i < (iterations + offset); i++) {
         CCHmacContext ctx;
         CCHmacInit(&ctx, HKDF_HASH_ALG, [data bytes], [data length]);
         CCHmacUpdate(&ctx, [mixin bytes], [mixin length]);
@@ -50,14 +93,15 @@ + (NSData*)expand:(NSData*)data info:(NSData*)info outputSize:(int)outputSize of
         }
         unsigned char c = i;
         CCHmacUpdate(&ctx, &c, 1);
-        unsigned char T[HKDF_HASH_LEN];
-        CCHmacFinal(&ctx, T);
-        NSData *stepResult = [NSData dataWithBytes:T length:sizeof(T)];
-        [results appendData:stepResult];
-        mixin = [stepResult copy];
-    }
-    
-    return [[NSData dataWithData:results] subdataWithRange:NSMakeRange(0, outputSize)];
+        NSMutableData *stepResultData = [[NSMutableData alloc] initWithLength:HKDF_HASH_LEN];
+        CCHmacFinal(&ctx, stepResultData.mutableBytes);
+        [results appendData:stepResultData];
+        mixin = [stepResultData copy];
+    }
+
+    return [results subdataWithRange:NSMakeRange(0, outputSize)];
 }
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Manifest.lock b/Manifest.lock
index f3df8ca4..8c92ff18 100644
--- a/Manifest.lock
+++ b/Manifest.lock
@@ -140,9 +140,9 @@ DEPENDENCIES:
   - AFNetworking
   - ATAppUpdater
   - AxolotlKit (from `https://github.com/signalapp/SignalProtocolKit.git`)
-  - Curve25519Kit (from `https://github.com/signalapp/Curve25519Kit`, branch `mkirk/framework-friendly`)
+  - Curve25519Kit (from `https://github.com/signalapp/Curve25519Kit`)
   - GRKOpenSSLFramework (from `https://github.com/signalapp/GRKOpenSSLFramework`)
-  - HKDFKit (from `https://github.com/signalapp/HKDFKit.git`, branch `mkirk/framework-friendly`)
+  - HKDFKit (from `https://github.com/signalapp/HKDFKit.git`)
   - Mantle
   - PureLayout
   - Reachability
@@ -173,12 +173,10 @@ EXTERNAL SOURCES:
   AxolotlKit:
     :git: https://github.com/signalapp/SignalProtocolKit.git
   Curve25519Kit:
-    :branch: mkirk/framework-friendly
     :git: https://github.com/signalapp/Curve25519Kit
   GRKOpenSSLFramework:
     :git: https://github.com/signalapp/GRKOpenSSLFramework
   HKDFKit:
-    :branch: mkirk/framework-friendly
     :git: https://github.com/signalapp/HKDFKit.git
   SignalServiceKit:
     :path: "."
@@ -194,16 +192,16 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   AxolotlKit:
-    :commit: b523c0b82e76295726ded8afec2715328d63213c
+    :commit: 54d5f90558578bb96ebfa9688b3905093b489e31
     :git: https://github.com/signalapp/SignalProtocolKit.git
   Curve25519Kit:
-    :commit: 03a19c80aafc10a3464f0c086b1eb38239c507ac
+    :commit: ced146699622ebd3d282bbfce3d492db4456e9aa
     :git: https://github.com/signalapp/Curve25519Kit
   GRKOpenSSLFramework:
     :commit: b799c27e7927e5304ec1e4ad53c6d33c6fd1cae7
     :git: https://github.com/signalapp/GRKOpenSSLFramework
   HKDFKit:
-    :commit: d2e2e50990e88537d6c4e38cc32a6f6debd83446
+    :commit: 780f980b8ff3c4a24baf19088162f13605c0b272
     :git: https://github.com/signalapp/HKDFKit.git
   SocketRocket:
     :commit: 9f9563a83cd8960503074aa8de72206f83fb7a69
@@ -238,6 +236,6 @@ SPEC CHECKSUMS:
   YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
   YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
 
-PODFILE CHECKSUM: dfec9ac3c4b7b32878c1b2cc2a27eb1e22574cda
+PODFILE CHECKSUM: aa9ff0d7d6d50852127963f4b8aa60d8d1eff8d3
 
 COCOAPODS: 1.5.3
diff --git a/Pods.xcodeproj/project.pbxproj b/Pods.xcodeproj/project.pbxproj
index 3228bc97..7942ffcb 100644
--- a/Pods.xcodeproj/project.pbxproj
+++ b/Pods.xcodeproj/project.pbxproj
@@ -10,44 +10,41 @@
 		0021AF6D9153022BF1141EE6C0E9AEB4 /* YapDatabaseCrossProcessNotificationPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = D9B6803629E569684771A0009AD56A7F /* YapDatabaseCrossProcessNotificationPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		002B9D2A5D9A9D692FB6989871778412 /* Curve25519.h in Headers */ = {isa = PBXBuildFile; fileRef = A4741FA75B1C7CF84F92B44AB3BA97B7 /* Curve25519.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0099C070179ACF227EE6A8E0A9AEE4B9 /* PreKeyBundle.h in Headers */ = {isa = PBXBuildFile; fileRef = F30CC11A0A11EB6C924613B2F0517659 /* PreKeyBundle.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		00AA78074B28877A5670F073BA4994AD /* OWSMessageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = BC00444A687003EDA96AE7F5EE6D820D /* OWSMessageManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		00C186AB01D49C6D688C4640E401A800 /* OWSDisappearingConfigurationUpdateInfoMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 75615607A30B7B3FD6494C042AB4A514 /* OWSDisappearingConfigurationUpdateInfoMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		00EC3C3E04926C5B8E0C028AFF4F4619 /* TimeUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0778027AEC344C4139952068A844B3C /* TimeUtils.swift */; };
 		00F173CD983930F7E069FEB5A2B3BC01 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D863515A54F6D279CD462BE53057FCD8 /* SystemConfiguration.framework */; };
 		010C2BB4246C89193751D7AAFA091203 /* CodedOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AA716E06CB43EF96A258607BDDFF9B5 /* CodedOutputStream.m */; };
 		0185E6AF3DD53B68F8D107294FD6B9F2 /* NSRunLoop+SRWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = D622CC5FAE29F6F7CA588A83C2193E49 /* NSRunLoop+SRWebSocket.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		019BD8983CD576658488E40BB3B21DF1 /* TSIncomingMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD639FACDCFD9A611FC6258C4DFBABA /* TSIncomingMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		01AA33AE3F72AC4697C4DC9B81410431 /* timestamp.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88047B9D89AF5A59D2066766A8F720CA /* timestamp.pb.swift */; };
 		01ABB6D92093A1730A5D3BC97074EB37 /* SimpleExtensionMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2805292FDA5FB3B73AA7A0D7A715ADC /* SimpleExtensionMap.swift */; };
 		01B363860880CB1632054D5DF6D44BC0 /* Utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = A39CEC2549B196B6B88A4955D17B1FB2 /* Utilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		01C1169DD8C1F6C135A614164D8AC815 /* OWSCensorshipConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 8983A9244E7A8958274B465B616A0E6A /* OWSCensorshipConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		01C6AEE49196B09EB2C03EE447E218A2 /* YapDatabaseExtensionTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = C092809F3F5225DD9369F490105FDDCD /* YapDatabaseExtensionTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		01F21D2659EC01A127A6AE6C1E6E03A9 /* OWSAnalyticsEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 6347F3776BC9CDBCBFFE5613A3155CB5 /* OWSAnalyticsEvents.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		02035686858611ADB521FF9C8BA3615D /* TSNetworkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E955941CCE942810C61FD9A2E8FF8E67 /* TSNetworkManager.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		01F51837E5146791E28A316A97F427E6 /* YapDatabaseConnection+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = EE6235D75398964CE39AEA142A33F650 /* YapDatabaseConnection+OWS.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		020CE32278FE17361E9FD04DE5C2F1A4 /* Utilities.m in Sources */ = {isa = PBXBuildFile; fileRef = B8CC44B17725A2C7F41A01E812A8D723 /* Utilities.m */; };
-		026B29663C6D693AFAF87078073B9946 /* OWSAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 3FB3D34FE02E9B8E97721AB15E3D7A92 /* OWSAnalytics.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		02CB4CC3AE1461D95735836A904EC331 /* OWSDisappearingConfigurationUpdateInfoMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 735A97CE7A9FD9E316C3F3165D7324B1 /* OWSDisappearingConfigurationUpdateInfoMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		03130D64B2E2A21FCF3FE15DD4D22FC2 /* OWSMessageServiceParams.m in Sources */ = {isa = PBXBuildFile; fileRef = 81AAD4A523194D142CAFBD3BD5D37A3A /* OWSMessageServiceParams.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		0335FCC12A99D628ACB85BEB6EF3B8B0 /* YapCache.m in Sources */ = {isa = PBXBuildFile; fileRef = E610881826392F834473BFD681593434 /* YapCache.m */; };
 		03716382BCC4E8D4382A858DBC8CD358 /* YYImage-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = DAF0E5520C6A627FE3371FC4FDA83C99 /* YYImage-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0386FD3A42ED9D452496E675DA3AF906 /* OWSUploadOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D274AC50EDA43AB16EB9E0C02B6EA74 /* OWSUploadOperation.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0424C447FC4A04310C7B697F69FA42C1 /* YapDatabaseSearchResultsViewTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = B245E4D7439151C042D72F909375767B /* YapDatabaseSearchResultsViewTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		04301C92C311799D006A12064D38533F /* OWSIncompleteCallsJob.h in Headers */ = {isa = PBXBuildFile; fileRef = E790FFD630BE46B12350C469D1BF9B04 /* OWSIncompleteCallsJob.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		04448ABAB2A0DA00C784C0FDDA7538AE /* AFURLSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7100C48D1727A4AC3EF85D529D006637 /* AFURLSessionManager.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		046474C87F82ECEA178B1649C6266CD4 /* TSInteraction.m in Sources */ = {isa = PBXBuildFile; fileRef = 65CBFC6E442A781940EA11E91DD64945 /* TSInteraction.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		049DFC9F509810C288CBCC0E3C56CFEA /* JSONScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3A0EC177F30640A10FF34827918C943 /* JSONScanner.swift */; };
+		04CA991424E8B4702D0FE61F65431FA7 /* ContactDiscoveryService.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B73ED546D055DC71A46F6A3D55BF70F /* ContactDiscoveryService.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		04D3FEB168CE22AC0DEEB0A01C93299B /* YapDatabaseFullTextSearchTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4105CCB63C74FAE1F2B0495C96B004 /* YapDatabaseFullTextSearchTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		04DEBB99320354AC2F89C8F7F844E4AF /* SignedPreKeyStore.h in Headers */ = {isa = PBXBuildFile; fileRef = F99D0A4CFA03FB3E83FC4C9B8A0CD9BD /* SignedPreKeyStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		04E1971C46FE35F359CD6B4623B4C15E /* join.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BBD31703D33EFF329523B31FE02801F /* join.m */; };
-		04FEC5C1D207DB11A4D7434CF4F7F009 /* OWSBlockingManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 8497BB329BACD8AABA0212A2A134D91E /* OWSBlockingManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		04E5918CA3C472448BD89454EFF5331B /* NSData+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E612E08D8064A4A8D38D832EBCC2B45 /* NSData+OWS.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		055DA9D6D4FA42A7A713577FF99FEB40 /* YapDatabaseConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = AFF9FF71AB35D899172D06C2C4A65F79 /* YapDatabaseConnection.m */; };
 		056633153B9408CCD9CBBD6BA507841B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
+		056D3C14C83DFE5FB4C016DAB42B81C8 /* OWSCallIceUpdateMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = C0BE95DF7A601EE23E349D2E08AEF1D5 /* OWSCallIceUpdateMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		059E037E8086A96C5CE966A8E3D9AD28 /* YapDatabaseViewMappings.m in Sources */ = {isa = PBXBuildFile; fileRef = CC9982F7D6DAD248A600BDE0A3A90226 /* YapDatabaseViewMappings.m */; };
+		05F1478D0F86EA520380CBA0A2364EAF /* OWSMessageUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 0AE6D5721DEBDB68FC360AD29ADB46D4 /* OWSMessageUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		06040808CAB48CE629840C8578431630 /* Pods-Signal-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEB5FF0732F07E5645370670FD94DBD /* Pods-Signal-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		065161936BAA45AE12D1469B77DBBCDA /* OWSVerificationStateSyncMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BA7FCDDC664795F7CB4F2417AA62DC6 /* OWSVerificationStateSyncMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		06597E7F90E448770DF71B55BB292324 /* BobAxolotlParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = C848664D7AACA42948A142E649453E8E /* BobAxolotlParameters.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		069878A59196CB8D98661A3828DABE39 /* OWSDispatch.m in Sources */ = {isa = PBXBuildFile; fileRef = 356D8727507334DCA8E7D6BAC1398D86 /* OWSDispatch.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		06A670BAA7F1444C9E6F23DD9D5CC604 /* SocketRocket-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B091BCB7BB5DF5BCA58794A48177E7C /* SocketRocket-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		06A8D9749052AA98D512153022778BE9 /* TextFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A3DF493D1DDAB23EE48766EAE295327 /* TextFormat.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		06C51B9C60A4B1A66D2FF16578470B1A /* YapDatabaseViewPage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 274F9A885EC24DF12DD299A1EFF8E6BC /* YapDatabaseViewPage.mm */; };
 		07361C532DBF1535EF4D474B6A8BCDBF /* ATAppUpdater-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = B558B3A0DBC1C786689E791EAC8433A2 /* ATAppUpdater-dummy.m */; };
+		075038F783F261D7020B153B6254265F /* OWSError.m in Sources */ = {isa = PBXBuildFile; fileRef = 034C6CF96E3C5DA5214BFBC7C1170B15 /* OWSError.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		077D6073414AEC8F0AAB2403549952FE /* YapProxyObject.m in Sources */ = {isa = PBXBuildFile; fileRef = BE3FAB9F7E307A50F5CB7A02A72CDBE0 /* YapProxyObject.m */; };
 		0789012B9D88AFAE9A8D782E56C504DA /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 23147DF9432EBF9B82E83527229C5D0E /* ioapi.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		07C4E67D79FC373B71DAEF30AB2B692F /* AFNetworking-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = F00AD7D9A4F6D2AA16854A974E51E01C /* AFNetworking-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -58,36 +55,43 @@
 		080EF2C18ED7A4F84EA536E4DF387666 /* SSZipCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 492F5FB034D1C3817404736D8C91D82C /* SSZipCommon.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		083A47A3183616C9A8B978FBE5B99AB3 /* YapDatabaseSearchResultsViewConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D3915BADEB5CAB2DEC0B8DE0D34F98F /* YapDatabaseSearchResultsViewConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0863F6C02ED7FB0D4316B8100C87C9B6 /* DDLog.h in Headers */ = {isa = PBXBuildFile; fileRef = CAA16F790844C06CDA75AA3E813E27EE /* DDLog.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		089C49811990F42564C1CCA43FBAC294 /* OWSBackgroundTask.m in Sources */ = {isa = PBXBuildFile; fileRef = D2DAC06623851F526BCA37E518BF94B6 /* OWSBackgroundTask.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		086CAABCEC22A683D988390BD507842C /* OWSCensorshipConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = B596CEBFF2A9DE1428FFCDE27FD8F8CC /* OWSCensorshipConfiguration.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		08D453E9EB545B64A7FD3502EA613C30 /* UIView+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EB4BB10ECBD477045173C0D78E95B5B /* UIView+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		090EC84338B0B3D382A1D30646FC9EEB /* NSNotificationCenter+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E25B2851CF74C5DB51508E40EBAC96B /* NSNotificationCenter+OWS.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		08EB562CE2B4ABAF1A3080EA8B781AB1 /* Cryptography.m in Sources */ = {isa = PBXBuildFile; fileRef = B5CC430919A3E517A006286B87D65EE7 /* Cryptography.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		09371B167B3C2D7532C76AAB73693CAE /* YapManyToManyCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 5EA9C3141CCDFFA9DDF127A972425E97 /* YapManyToManyCache.m */; };
-		0942E27E24A84E9B9AD21B7DEB6384FE /* AppContext.m in Sources */ = {isa = PBXBuildFile; fileRef = A77FC4E92E7ECB8CC3DAFA4A605E6EEB /* AppContext.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		096CEB407A630935590C808DFBD51CC2 /* SignalServiceKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 692956630524AF3CEBC88509A73E1496 /* SignalServiceKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0991C9348DF144BAE07AB36A32D7E613 /* YDBCKMappingTableInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 15D9D451879C866E5A60676534684EA7 /* YDBCKMappingTableInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		099CE40F07308373223CB5FC669FD0B8 /* YapDatabaseHooksConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D07C384855B59560FC01EB06ACA8E11 /* YapDatabaseHooksConnection.m */; };
 		09ABC8CD48F06ED06C5E2BE7A3088773 /* sqrtm1.h in Headers */ = {isa = PBXBuildFile; fileRef = 36C6AC58D433111910EB4E4179A3AC65 /* sqrtm1.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		09E982D17540A31E5F832E83D92C9923 /* YapActionable.h in Headers */ = {isa = PBXBuildFile; fileRef = 14610AB144400CC12EDCD3D23B1EB541 /* YapActionable.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		0A203C5AE1A6905FD5B55E84672469E5 /* OWSSyncGroupsMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 4FC6240CDA2B7E8CCBF9ECD4AFE09E7D /* OWSSyncGroupsMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		0A304A0B9EB440B2646EEB60BC1A5E01 /* OWSReadReceiptManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A9DBB62FAACF4C06EA366B612644716 /* OWSReadReceiptManager.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		0A3FD6F6DAB985ADFB8A7E87DCA30AF9 /* ioapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 9702E75E1FE1D321D0848C11FF933341 /* ioapi.h */; settings = {ATTRIBUTES = (Project, ); }; };
+		0A74650E6778C52E81AAFAA896F2D7C4 /* PhoneNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = 346781ED13B1A983297FC6C504C8E48D /* PhoneNumber.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0A89F25A0D3A02BA79A99B945D61B05D /* AFSecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = 562EDA1D6445343E5DFE227EFD573059 /* AFSecurityPolicy.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		0A9D747C4DF6DD016839678FC0C04C09 /* SelectiveVisitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 713BF73F8815B483631A07F25AE5B0E3 /* SelectiveVisitor.swift */; };
-		0AF6703021F10965022DA1F80B67BF65 /* OWSPrimaryStorage+PreKeyStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 6D2E29FE87F8717373345CE805D9E478 /* OWSPrimaryStorage+PreKeyStore.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		0A9E0CCFB6381CD9096F5A5B0A938A61 /* OWSCallOfferMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = F1E1A67E521174E69AA91B59B4F5C819 /* OWSCallOfferMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		0AE554035429A337D5DB0CC7D0487791 /* OWSBatchMessageProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 463CEA6154BD03513017B94855150988 /* OWSBatchMessageProcessor.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0AF67B7EC752BE0C5DFD8B4A209A8475 /* AliceAxolotlParameters.m in Sources */ = {isa = PBXBuildFile; fileRef = E35F3F81A3AD3EF692D0B4D32524A25D /* AliceAxolotlParameters.m */; };
-		0AFBEE9797E237353C52D9F83D9D4E04 /* UIImage+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 497B1EF9135C160BCDC8DB53AB5B66B1 /* UIImage+OWS.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		0B060B77B3451F6407D865BDE1BE49BA /* YapDatabaseCloudKit.h in Headers */ = {isa = PBXBuildFile; fileRef = B94C0D15C274CCE8FC52788029FCB237 /* YapDatabaseCloudKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0B0F09F7C0B91C3754E9D943A4F6DFF2 /* SRWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = B9BAE6B24BA26185ABDA7C4DC67144E9 /* SRWebSocket.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
+		0B3DA98D9BAAE2728C8446E0D2E6A12B /* TSDatabaseSecondaryIndexes.h in Headers */ = {isa = PBXBuildFile; fileRef = 220F55C8952F2D743BCCB5BF0147BC98 /* TSDatabaseSecondaryIndexes.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0B6822FCCCBAF323FDBFEBFE2113F4D6 /* SessionStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 854F785D3FC75EDBEA395D12D403E420 /* SessionStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		0BBD3E165A3F57DDA46FE6C785773301 /* OWSBlockedPhoneNumbersMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = BF5EEF1FE3E053C50ECB2A79007C27E7 /* OWSBlockedPhoneNumbersMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		0BC865D27CE41E44FE337540B0EFD7F6 /* OWSDisappearingMessagesConfigurationMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = F29E9178FB17E5BB0F3BCB9E38D6CDE3 /* OWSDisappearingMessagesConfigurationMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		0BF0B107996C422E4EF10A198D8A920F /* SQLCipher.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E2B14AF3FAC9E5E7123949754C2858C /* SQLCipher.framework */; };
-		0C12A2D3102E7698074D04D041169C26 /* OWSWebsocketSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = EF39586E4B7979F5E65EBF0A06F5FD89 /* OWSWebsocketSecurityPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0C34FABE17969022239455253268BBA0 /* Cryptography.m in Sources */ = {isa = PBXBuildFile; fileRef = 44CCF7AB7638EA1E4483DDFAB53DF077 /* Cryptography.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		0C13A68D99179A0466FE18B4AF2F54F3 /* NSString+SSK.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D57CC4C5F182FA4F8BDC853AD3239D1 /* NSString+SSK.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0C4CDE8F2ACAC6087A8A281D14B11831 /* SessionCipher.m in Sources */ = {isa = PBXBuildFile; fileRef = C15D5A194F671B7BCB916CE025FBFE31 /* SessionCipher.m */; };
+		0C6DE14C40E79012E98F7A446CC85A86 /* OWSOutgoingSyncMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 935A6E93A1236B5472592FB4D0F44440 /* OWSOutgoingSyncMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		0C782385CD2CAE370FC03E033998DAFF /* NBMetadataHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 55B7AF2AE331AA62288220A388B9EE06 /* NBMetadataHelper.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0C78D3E9BD6B23E2714297B25EE90253 /* fe_pow22523.c in Sources */ = {isa = PBXBuildFile; fileRef = FD1AC5E703790FE139F696E4BAE6D363 /* fe_pow22523.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		0CBF40F6A53187AF58432E4156F81FC6 /* NBGeneratedPhoneNumberMetaData.h in Headers */ = {isa = PBXBuildFile; fileRef = 480C096C57053946E57643DDDDD49F1D /* NBGeneratedPhoneNumberMetaData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		0CCE6ABF1C57BB7C4522002C8770E49C /* OWSFingerprint.h in Headers */ = {isa = PBXBuildFile; fileRef = 86B1CF688CA9ACAB8D09FCA6B0F38457 /* OWSFingerprint.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0D021B7E3BF6EC1346057278DE5804F2 /* ReceivingChain.h in Headers */ = {isa = PBXBuildFile; fileRef = DE3CFC086C365639797066BF2074F220 /* ReceivingChain.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0D2FDD859EF274C54BC701B2A4F919F0 /* NSUserDefaults+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = C8AFB2C4A0FCBCCD6C5F40A7E568393D /* NSUserDefaults+OWS.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		0D19B56A4B92832FB7A8AF187DAB702B /* OWSOutgoingNullMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = D65AC8D1DC2EAD8A432FB3DEF26E1495 /* OWSOutgoingNullMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		0D2F15A055DA05010CD88E33C4641602 /* OWSOutgoingSyncMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 28DFCE33E3FF5E367C031ACA9F896B0F /* OWSOutgoingSyncMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0D40138D005B4ECA9A7572483D081146 /* NSArray+MTLManipulationAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = A3136C3B4DBF40A26AE9A5DF529F4B6C /* NSArray+MTLManipulationAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0D41852E01885CB88CD09C8F0DA7D5D1 /* OWSCountryMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 273D6EEE91733F02C6213AE3C54D010D /* OWSCountryMetadata.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0D5D8A63979F0ABBC19936DA554E88C7 /* TSOutgoingMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = EFF908A4B1F0A1E839C08BD7A0DEAA93 /* TSOutgoingMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		0D407DD086F5A855FA91F864FE033D8E /* SignalServiceKit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = B69B6FE11B0D9FCB40AC28C630D1B5DC /* SignalServiceKit-dummy.m */; };
 		0E167C912BD46D1289E79FB929F2ADB1 /* PMKQuartzCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F646797C3302D252C9492A41CD62A6 /* PMKQuartzCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0E3E381B69B6B53E78B5B51CE77EB210 /* AxolotlKit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = CFFD83480D73A67C41C9B680C6F1E503 /* AxolotlKit-dummy.m */; };
 		0E49E78BF557D3E6398E4198308F3773 /* AFImageDownloader.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5810F5F2EA06ED7099B27F4734BCF6 /* AFImageDownloader.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -98,53 +102,50 @@
 		0F9B17E57934DAC562B23340C4920D91 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC20F8EF40957CB3AD5A644D75DFC94E /* Accelerate.framework */; };
 		0FD02A3AF6C882202C97C30F50631AEB /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1226ECB940A2EC82DA29114E2924353 /* UIKit.framework */; };
 		0FFC2764F15952BC7B4D11CACF718914 /* YapDatabaseCloudCorePipelineDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 91EFB9349097AA25EC9661AEDDEA334B /* YapDatabaseCloudCorePipelineDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		1002DE556C90EADBD41F795AEC2B8807 /* OWSCallOfferMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = E93FBC7412CDFFCFB0A43673D24A74E6 /* OWSCallOfferMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		1064D74FF2EA25646316362B7AFC6087 /* crypt.c in Sources */ = {isa = PBXBuildFile; fileRef = F16A51F7F2B2DCE0FDB0FF9AEDDC0214 /* crypt.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		10B8FF3155B2E2A25D0A73FD75DA2D7F /* SAMKeychainQuery.m in Sources */ = {isa = PBXBuildFile; fileRef = 601D45136075076C44042FE79077A8E6 /* SAMKeychainQuery.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		1114D3083662CC357F9E10ADF1F4144B /* YapDatabase-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 823A841705FCAF6E4986C3D9F9727BA6 /* YapDatabase-dummy.m */; };
 		115C588B516F182BB10B94D8B473979C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D127F5DF6BA2B6D8CACCEE990DA0D243 /* Security.framework */; };
 		11691AE00C2D23972032CC494928ABE3 /* after.m in Sources */ = {isa = PBXBuildFile; fileRef = C1C585131A28CC29F17B3BF25EDBFC03 /* after.m */; };
-		116E1CAACE7E48946AFC75BEB68110AB /* NSURLSessionDataTask+StatusCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 73DC0262C563D66828DF7EF33BAA922E /* NSURLSessionDataTask+StatusCode.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		11ACB37C65FA68A4989DA7CE60B10C62 /* TSPreKeyManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C99872F33DCEC174C60682096A58D305 /* TSPreKeyManager.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		121D44564E1C6670EDB4B7BFF17B4713 /* OWSChunkedOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 16119562EDE8116A7042455A8EA8EA59 /* OWSChunkedOutputStream.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		12B666C3134820D551042EEB70E2BE0C /* Promise+retainUntilComplete.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4512F9816C9763DC21FA4D90D48C17D9 /* Promise+retainUntilComplete.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		121FEA1C35B07CF4323C6F00B5508701 /* NSUserDefaults+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = F53572DE8534FDE9A2AAD79287420493 /* NSUserDefaults+OWS.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		123DB95EE3A97028F55747D61DE726F7 /* OWSIncomingSentMessageTranscript.h in Headers */ = {isa = PBXBuildFile; fileRef = B9E278B855144B95A2081BB20F1E694F /* OWSIncomingSentMessageTranscript.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		12CCB4BE79A815D42702308BD24E7EC1 /* ge_madd.c in Sources */ = {isa = PBXBuildFile; fileRef = 7AF729CA29E6AA5EA566C5DCD90A3893 /* ge_madd.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		12DD58E3A5D601E09B3A8884F0CA7F1F /* YapDatabaseFullTextSearchConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = A9F551CB87BB55C6633B43E05AF47924 /* YapDatabaseFullTextSearchConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		13459D022DD2952C2DE6D87134765747 /* OWSPrimaryStorage+SignedPreKeyStore.h in Headers */ = {isa = PBXBuildFile; fileRef = BE49237E59FC2346E987BB5106FB75E4 /* OWSPrimaryStorage+SignedPreKeyStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		142D43BCECF102F6503B0A720A4050F1 /* CDSSigningCertificate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9CFCCE99DA01B65CAC0F59FECC94358C /* CDSSigningCertificate.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		1431AF0CF29321792835F9077BFBEAD6 /* OWSPrimaryStorage+Calling.h in Headers */ = {isa = PBXBuildFile; fileRef = F2D5B4D0133313535D6E881A8EA2E927 /* OWSPrimaryStorage+Calling.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		1300DD5C1C64BC4BD479358D46947901 /* OWSContactDiscoveryOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 110E4D37ED1F1B528714027AD69F6B66 /* OWSContactDiscoveryOperation.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		1439D74EA02756969763483654BC3985 /* prng.c in Sources */ = {isa = PBXBuildFile; fileRef = CE3DE6A44A71C2455E93BFDC5A20FFA1 /* prng.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		145777C9272F1EB9A558C1540C5BD77E /* YapDatabaseRelationshipConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 3ED98C45B5438F6EC89FE20115028C02 /* YapDatabaseRelationshipConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		14BDB14767B35D63374BE76B546FB1D3 /* OWSBackgroundTask.h in Headers */ = {isa = PBXBuildFile; fileRef = E78021C341F490C8C508A22AADDB03CF /* OWSBackgroundTask.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		146D78041C4D6012FDE5FBAD935EE362 /* TSAttachmentStream.h in Headers */ = {isa = PBXBuildFile; fileRef = CFA3358BD58C158674758A5230FC3487 /* TSAttachmentStream.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		14F3DD56F45C6E3CB80B1519B2746D70 /* OWSLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 774C8CAFBAFBAD82D94101A57B5777C6 /* OWSLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		14F7E94CCFCCC1C17EFCB6C3100E1092 /* MTLValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E6F64B4948B18ADF9A4EF0A5B72156E /* MTLValueTransformer.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		1504DDF06AC169F92DD6BC49D8817E81 /* SPKAsserts.h in Headers */ = {isa = PBXBuildFile; fileRef = 98D749ED55BC7177567F06CC7ED0CB08 /* SPKAsserts.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		1518EF31850E8A70399ABBC33031B734 /* SendingChain.m in Sources */ = {isa = PBXBuildFile; fileRef = BF7610BEA7CD49263A8711B227FCD4B5 /* SendingChain.m */; };
+		151A38D4DA6D9B6228998F3D3C6B44CE /* Threading.m in Sources */ = {isa = PBXBuildFile; fileRef = 13022CFE2DC6A6C22E5665E80419DFE0 /* Threading.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		151B9A58DEDFA06A61D7153DD1601BBA /* CALayer+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 1329D5C365D29F2CCFB78BA82878EBB7 /* CALayer+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		152EF31DF2FF7FF232BA6EC82D44D949 /* UIKit+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = 7D01CD346165076046028264A80BA950 /* UIKit+AFNetworking.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		15314AFEBED34E35C498C50541EEBAD6 /* NSDictionary+MTLMappingAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = FFACDE4587A56147AE90283B292E5CF7 /* NSDictionary+MTLMappingAdditions.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		163174FC1AD1C410C724E35CC4F9AA4E /* YapDatabaseCloudKitOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = C64B9ECB6026C722B12C9544CA16E1B6 /* YapDatabaseCloudKitOptions.m */; };
 		1691F90EA745AA578DA6B9DC1C1A4A84 /* DDFileLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = FE83BFA08A3C68D505CC22799933A60A /* DDFileLogger.m */; };
 		16AA1DCF3EF47AA791800708BD8E9DC6 /* ge_scalarmult_base.c in Sources */ = {isa = PBXBuildFile; fileRef = EB7703844D730898CD2C9DDD86BB5749 /* ge_scalarmult_base.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		16F513E7D81FD10060449337E095DAA3 /* OWSGroupsOutputStream.h in Headers */ = {isa = PBXBuildFile; fileRef = AF1054BB0D5E9DF6B0DCD555B8A9EAC9 /* OWSGroupsOutputStream.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		17037EBAA1F00A58B8BEA3989EF8F60D /* TSRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 55EC669F573AFAA552EE349C11000ECC /* TSRequest.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		1732FD82A39F8F5B85BD9234FBEAC1C7 /* YapBidirectionalCache.m in Sources */ = {isa = PBXBuildFile; fileRef = B5179DFDF94AE7223AC95639949A57D3 /* YapBidirectionalCache.m */; };
+		177EDD66F53FDF3D5E37883E98DDFFFD /* OWSReadReceiptsForSenderMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB86DF799664A75985F7EFD5C21CB1F /* OWSReadReceiptsForSenderMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		17C124364284C783E9B985F3511A0795 /* YapDatabaseViewChangePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BC90FF3581D9A2FB26E2EF4DC6619AE /* YapDatabaseViewChangePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		17EBFB72CBE6228E07C01579B02B494A /* iOSVersions.h in Headers */ = {isa = PBXBuildFile; fileRef = 326CFF270B63021CF220CE534ABA46A6 /* iOSVersions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		17CBED36E33E7BC333A1CBBC85EAD76D /* TSAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = 96A346553B74C1AEC888318DE5E225CD /* TSAttachment.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		17D99CF3A6B24D01A8C0C55071D23E1E /* OWSLinkedDeviceReadReceipt.m in Sources */ = {isa = PBXBuildFile; fileRef = BE94B6096122158DB37998FAC9A3DADD /* OWSLinkedDeviceReadReceipt.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		18091EB978B46D413BC43600F4D626CE /* ConcreteExtensionField.h in Headers */ = {isa = PBXBuildFile; fileRef = EC353F94FD3FCD9F9088F222A9D4A282 /* ConcreteExtensionField.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		180E186408A965D67DF1B3B49F42553B /* race.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1734DB3D0C3A40A9CA1296B7C519642 /* race.swift */; };
-		18551828EE3DD38F3E4155B8AF1083A7 /* MIMETypeUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = E0D423E15BF7026DEB0566965610B3B8 /* MIMETypeUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		185EAB76A6E10794E2C5CE3BD7BEDC55 /* yap_vfs_shim.h in Headers */ = {isa = PBXBuildFile; fileRef = E1992874F5D31DF6CE70FBC561076989 /* yap_vfs_shim.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		18CD34F70124AB7B30485F3962B82E51 /* YapDatabaseConnectionPool.h in Headers */ = {isa = PBXBuildFile; fileRef = E55A4A67EB5552914E2B34C4999D63B9 /* YapDatabaseConnectionPool.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		18CD5F8CC1BA24FF6BF293991C31D9F3 /* OWSMessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = F1A58CB77101BC6642181196DC1718D4 /* OWSMessageReceiver.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		1911F05519F717B9BD3C8C0C844A4985 /* DDTTYLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 29F1FCAD5B2BEBD7B30C5A317FE48FB5 /* DDTTYLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		191C490414F489E31ED737328FA11B7D /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E81481BAA17A1A21C847ACB4C9B6D887 /* CoreFoundation.framework */; };
-		1920A9046C428B9C0E5AF5FC463DD17F /* OWSProvisioningProtos.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D4E79C0C87D89EE12710431F26CA80 /* OWSProvisioningProtos.pb.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		196CBDC0621780B1EC1C22AB49D70DCA /* OWSLinkedDeviceReadReceipt.h in Headers */ = {isa = PBXBuildFile; fileRef = D69F2EA09BDA1752D88D422D45056B33 /* OWSLinkedDeviceReadReceipt.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		196EAFC32F77ACCBF8168F3DDF09FEB5 /* YapDatabaseConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = AEFB4CAD06BB60FD3B68D846D188985E /* YapDatabaseConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		197FD848E91BA7BF730BECF0DA3C4AE6 /* ContactsManagerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = F066CD14BDBA37DB3F1F61F437D52691 /* ContactsManagerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		19AC32F7165020B375BBB66AFAF1177C /* YapDatabasePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D3097D10CE0162880E55C88AD201BCB /* YapDatabasePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		19EC97CD9274CAB5687A6F29D2834D25 /* MutableField.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ADE7EE0735F4A4D5B1BED9026752E3F /* MutableField.m */; };
-		19ED94ADCBFED159A7512C14333ED0EC /* ContactsUpdater.m in Sources */ = {isa = PBXBuildFile; fileRef = D94539D8ED1E8B1199C1C6DD71D04630 /* ContactsUpdater.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		1B1B003C325F1B93A96CEADDCE9C2FBF /* OWSChunkedOutputStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 401172D3CF99F0A1377F7F00B3353537 /* OWSChunkedOutputStream.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		1A386638FA3C4E7EDD29435989695C30 /* OWSAnalyticsEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = CA10129A8A25EA149DA170C7393DB7E1 /* OWSAnalyticsEvents.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		1AED02CFA5962F1FE4F34D8D8F94C52C /* OWSStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = F852818CC06239D0EA84A4295BBBAB01 /* OWSStorage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		1B357C95E21701A527B1EFF60F9C0616 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D863515A54F6D279CD462BE53057FCD8 /* SystemConfiguration.framework */; };
-		1B91FC36107E3A5B56FE70C45F68DF7B /* TSGroupModel.m in Sources */ = {isa = PBXBuildFile; fileRef = C38D26455FB633E8962A251659E27CD6 /* TSGroupModel.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		1BB87E5466CAA15C838676D0AD48AFFF /* JSONDecodingOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61DE4273BA68EC21F2DE84A27ED76538 /* JSONDecodingOptions.swift */; };
 		1BC4B4F4FDCB79DF8AD25F6AD814E83D /* YapDatabaseViewTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = C0408DCEA314B022A342F8DFC8705D9C /* YapDatabaseViewTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		1BD1FF3A9685A41AADEF9EF623EC4A7E /* compare.c in Sources */ = {isa = PBXBuildFile; fileRef = 7F6EA0C521F62065118B390A8D3A11C8 /* compare.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
@@ -155,176 +156,160 @@
 		1C9DDAC0F59BDB8CE13FC7C5A50EB003 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
 		1CD7BD60D0068682379A90ACDB17F5AD /* WireFormat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F6DBCA12803CD35D84217F3DD4CB257 /* WireFormat.swift */; };
 		1CDC83D9B80B85D131B6D975770BBD66 /* FieldTag.swift in Sources */ = {isa = PBXBuildFile; fileRef = A38875B1EF586CDBD6C889CCE33AC8EF /* FieldTag.swift */; };
-		1D11AFB484CC6BB0F012988E2AED3C8A /* OWSProvisioningCipher.m in Sources */ = {isa = PBXBuildFile; fileRef = 6498259A8345D105C40A8D8B45830702 /* OWSProvisioningCipher.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		1D146963EFBD8C9815D6AC21D4BF3C5C /* NSArray+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 1454D71A7773D6D9B63A441A06FC4818 /* NSArray+OWS.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		1D2BF9F39CA3368F6EBA6048C8CAB09B /* WhisperTextProtocol.pb.h in Headers */ = {isa = PBXBuildFile; fileRef = AFB4BA852DF5BDC042BB91EE757B751B /* WhisperTextProtocol.pb.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		1D394538CDC5506BF5DD1BD496A5FC10 /* fileenc.c in Sources */ = {isa = PBXBuildFile; fileRef = CFF1915CF760FD9066AFB093E328B3AD /* fileenc.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		1D3E73E76A63D5066D6F21DF88EF6E94 /* YapDatabaseSecondaryIndexTransaction.m in Sources */ = {isa = PBXBuildFile; fileRef = F1E7D0A498E2DEB26C88AFA31A05BB86 /* YapDatabaseSecondaryIndexTransaction.m */; };
 		1D41A5BDAA1EA851DC9C7BC9AC0DC7B6 /* YapMutationStack.m in Sources */ = {isa = PBXBuildFile; fileRef = BA8127B4D42F47177A65F53048274ED9 /* YapMutationStack.m */; };
+		1D5619CF0C021FECABCE6832DD72F9E9 /* TSSocketManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C8DC041280F2D718B5BCEF334AEBAA54 /* TSSocketManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		1D5E3F94A1CB3E36AA5C1083EE0820C3 /* SRRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 75CCC2C0879DF2A946A73357EEE710C7 /* SRRandom.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		1D69E81C8B6F3F99BE39BDD0F08867C6 /* Descriptor.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = ABF28BFF799CAC77AD24F8881A7D5315 /* Descriptor.pb.m */; };
-		1D89B491D8C86072A641819FACFE2C14 /* OWSRecipientIdentity.h in Headers */ = {isa = PBXBuildFile; fileRef = D1494E5E7E6AA837EB49C24716193819 /* OWSRecipientIdentity.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		1DDA8F55EB48E6C9E361C530D619D20D /* TSThread.m in Sources */ = {isa = PBXBuildFile; fileRef = E66543AA0B4464305389E6FA5304EBA1 /* TSThread.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		1E1F38785908CA0E2E0A32A9B1E8B995 /* CustomJSONCodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B675A4C5D9D79F70EE5347BB170D5A9A /* CustomJSONCodable.swift */; };
+		1E33934DF7D82AA423BE0257CA05D580 /* OWSAddToProfileWhitelistOfferMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 6D7EA1AFCC0D848328F57D5E37E83863 /* OWSAddToProfileWhitelistOfferMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		1E3FB35ECC3D375D6078F9E14A5C4097 /* SRConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CBED5E2D0FCC65F285262CAB15A988D /* SRConstants.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		1E40EAD2EC20DA5B0CEB5B9378666F3C /* MTLTransformerErrorHandling.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B91F60F07EB8718317AABFD23FC2D4B /* MTLTransformerErrorHandling.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		1E41C1B696978FEA19031B77E70A27B7 /* TSInvalidIdentityKeySendingErrorMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 656399B286CBFE0BA7872590D3AA2120 /* TSInvalidIdentityKeySendingErrorMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		1E646F872B0CFDE6E07E05565A3F33A9 /* OWSIncomingSentMessageTranscript.m in Sources */ = {isa = PBXBuildFile; fileRef = 2303CA6990F1E28279E472A356BDA152 /* OWSIncomingSentMessageTranscript.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		1E7A03995C562397B56F688EDE064E78 /* TSSocketManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 761670D100BC70DA0A556FA4ED0C8DAB /* TSSocketManager.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		1EC574E887361C5BB17EF31A7FFCB437 /* TSAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = 7910FDC5329DE47AD5C2115EE6A6EF25 /* TSAttachment.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		1EA51EA19ED7D7C18DDEE083CCC18CEB /* OWSCallHangupMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 970F486137849B5CC94D40DF254C0C82 /* OWSCallHangupMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		1EE02C5574CEC22ED5E69F2B1B6DF56B /* AppVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 0EE57475FFAB9AC9FB8E1F19E2EF016F /* AppVersion.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		1EE066E5828B02B33A9994FC2BD2EB97 /* YapDatabaseFilteredViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 4569DFF1843F987D542EA3E35BB67D67 /* YapDatabaseFilteredViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		1F3D6FF04C31404530E1D62890F30823 /* BinaryDelimited.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A44E7C123F62CD65842DC7231265F5C /* BinaryDelimited.swift */; };
 		1F44B4B96B13500CA5D63A7E1FDDE559 /* fe_isnegative.c in Sources */ = {isa = PBXBuildFile; fileRef = 212FD0CBB73A5BFD230DBD5D285A8859 /* fe_isnegative.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		1F8A2B8315D1605501AC0F9CF8AA312D /* OWSCallAnswerMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 625F22A62AD1F4294CCBD4788D1E590E /* OWSCallAnswerMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		1F8D844868C95D393F24A1DF23FF5007 /* NSArray+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = C8B2EE64D6F657C5B0CF0123690D6831 /* NSArray+OWS.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		1FC2308E815AF187EA7F733779BB98DF /* NSArray+NBAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CEA94C132DD4BA62CBB7116DEBE3DD9 /* NSArray+NBAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		1FDC91B42C65E65DB40F90E62AF94AE2 /* FunctionalUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 254E906D11E7714E9CB9DA8E818B64FB /* FunctionalUtil.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		204A6E48AAAF41D4EE0D91555DDD11B2 /* EXTKeyPathCoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E76DF330A28C0954032A750AB0FDF5F /* EXTKeyPathCoding.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		2075680984C87D38408EEFC60A4E161E /* SendingChain.h in Headers */ = {isa = PBXBuildFile; fileRef = BF1003D0DF35EF668B7D6B3B27396BED /* SendingChain.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		20759D4E6E1F5F63DE03E2BA2324B5A1 /* YapDatabaseCloudKitConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = E330159BD0281F555EAA21E24C455DB4 /* YapDatabaseCloudKitConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		208BFA8025D605CFD09407B9C6D0EF98 /* Pods-SignalMessaging-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 199426B7BDB976072ED924BE64FAAFC6 /* Pods-SignalMessaging-dummy.m */; };
 		2129E08337AAAAE6DC4E23DEFDF01E4E /* UIWebView+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = 9EF39B7320C44E724DE5989C82E8CEE8 /* UIWebView+AFNetworking.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		21529A43D9E1FEC435C0FA3FB317FBE8 /* OWSPrimaryStorage+messageIDs.h in Headers */ = {isa = PBXBuildFile; fileRef = 050C5BD66C5355ADF0D1300C6872B205 /* OWSPrimaryStorage+messageIDs.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		21A72618E4A6BC87EA26FD066550F05B /* TSThread.h in Headers */ = {isa = PBXBuildFile; fileRef = F894D9963098757627DDF5E3E75F8A86 /* TSThread.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		21A7D89258830215D7907E9E433E9753 /* SSZipArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 27AB4003F11B7A2C36CF8499C6C20431 /* SSZipArchive.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		21B1D342EF762C68A6A3BA7122D7E19A /* OWSOutgoingSentMessageTranscript.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6F2CABBFA7D399CADE3773AA7965AF /* OWSOutgoingSentMessageTranscript.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		21BDFF25C842AA8F1E444DD054164D36 /* OutageDetection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 133F7E3CD8898265280F1EB58D25B8D6 /* OutageDetection.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		21C06C28CB58E6E27D87C146DACC6D88 /* TSDatabaseView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C1D179CAEAA44BD8ED56FFEE2BA1DA7 /* TSDatabaseView.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		21BEAEC6A0E20950C6A4C51DA681370B /* TSAttachmentPointer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4741C03ECE1076FF3C74BF73143B5AD5 /* TSAttachmentPointer.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		21DAB0287E60549C9F6B7B65C3BBCB9F /* ioapi_buf.c in Sources */ = {isa = PBXBuildFile; fileRef = 195082D18F109F4C124B392F411200E5 /* ioapi_buf.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		220EE43586F1B5BEDBA9859CADDB3C48 /* YDBCKRecordTableInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = D5A055F35CCEFCE3A2A64B09805A2123 /* YDBCKRecordTableInfo.m */; };
 		222D3E7181691737F7909F22E95ECB61 /* YapDatabaseCloudCore.m in Sources */ = {isa = PBXBuildFile; fileRef = 454FD81AE477658BC27B9AAC3C61F9CB /* YapDatabaseCloudCore.m */; };
+		223776A7E76E155D77E8A62A43B8255E /* OWSAsserts.h in Headers */ = {isa = PBXBuildFile; fileRef = 0669B00F60EECF0F0DB05ED59F927DF8 /* OWSAsserts.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		228520CB4699CDD2510FF9FBB754C1DB /* SRIOConsumerPool.m in Sources */ = {isa = PBXBuildFile; fileRef = 8591E9A012F119DD3B17CA0C6307B7D1 /* SRIOConsumerPool.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		229D382378D503C3213A1730ED645F5C /* ATAppUpdater-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = E5FFB0EF1632D798E786EF17C63C8883 /* ATAppUpdater-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		22A44E77B4BE63BACB52135140EFAFC9 /* YYImageCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 6A4CBE1B5C8DC70C97E4CAD99A87A3F4 /* YYImageCoder.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		22A6D45F30201B6CC5B6E08965090FF0 /* YDBCKChangeQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 035396EBD2ABBC689B41309A98C783E7 /* YDBCKChangeQueue.m */; };
 		22AADE5EADD7C7899F9475FD946751A9 /* YapDatabaseCrossProcessNotification.h in Headers */ = {isa = PBXBuildFile; fileRef = AF7F82B27164AE466C3896E87FA8C4CF /* YapDatabaseCrossProcessNotification.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		22B6000CEF9964185CC7363158ABFD94 /* ContactDiscoveryService.h in Headers */ = {isa = PBXBuildFile; fileRef = EC7760E743DF17A8A5845A57C2B344EE /* ContactDiscoveryService.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2351AA6C9E09C99B396BA7C7422B9A5D /* YapDatabaseSearchQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 89B6A98BA52489FE18234690E98D0A18 /* YapDatabaseSearchQueue.m */; };
 		237D0F491FC3C3AE447378075E01BF09 /* TextFormatScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37955ED1EA44B1F3BCDA56CE36A90A1C /* TextFormatScanner.swift */; };
-		23816C05795EC5476F512E36FE7DB0C1 /* TSPrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = 1991891CE4CE82997AA070F377C6A60A /* TSPrefix.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		2390D4FBE6FA016B7960AF1166887828 /* GTSR2.crt in Resources */ = {isa = PBXBuildFile; fileRef = 36C4BBE27A42C3AD53C4EA5D52EA827C /* GTSR2.crt */; };
-		23D2C99D6147FF3A97656C23939D68DC /* GTSR4.crt in Resources */ = {isa = PBXBuildFile; fileRef = C4984B9072AF2012DED196B7A67C195B /* GTSR4.crt */; };
-		23E1CD659566AB524A6F2BD235172AA5 /* OWSOrphanedDataCleaner.m in Sources */ = {isa = PBXBuildFile; fileRef = FFC2F96F6D7667A25A3D8577437A1C5D /* OWSOrphanedDataCleaner.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		2390D4FBE6FA016B7960AF1166887828 /* GTSR2.crt in Resources */ = {isa = PBXBuildFile; fileRef = C0ECD69E2A2BAA46B1D5417C89310E05 /* GTSR2.crt */; };
+		23D2C99D6147FF3A97656C23939D68DC /* GTSR4.crt in Resources */ = {isa = PBXBuildFile; fileRef = 07C5DD4B2C9FEF3772A5E20E55F3E8C3 /* GTSR4.crt */; };
 		24021BB05BC53DB367513C3F035122B2 /* SSZipArchive-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = F0A86F81A2F2427EE504067CA44612BE /* SSZipArchive-dummy.m */; };
-		24114016E48ED71F7A25EA8E0D9E6BE4 /* TSAccountManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 63BE10587C16F8C2D95BF62FC2D3FAB4 /* TSAccountManager.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		24279A70B1F6E9D9F9F7E6BC18509108 /* PhoneNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D037E019256FF34FD57C8BDB1B5A936 /* PhoneNumber.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		2447DE27E4071A4D2C9E19B4314A59BD /* GTSR1.crt in Resources */ = {isa = PBXBuildFile; fileRef = 01D0CFDB40677718FDAA37DCDE93325E /* GTSR1.crt */; };
-		24686AA512FAA50BD91997898E1E065D /* OWSDisappearingMessagesJob.m in Sources */ = {isa = PBXBuildFile; fileRef = 8136E50AAB1B286EB6C43DDEF17C006C /* OWSDisappearingMessagesJob.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		244136EA4897FAC8D05CD8B31BEC645D /* OWSOutgoingSentMessageTranscript.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E52850FB6B2F6F284145096D525CA36 /* OWSOutgoingSentMessageTranscript.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		2447DE27E4071A4D2C9E19B4314A59BD /* GTSR1.crt in Resources */ = {isa = PBXBuildFile; fileRef = 7C3B30752D5B5C64D30AFD11E30C778B /* GTSR1.crt */; };
 		246CEF1820D14CC3B3FA7BC017326F55 /* aescrypt.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E375D51C109043BDDF9A3E51777E112 /* aescrypt.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		246FD20A86F01CB0006E21CDDF37BF5A /* SRDelegateController.m in Sources */ = {isa = PBXBuildFile; fileRef = 67FCBCEDE96DACC619128891CF3A417D /* SRDelegateController.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		24815CE275FC852A6DF5F238D0E63DCB /* OWSFailedAttachmentDownloadsJob.h in Headers */ = {isa = PBXBuildFile; fileRef = E22B8BEA04345035EAE1048940DB39AB /* OWSFailedAttachmentDownloadsJob.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		24AEBB517C7B30427D2BB185776D0B2F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
 		24B8B5A9C493A8682D4EE063744395EB /* YapWhitelistBlacklist.h in Headers */ = {isa = PBXBuildFile; fileRef = 90AAEB72A610D9114398EE7D89236539 /* YapWhitelistBlacklist.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		24D345D4660C750F04C539441433A7C0 /* ProtocolBuffers-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 9720180424C5795A0504319CD332D53D /* ProtocolBuffers-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		24EB8F522AC273B979132819E3848424 /* YapCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 89031C82B9F656F8BB4B4D3DFE4643DF /* YapCache.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		254CE4529C84DA33F2E3A821F7D98D0D /* YapDatabaseCloudKitTransaction.m in Sources */ = {isa = PBXBuildFile; fileRef = 4118CBBEE000CF35A17E7630CE4BBB08 /* YapDatabaseCloudKitTransaction.m */; };
+		25585B9A4B09BD8A6AA7BA8C7DFE7CEA /* AppVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F62F1643E0C1F4EBF830813DF26835C /* AppVersion.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		257583B293E370318E011DEC3314CEED /* SRPinningSecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = A1E217BE80EAFCBE3D92F16687BD8B01 /* SRPinningSecurityPolicy.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		2580B94B359E6B21B0F4750EFA56C076 /* YapMemoryTable.h in Headers */ = {isa = PBXBuildFile; fileRef = B14F578A939A2C4E5A72D306B54331F9 /* YapMemoryTable.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		25BD6FC86FA8D1ECE2E1EA42C4724849 /* SignalServiceKit.h in Headers */ = {isa = PBXBuildFile; fileRef = E01805482847BDFDBD65E417790CFD23 /* SignalServiceKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		25B0A7DE82DD25CDCA9F04302CE49955 /* OWSCountryMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FD4AD52560AA074075BA847B65353E6 /* OWSCountryMetadata.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		25C84B626148630E0B12351001CDA6A7 /* ExtensionMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 462C7C2FA0C7C114D0E70A68AAD13AA4 /* ExtensionMap.swift */; };
+		26121BFB47698AADC3233170D32E3D09 /* TSNetworkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CE955D7EADCE58F5C564E0DAB6BD40FD /* TSNetworkManager.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		2676C386089D2C839AAC976267DED7CA /* OWSProvisioningProtos.pb.h in Headers */ = {isa = PBXBuildFile; fileRef = CB4648F164AB27CBC5E6109CB4D9C908 /* OWSProvisioningProtos.pb.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		268016A119413A17766D534E3F1C90A9 /* YapActionItemPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = A52E51AC27F33EF1029C9FE49678BB4D /* YapActionItemPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		26E5F412236082F5B4C99FEDECE3804B /* struct.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10D1C8338AD5B9142B67DAE6F6859A9F /* struct.pb.swift */; };
 		27038691D92CEF98020C8A5EF8C3F8C6 /* SessionBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = D6BFE1408382EE5A2D08441A72AE5B4E /* SessionBuilder.m */; };
-		2706AA01AB3F53F6948934070F7BF9AE /* AppReadiness.m in Sources */ = {isa = PBXBuildFile; fileRef = 37977B5CA3E96822F5727D53C13B4C57 /* AppReadiness.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		271560D65F888C1614D84F9EF345E03C /* TSInvalidIdentityKeyReceivingErrorMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = BA39197A244B39F627DEAD8E6032D707 /* TSInvalidIdentityKeyReceivingErrorMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		27197062A98602BC9FA6A4074BA04B33 /* ge_p3_dbl.c in Sources */ = {isa = PBXBuildFile; fileRef = BF1C03FAF3F25B5FF3230A38A72A80FC /* ge_p3_dbl.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		27735D76CABBCC95BC8FF6CE6EBBD1F3 /* TSContactThread.m in Sources */ = {isa = PBXBuildFile; fileRef = 23F85498867F332662D14F6D7C5827EB /* TSContactThread.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		277D68AB9E1202A9B2A8F0FBBB377395 /* NSNotificationCenter+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = 30CC1556309A95CCAE5FE9383F6FF7D0 /* NSNotificationCenter+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		277D6BD6D6B0060F0A71C1B959CC6917 /* OWSSyncGroupsMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 25574B943397B4E28609CB86C4AD2945 /* OWSSyncGroupsMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		27892422774615A6C646FC4DA6CFD006 /* NSLayoutConstraint+PureLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = F77C5090AF4F1C01B5115A471A18DD3A /* NSLayoutConstraint+PureLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		27D5EE3F371A7DB0A0D613FD3F2C5485 /* AnyUnpackError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 314D9C3213EBF05D35415C52000272C1 /* AnyUnpackError.swift */; };
 		27DBDD1E251A4B33B6A3EAD6B622D821 /* Enum.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF22ED99F3C921502F0D40D8DF1DF9CB /* Enum.swift */; };
-		280EB6BFA09F434555B9B554D0FE33D2 /* TSSocketManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DDB9F1CFF6A905DF2817B6040514574F /* TSSocketManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		281C14E843FEA7D454CEBE2BCE0C00C3 /* OWSCallHangupMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = A87D16A250C07731609A188AA7837CAE /* OWSCallHangupMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		2824BB95A5719BB00D3E6DEA1CDA1B58 /* OWSFailedMessagesJob.m in Sources */ = {isa = PBXBuildFile; fileRef = D02D704BD489EE312522B49B3A80658B /* OWSFailedMessagesJob.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		283F106BC1796A67C93FBA2CCB93A40E /* YapDatabaseAutoView.h in Headers */ = {isa = PBXBuildFile; fileRef = A41AB5D2132798395FFB3E0C4872BB0C /* YapDatabaseAutoView.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		286D983E0F41B3763FBD9B0C21E09721 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
 		2891394D2CBEB63C52B01C74AB361365 /* ge_msub.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C4353BD25492E4FFB0D21584FD1AEFA /* ge_msub.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		28BC67889BDEA3B076DDDE227EF3EABD /* YapDatabaseCloudKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 500B469C3B81D6B4CD0E994B3A319D61 /* YapDatabaseCloudKit.m */; };
-		294B41E109AFB6E3A6B0EBA53EEA6FD1 /* OWSDeviceProvisioningService.h in Headers */ = {isa = PBXBuildFile; fileRef = C00943CF0CE912037DC1303592C3F090 /* OWSDeviceProvisioningService.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		29578E8BDD013F33A94D87CF713253CE /* PureLayout-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = B6E84C8E7B1B34E85694371E81A257E3 /* PureLayout-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		29A8DB9534A8C155F899A779C84EA33F /* ObjectivecDescriptor.pb.h in Headers */ = {isa = PBXBuildFile; fileRef = 68CD4742AB9821036736B1A672552D18 /* ObjectivecDescriptor.pb.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		29AE4D63DB4F5CD931E14749C744AEA8 /* PMKAlertController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1EF24D9FA58EEAF2F00E5A9784B8B85 /* PMKAlertController.swift */; };
 		29AFDC5B7F2AAEED21E7B8461E6BF364 /* AxolotlKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 486C3954D0124106ED2D7A4F07A8E6D4 /* AxolotlKit.framework */; };
-		29B155D951C85784540AEF3D87C97764 /* OWSVerificationStateChangeMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3297C3BDB694E5170CB86022B19C91 /* OWSVerificationStateChangeMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		29DE335E774AC7CDA951A29DB3643502 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
 		29E3FEF7D6C3EAAACBFFE3D18100231B /* Field.m in Sources */ = {isa = PBXBuildFile; fileRef = 12BB6E86E48D4BA0A6133762093BD160 /* Field.m */; };
-		2A0370161509136D248B3A8147A39163 /* OWSProvisioningMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 62FF1FA43FCA2616C0E4938C25A19668 /* OWSProvisioningMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		2A066797D8331F7411184BC5FDC5DF42 /* NotificationsProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = E012A326CE29792E70C3E6414B69EF68 /* NotificationsProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		2A3CA3FB297694D5F31D8B72DDC1F8A1 /* WebSocketResources.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E81D71E6383CDC4AD5BF7BC218D2BF8 /* WebSocketResources.pb.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		2A4B11551CD7E79D5B9D53F56F8E2009 /* sc_muladd.c in Sources */ = {isa = PBXBuildFile; fileRef = 99522D10EEBC665977D5719952177FFC /* sc_muladd.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		2A8C71BFE40FB80527B2EB162D2EA9E6 /* SRURLUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 26ECE48ABD23BF0CCDCCDF7A76B171AE /* SRURLUtilities.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		2AD3B608CE0D2F69D8B70DCEA4DF2645 /* YapDatabaseStatement.h in Headers */ = {isa = PBXBuildFile; fileRef = BF26754818B54055495143423F4F2DE4 /* YapDatabaseStatement.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		2B05629964F7E7C0371A0B2B19BFB169 /* CDSQuote.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D90302EB77FE7E507D376650D74EEE9 /* CDSQuote.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2B19CDD86C5677E80F62B8E9DBA03F6E /* crypto_sign.h in Headers */ = {isa = PBXBuildFile; fileRef = 0532B6C6D08BC23657EB47C90BCFD3F0 /* crypto_sign.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		2B1ECFE80127736B8662FEE0405B7E8B /* Chain.h in Headers */ = {isa = PBXBuildFile; fileRef = 200BCCBF5673B88251A228268BAD4BC1 /* Chain.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		2B256342AE7668BC0D7BC4EA0886B55D /* OWSGroupsOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 9CD0833E0959E4EDE391EEAA903F0282 /* OWSGroupsOutputStream.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		2B2D99DA96717D9EF8170FFE6B7A175F /* Bootstrap.h in Headers */ = {isa = PBXBuildFile; fileRef = 0757BA5658BBFE1FD76625B5609821B6 /* Bootstrap.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2B7B2F31A69E74C31605B36F052B26FB /* RootKey.m in Sources */ = {isa = PBXBuildFile; fileRef = CB08194867F9B801952B0629669BF8CA /* RootKey.m */; };
 		2BB33029B74ADC239F27562078FF67B3 /* YapCollectionKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 9F09BF06C57904608B0E4871291857DE /* YapCollectionKey.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		2BB8D9BF9BAB7C015CA3C668DC5E05EB /* SignalServiceKit-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = C847716500ADD439B3934452E92C60BA /* SignalServiceKit-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2BE1D17B1B1D9FF747AE853C207EE1FE /* DDLogMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = BBE7A2757F43CC87644C8DB7A07224A1 /* DDLogMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		2C0FA488608021F39B98B7B7FCB9558A /* ParamParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D7D3EBA67783088039E08A98B5ACF32 /* ParamParser.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		2C269693B470721071DE9C05A85DC894 /* SerializationUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 8564534AB27BDD85BF1A39C6FE95907D /* SerializationUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2C2B071CDEF55EB272CF49C831BA33B7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
+		2C91E6B8A23C9FB7A6A77FBCB6D47FC0 /* OWSDeviceProvisioningCodeService.h in Headers */ = {isa = PBXBuildFile; fileRef = 02E053A2EF6C986454673EEF8C40DA00 /* OWSDeviceProvisioningCodeService.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2CA720F41262360C29829F46F213E244 /* YapDatabaseCrossProcessNotificationConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 9E833154D47A6408787689039B868E05 /* YapDatabaseCrossProcessNotificationConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		2CD282D108675BBE943417F1A4F1218F /* OWSContactDiscoveryOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCAE003CC8BD3EDE7F4F021B1AF4313E /* OWSContactDiscoveryOperation.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		2CE06F2C8889C7E8CBDA62496F146050 /* OWSIncomingSentMessageTranscript.h in Headers */ = {isa = PBXBuildFile; fileRef = 70B23604CBB92E768E9DF3074DBBBBD4 /* OWSIncomingSentMessageTranscript.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2CF5CC8D401854B34655DDC166ACFE50 /* MTLValueTransformer.h in Headers */ = {isa = PBXBuildFile; fileRef = 06F18226492BB73BEE8FB462834FA1F1 /* MTLValueTransformer.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		2D0564BF42DF9049E65831F52681CE60 /* OWSLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 8202F2DDE39977A6FD4A46DF772483E8 /* OWSLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		2D2433F7540C62C90E03551CEB32F975 /* OWSAddToProfileWhitelistOfferMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 28697770DC11938B05080C4DA4A7AA8A /* OWSAddToProfileWhitelistOfferMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2D42FA8F4B6013064A14D7848C1DECDD /* UIButton+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E9D5931B1A4A1889692C3075859504 /* UIButton+AFNetworking.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		2D58503C7E57DED52E844DC3E4799F79 /* fe_sq.c in Sources */ = {isa = PBXBuildFile; fileRef = B48B60F293E2E966215BDE813F0AEACC /* fe_sq.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		2D62E79CE54E7EBDB3C3F405F9502CFC /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D863515A54F6D279CD462BE53057FCD8 /* SystemConfiguration.framework */; };
 		2D62F63C14451DBD51189F392B20DF29 /* d2.h in Headers */ = {isa = PBXBuildFile; fileRef = 891FF444E0DCA26BCCB4F63FD88D9B1F /* d2.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		2D76E164100883DA6CFD267E59819AAE /* DDContextFilterLogFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D23DCE90667B14CBC8A37CE1262DDF3 /* DDContextFilterLogFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2DC33A3FC726DA96481C150ADF1F83B3 /* YapDatabaseViewRangeOptionsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FD55AD4BD2EE4D6219E7EE42578C816 /* YapDatabaseViewRangeOptionsPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		2DEF0950E3FBAEDAA9AA1D6EDB91E371 /* OWSChunkedOutputStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 7D65FEF188CC38C681038CA1F82D0992 /* OWSChunkedOutputStream.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2E279968D7C2F706E7F872E57208E001 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D127F5DF6BA2B6D8CACCEE990DA0D243 /* Security.framework */; };
-		2E8BFA47338D8A58633652C39CA5FDD5 /* OWSDynamicOutgoingMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = FB778C4F4E228CB88E2F034E622B3701 /* OWSDynamicOutgoingMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		2E3BA28A2A942182F2A44CDF055E650B /* Provisioning.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F50577B42C115B0D097EA2B44915659 /* Provisioning.pb.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		2F2B4494E1E6AB57614064E190C56F2B /* dispatch_promise.m in Sources */ = {isa = PBXBuildFile; fileRef = 6A57F8C4E58F2568004AFEC159DFE602 /* dispatch_promise.m */; };
 		2F60D2167FB7B0F75A34DEFAAB3DB3B1 /* YapDatabase.m in Sources */ = {isa = PBXBuildFile; fileRef = E9ECE9434C139E1D5DB72EFE20F2F1DE /* YapDatabase.m */; };
 		2F99BA350935183C819F8ADA213553BE /* UIWebView+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 003619010F142A1C3011D9D5EBF05FBA /* UIWebView+AFNetworking.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		2FB54F217E3EA51ABE76318FE09AC442 /* NSTimer+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 5133EAB0DCEF514E3C478D6EB5F054E2 /* NSTimer+OWS.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		2FD99899DAFA5B60D7DA171BB97D2B56 /* OWSFingerprintBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = A7C17CFEA9DB29F2608A1E58DF19E93E /* OWSFingerprintBuilder.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		300312C0879D0A85E1407CDD82E3FC22 /* StringUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3E95FCA690FD6A1DDA1BC2BFDB68812 /* StringUtils.swift */; };
 		3073F10D7B891F9329CE27991CB260D8 /* MTLJSONAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D7A3EEAC0ACF6C75CDAEBA2B27C2BA7 /* MTLJSONAdapter.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		308DB1EA54567976BEAC32F1FFEAE517 /* Pods-SignalTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 99A9387AF5FB26A99F0F4974A1FF19B4 /* Pods-SignalTests-dummy.m */; };
 		309197B1D180693DCC46D270CFD0DA5E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
 		30A7B6B408FB2F064F4A0379054CBD0B /* Curve25519.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D4C969FFCD139458395C34E24A2E7C5 /* Curve25519.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		30DB037D786A04F40373A90B1AAFD1B6 /* AppReadiness.h in Headers */ = {isa = PBXBuildFile; fileRef = 707712E875C75BE61CF9ACF5AFED28D6 /* AppReadiness.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		30E383DE7FB99561057749EDDF4BC787 /* crypto_uint64.h in Headers */ = {isa = PBXBuildFile; fileRef = B5CDAFB29DB81445BAB96A5B7F018481 /* crypto_uint64.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		30E5468E3BC61EBF62AD72BE8216BCC2 /* hash.c in Sources */ = {isa = PBXBuildFile; fileRef = E7D7B5E71F68485E84E0AEEE9AA54ACA /* hash.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		3132DE9142191F4D42FD4EB340901F88 /* ContactsManagerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 6850373BFA4D42B88CD1977838174B12 /* ContactsManagerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		3166A9044DDE994E275156573732324B /* OWSPrimaryStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5778C30A7602E812BA5237405C742332 /* OWSPrimaryStorage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		314168FBAB3BB836E9A01AF254037066 /* TSSocketManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C92573B019E11BD3AF43675A65C38B8F /* TSSocketManager.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		31745D313018506672E9C5D34CDD248F /* YapDatabaseAtomic.h in Headers */ = {isa = PBXBuildFile; fileRef = 6841E312CA11E496DC636BB61650731C /* YapDatabaseAtomic.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		318BFF057284A2A382491ECA2B78938E /* NSArray+MTLManipulationAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 850F631CAFFC5F6769D1A4AC1A2E76D6 /* NSArray+MTLManipulationAdditions.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		31953FC2D1E71131A4A082A98035B265 /* TSErrorMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = B6C0EC5FE802FA902719989B5E8D3DE1 /* TSErrorMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		31DE557C9E6FC8758DA6F2DAED128BDC /* ge_p2_dbl.h in Headers */ = {isa = PBXBuildFile; fileRef = 1533893D272E8FDBC9FD16578A95BE72 /* ge_p2_dbl.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		31DF61A1C606F4B72233EB92E2F5DC34 /* SRWebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 97D9C27BD399353350D8079CD9E5C9B6 /* SRWebSocket.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		323D09AC6C729CFAD8BBB31D18BA07FE /* WebSocketResources.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4140E0CBA44E20AC58F7158C0851FE /* WebSocketResources.pb.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		32598AD75E5182E0759458D8A400E154 /* ExtensionRegistry.m in Sources */ = {isa = PBXBuildFile; fileRef = 71E80C4FC8E5C05C6020CE0264F16C41 /* ExtensionRegistry.m */; };
 		3265072738E1CD4FA4895DF927900C06 /* YapDatabaseFullTextSearchPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A6A54399A11DA20B442184CD47540F5 /* YapDatabaseFullTextSearchPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		32BB57A63F22FA9018B2C3618FFAF33C /* YapDatabaseCloudKitTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 60D48420CF3826BF30BF3BCAC48FB8D1 /* YapDatabaseCloudKitTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		32D7E175ADC9075CF0679F82026924F3 /* UIImage+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = CF0597A9A4511323E43F39E923756EAA /* UIImage+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		32E09F3152B121363D84A123F7276900 /* YYAnimatedImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = AB59B817CAE3298436113243F344F68D /* YYAnimatedImageView.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		3336AD79936AB06EC12298B7EB0AEEB4 /* TSYapDatabaseObject.m in Sources */ = {isa = PBXBuildFile; fileRef = BC5A9F0F600558C737EE5920E6073297 /* TSYapDatabaseObject.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		33684D237CBBFEF2F58116D6702D3431 /* OWSIncompleteCallsJob.h in Headers */ = {isa = PBXBuildFile; fileRef = 755F4D66318447D2529B9977B94AFA13 /* OWSIncompleteCallsJob.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		336D8D84CDB2FD02D113B6DAC41AB6A2 /* YapDatabaseRTreeIndexTransaction.m in Sources */ = {isa = PBXBuildFile; fileRef = 5ADD2534904C9852FDB55E05541B362F /* YapDatabaseRTreeIndexTransaction.m */; };
 		339ACB3BA12E352D1D435E42B2254E0A /* YapDatabaseLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = 976B6E746DDA331E4BC71BAB490E18B0 /* YapDatabaseLogging.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		341C996B673FCACC3016CB5FD48EDFFF /* NSString+SSK.m in Sources */ = {isa = PBXBuildFile; fileRef = 5861C72E1A3086FC33DA6AE4D33A672D /* NSString+SSK.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		346B076F22194BA586E2735D702C85C5 /* YapDatabaseLogging.m in Sources */ = {isa = PBXBuildFile; fileRef = 65BEF83AECD5D369E29954B62092C671 /* YapDatabaseLogging.m */; };
-		3474265515C7BCCFB6822E0E00B7675C /* OWSFingerprint.h in Headers */ = {isa = PBXBuildFile; fileRef = B747C5B68A7C6451B2CDDA6BB3364302 /* OWSFingerprint.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3474CE59F04818444089937BF50991E2 /* wrap.swift in Sources */ = {isa = PBXBuildFile; fileRef = A65C29BEBF370600E26149286885ABBF /* wrap.swift */; };
 		34915F82E1951123EF0C5DC25EA5D3D4 /* NSDictionary+MTLJSONKeyPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 5E8EED89BF7B250193504011A02ED497 /* NSDictionary+MTLJSONKeyPath.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34C1FDD5DBE01383E3E109C14ED9EEDA /* TextFormatDecodingError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9168B108226AA65B61C24DD10A2080E9 /* TextFormatDecodingError.swift */; };
-		3515649B6FF3594A60DBF972EBB3F129 /* OWSReadReceiptsForLinkedDevicesMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = F95F5A4B60AAD90BCCA06EC786EC1D99 /* OWSReadReceiptsForLinkedDevicesMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		351E34C6FFDE0A3D5D805FA0D875B88F /* YapDatabaseCloudKitOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 889FCC9114107031E89A3D3A75ECBA07 /* YapDatabaseCloudKitOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3556F6F1DD802FA57C1B45BC1F5CD4DB /* NBAsYouTypeFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 806400F1D49935033C289B6526E840F2 /* NBAsYouTypeFormatter.m */; };
 		3588B46FF2652D73D42E778C41DC958A /* Pods-SignalTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = D68CC8622548C1007F7A8F7608364E74 /* Pods-SignalTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		358986952E8391C9799BD5C8FBCEAB53 /* Google_Protobuf_Timestamp+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AD560D653F069444FA0BE7B6DFD90FF /* Google_Protobuf_Timestamp+Extensions.swift */; };
-		358B1EE9EAF7C6B23A2B5C5661459501 /* TSContactThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F58D37D4BDF2486C3BF0B7676855A93 /* TSContactThread.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		35B1B6AAB5B1497FCE1AD4454C5982CA /* YapDatabaseConnectionPool.m in Sources */ = {isa = PBXBuildFile; fileRef = 5856C3C25DBAAB2FCD6D134E8F73B1BE /* YapDatabaseConnectionPool.m */; };
 		35C0291DE8AE5D77FD7493BD25EDA62A /* YapDatabaseCrossProcessNotificationTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 57DA9C913AB65F451FA36EDE7788DAC7 /* YapDatabaseCrossProcessNotificationTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		35CFB4DF712502A0291CAE0194EB1E1D /* YapDatabaseViewPage.h in Headers */ = {isa = PBXBuildFile; fileRef = BFE8EC7EA83A7AD094A9D28A1BD3F9C1 /* YapDatabaseViewPage.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		35EE624363891C268061DB67879186F3 /* OWSProfileKeyMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 2314AFF0182C4B396F6231B2EA5D451D /* OWSProfileKeyMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		35F6F018C07582A16005F13D1A3B9E4A /* RatchetingSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D474123FEA0A80E2984A7271188636B /* RatchetingSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		360B0E7F0B85EE89F28AC5614586E8A8 /* DDASLLogCapture.m in Sources */ = {isa = PBXBuildFile; fileRef = 84B4CF6512D403D4AB501D3231CAB9E9 /* DDASLLogCapture.m */; };
 		367CF1401D61A61AD042501D0317004B /* SRSecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = A18B7D64F33D8EA328696FA3D3FDF182 /* SRSecurityPolicy.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		36F5F9DBB4253F451F810586BCAB566F /* DataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = D6A9E1D862BE5EE8F6C176DD8BD97CDF /* DataSource.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		36E6BE947A53B1737955CF5CF6CB145B /* OWSMediaGalleryFinder.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0BAF72542D6AF52046D854959D02F9 /* OWSMediaGalleryFinder.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		370C21F6421CF6C249292C91FC0F16CC /* NSData+Image.h in Headers */ = {isa = PBXBuildFile; fileRef = 22FD0DBAF9E5385DBDE7E9EA0E9F52FB /* NSData+Image.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		372C4658538A4089BAADB007708B4502 /* YapDatabaseFullTextSearchTransaction.m in Sources */ = {isa = PBXBuildFile; fileRef = D75045E585B5D0CFEADD96EFDDAB1EDD /* YapDatabaseFullTextSearchTransaction.m */; };
+		372F843093CB54CA17BE33622E0D764B /* OWSSignalService.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B4051483AA77EF00D608277AADBA40D /* OWSSignalService.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		37660CA3AC5EB01E0483B64E0D3F3A09 /* AppReadiness.m in Sources */ = {isa = PBXBuildFile; fileRef = BB6557D2C8E0B566296A5B3300F692A3 /* AppReadiness.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		377854BC87F0922D5B33682CD973585C /* OWSMessageDecrypter.m in Sources */ = {isa = PBXBuildFile; fileRef = 707B7FDFD627103E558D86393C73C78C /* OWSMessageDecrypter.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		379CA05E6BF80B77C0A76C0E96A964EC /* YapDatabaseRTreeIndexConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E226C550A18BD6A1CAFD694E1F1410 /* YapDatabaseRTreeIndexConnection.m */; };
-		37C5B1BA4174212D594DAC58C82B3A3B /* SSKProto.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3AEE00FE231E7FAF4EC500F5B271E64 /* SSKProto.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		37E27F2F2D7B885B842A4D4E90DE2E3C /* YapDatabaseRTreeIndexOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = DBC5C038F527BA28BDA1D58AC3C71952 /* YapDatabaseRTreeIndexOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		37E94288F793B04887DD4095CB3528DE /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E5EEC04E0850DF3DE9F802944314107 /* NSData+Base64.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		385E8F7B3F65001787554A5E399267DC /* ContactDiscoveryService.h in Headers */ = {isa = PBXBuildFile; fileRef = D7F8DBF22CB59736275B94144C2DF749 /* ContactDiscoveryService.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		3838ED18EE40C8EA958791DBA4BC8CA1 /* OWSStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = BA87CFE16BA12115EFCC9A6CFE0DED6F /* OWSStorage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		3839794F963D116B00857DD53BE2012B /* OWSAsserts.m in Sources */ = {isa = PBXBuildFile; fileRef = D3B1B1EF05BD38BB43EFBB3DABFF90FD /* OWSAsserts.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		386BCF6C4A4967D987EBAA5137C66997 /* AFSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 7D106D893071FBD3A4DB214A79884C5C /* AFSecurityPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		386F6F176EDA8CBD28F830BDEA839DF7 /* OWSDisappearingMessagesJob.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DC5D34B67FE1683471267C45631E8D2 /* OWSDisappearingMessagesJob.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		388808AB6FC2957126DC96DFD2FB9B16 /* CocoaLumberjack-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF58A3FE59D879F50FBE2AF83A73D06 /* CocoaLumberjack-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		38E6D59D32FF4780D1815F6492C170CB /* AFURLRequestSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BCEBF6C87AD27A9910E9F22C5BBA8EC /* AFURLRequestSerialization.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		391361751FEEA495CD70B0BF027F145F /* SocketRocket-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E1DB5DF168CC030BEF0C2F2CFAE9971 /* SocketRocket-dummy.m */; };
@@ -335,73 +320,81 @@
 		398494D226E06092CC16DDF6F276544A /* Descriptor.pb.h in Headers */ = {isa = PBXBuildFile; fileRef = 826657A7BEDC384FB2541F8C611F89F7 /* Descriptor.pb.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		39A29AE7CC2EE523400284429E9F7CB3 /* WhisperMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 19034C02070B0913AEBC46ED89543439 /* WhisperMessage.m */; };
 		39C09D5045484DC08A72A17AE61790A2 /* AnyPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FDAF6BF8661FE5EDC22CDFD95AA7EB /* AnyPromise.swift */; };
-		39CCB95DE73F1C4B97D5A5D5CA46F9D4 /* OWSBlockedPhoneNumbersMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 89BA43D6F6C0C218BB790C138E8C20EC /* OWSBlockedPhoneNumbersMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		39D86DCC6A12ED27C5D22941E8F45B12 /* OWSOrphanedDataCleaner.h in Headers */ = {isa = PBXBuildFile; fileRef = 474139684597BDDE56CC1172E80506CE /* OWSOrphanedDataCleaner.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3A085913A900159783B57A26D94C6491 /* YapDatabaseRTreeIndexSetup.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F57E26ABA0C6735FEF9BAFB2E3A65D7 /* YapDatabaseRTreeIndexSetup.m */; };
 		3A24E3FF1A84795B524CBCE5A8FE0614 /* DDLog+LOGV.h in Headers */ = {isa = PBXBuildFile; fileRef = C0FF4BBA91D66B7FE2F72F2A9271086F /* DDLog+LOGV.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3A4AA2B0F83CA770E73A244A683A14D3 /* NSArray+PureLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 27766D58272636F321ACBC9EA95CE5FF /* NSArray+PureLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		3A4EF20F59483C58205EAB2C12A1F173 /* ByteParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 128D37053476000A49275D61A30894FE /* ByteParser.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		3A5E8F6EAA0F1A119DA61B6A6D1F79DC /* YYFrameImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 38D3A15857D207F173B7ADD80C292A07 /* YYFrameImage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3A7B47CB7BC765F503A42ABF97BB1F1F /* HKDFKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E5718D39EE88DBA37458533790CA57BA /* HKDFKit.framework */; };
+		3AD3445BB1F0C9A7B6D84E8DF04DC979 /* OWSBackupFragment.m in Sources */ = {isa = PBXBuildFile; fileRef = 428E0B790047699ECA52FC1B8B2D504C /* OWSBackupFragment.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		3AEE48C567DDCEDF0004AE2F559C053A /* YapDatabaseRelationshipOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 189B633DBD8FE338F4C8B7B12BDC7A9D /* YapDatabaseRelationshipOptions.m */; };
-		3B166996AE66865D449476E9BC5EACD1 /* TSThread.h in Headers */ = {isa = PBXBuildFile; fileRef = C4A9992ED6AB42966333730EB2E076E8 /* TSThread.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		3B485CE6D2EBD5DC42D15EDCD390D503 /* YapDatabaseConnection+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = E7D1A1F4812DDE995833A4D744372003 /* YapDatabaseConnection+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3B5129A3203D55E7E8006610ED3E59C5 /* SessionCipher.h in Headers */ = {isa = PBXBuildFile; fileRef = 468D0371D974A5874D1ADDE873D6A1F4 /* SessionCipher.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3B6D5D00D901FE060592510E4591A96D /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E16D34A951EB1B3583440DAD06F8AC6 /* State.swift */; };
+		3BA027A3CE7A3FB7E9EE7B4C9A47B8A1 /* OWSDeviceProvisioningCodeService.m in Sources */ = {isa = PBXBuildFile; fileRef = 64E48DD9B041524A85C8676AF2579397 /* OWSDeviceProvisioningCodeService.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		3C3468E877157A141DA35794A85296CC /* YapDatabaseViewOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BF65EA0E8C29C2933EC16762048A553 /* YapDatabaseViewOptions.m */; };
 		3CB261A04968F83487CB4284807DD041 /* SAMKeychain.h in Headers */ = {isa = PBXBuildFile; fileRef = 148E16987208C25CE78C17C970F5588F /* SAMKeychain.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3CB4AC3FA7EF249F8ED9D87E69FD353F /* YapDatabaseConnectionState.m in Sources */ = {isa = PBXBuildFile; fileRef = C3490717DDC34B2527D43599770913D8 /* YapDatabaseConnectionState.m */; };
 		3CB805510A219B08CDEA438D5A4CB78D /* NBPhoneNumberDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = CF6B4FF7702EC86AA1077FE10A277A96 /* NBPhoneNumberDefines.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		3CBB5BA60B70D94F63BFFBE4F6A1A687 /* SignalService.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FB8EB8BEC8798551CC5172E602A27A3 /* SignalService.pb.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		3D1C0C2353211B31E8F42CC707CD434F /* ChainAndIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = 46AF86DF4285D5E9220FB7763516BB06 /* ChainAndIndex.m */; };
 		3D5EECCE66457D84DB53B8D298EF7B21 /* type.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63A645FF0BCBAE44F57484D315961918 /* type.pb.swift */; };
 		3D69EF14E86EC26BE9C2B067129BB5B5 /* aestab.c in Sources */ = {isa = PBXBuildFile; fileRef = 14758B8ABD6FC4BB75BD87F63F59D140 /* aestab.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		3D97750CB9DA0DEB872D2D058A65208D /* SessionRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = E1FAF037C3C01E892EFDDBD55B016F83 /* SessionRecord.m */; };
-		3DA6E0278F4A21E900FB5C42B88B3383 /* OWSBatchMessageProcessor.m in Sources */ = {isa = PBXBuildFile; fileRef = 18CAD5016000E54B88C26B672CFADFCF /* OWSBatchMessageProcessor.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		3DD99343C3469CE0E0C2DA2BA0BAB2D3 /* OWSOutgoingNullMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = AA66A7D411F6CF3F10DCFFD51EB7BE49 /* OWSOutgoingNullMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		3DFAA7068E6A4B22774ADC601F03F835 /* SignalServiceKit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 18AAEA50A548D1F99A222B5181B3CC5D /* SignalServiceKit-dummy.m */; };
-		3E3A83BC0420C894A935DB56944D0D12 /* OperationFailed.h in Headers */ = {isa = PBXBuildFile; fileRef = 03647357328B0A361BAF3E1ACDD7232E /* OperationFailed.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		3E5E47D3406597B3A2855FCED212F325 /* OWSAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 9F9E2E29CB6BA3D25A211F319AD08B35 /* OWSAnalytics.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		3E891CD3E55A5321FDCC799F64A1F242 /* TSErrorMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = AA2DED23BB0CCDE2DE725F56D0EF2C45 /* TSErrorMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		3DB186F3AE102CD3A64A988E9D0C0378 /* OWSAddToContactsOfferMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A16A57E1907EEB80D30E1259D5A851 /* OWSAddToContactsOfferMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		3EAE6D7D9BCC6231A8FADF679E4C5F4C /* NBPhoneNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = A8ADE3A69B451E7F7C11265AF3B2068A /* NBPhoneNumber.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		3F30B884E824E4353F73A4FF27BDD621 /* OWS2FAManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CB7890D6B1B8D31D1F853CC076468B4C /* OWS2FAManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3F4FBBC7C4289D0AD846A6309AD4ABAA /* Field.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F19F53EE1A2C6D56E32AD111C68E3A7 /* Field.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3F812D39C3A721860A3C1B2ECB6B919B /* CipherMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = A2BC93658F4116CC6035A8B2A4A2F3ED /* CipherMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		3FA291CE41A49FA653872FE9655F30C8 /* Contact.h in Headers */ = {isa = PBXBuildFile; fileRef = A37F0B194D0E86E1BC2B5929244BB76A /* Contact.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		3FB4FBBEBCCF067F1F1E911B59A482B5 /* MIMETypeUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = A1DA21EE699577A70136604E99C5561C /* MIMETypeUtil.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		3FFB0F68FCFBEC35AEA3A98A76B25C34 /* OWSCallOfferMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A31B6E0D741B89D59D34FEA442BD104 /* OWSCallOfferMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		4011B5FC5EC925290B2CECDC116812CE /* OWSContactsOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = D20B78B9C87B63BF0384EFB4A11FAEB0 /* OWSContactsOutputStream.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		4027049917B2DD2FE7CECBFA65E742FD /* GlobalState.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B0EE5F5C56FB1230563FC0349A96C4D /* GlobalState.m */; };
 		405024BAAC1A736C6A058A922A075CD0 /* URLDataPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43BBF08C458FF89CC9DC7D2AE37ACE42 /* URLDataPromise.swift */; };
 		4052BF09BB6905BEEB4D0A9BC681F237 /* join.swift in Sources */ = {isa = PBXBuildFile; fileRef = 932F9191B664561E641CC6FEFD2D2722 /* join.swift */; };
-		408387CAAA0C06D2318083AEB789BA2E /* OWSFailedMessagesJob.h in Headers */ = {isa = PBXBuildFile; fileRef = 78EF4F2362E4AAB604616FC4DB2ABFBF /* OWSFailedMessagesJob.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		405CD7FA90D286B0B8432F6708AFB703 /* OWSPrimaryStorage+SessionStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E60FD9C63C3DD8D13835DAC24A9B4B6 /* OWSPrimaryStorage+SessionStore.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		4097A1A3E5D42D3C36F7AD5B5A557BA9 /* TSInvalidIdentityKeyErrorMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = BDC0B949D09ECD450295DAA9D48F7179 /* TSInvalidIdentityKeyErrorMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		40A5AC9BA4DE4FCDB3D194D00F4F4352 /* FieldTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = B313109C03454A3B429D30EFC76003AA /* FieldTypes.swift */; };
 		40BA735D66576FD356200BA4CF56FF1C /* NSRunLoop+SRWebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 05F549501D9581470E7D6292A06E39C6 /* NSRunLoop+SRWebSocket.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		40D0C8B5C99E57DF94A7A9930822A8AA /* YapDatabaseFullTextSearch.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E86897B421B23F433A48BEB267493A7 /* YapDatabaseFullTextSearch.m */; };
 		40E0135D353EB60384C8B95CD595AF06 /* ge_p3_tobytes.c in Sources */ = {isa = PBXBuildFile; fileRef = 6338A3594430856F61F49A0B090516E7 /* ge_p3_tobytes.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		412FF181B440BD7AF28271E8DFDDC26B /* UIActivityIndicatorView+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = FAB90DA8184CDEEDCD211D17A8CF5425 /* UIActivityIndicatorView+AFNetworking.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		415C0C7B73CD512F58D2E67FB940CCF2 /* YapDatabaseFullTextSearchSnippetOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = E2B82860D34500BBBBE58D720623F979 /* YapDatabaseFullTextSearchSnippetOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		418A9DCBB1D60C217E1F8461AB280675 /* OWSCallHangupMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = FE63F06FDD5F986F599CAC83217CF114 /* OWSCallHangupMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		41CBE9C46D4982BF870AC68438AF5573 /* TSInteraction.h in Headers */ = {isa = PBXBuildFile; fileRef = 56FD0E58C8D3D380E38FE87BF818E9AD /* TSInteraction.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		42E4001D9A63A4408C6935C78355DF2C /* BadArgument.h in Headers */ = {isa = PBXBuildFile; fileRef = CF541899CD99BD9E93346BEEE05B0207 /* BadArgument.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4283A12D4E884F5925A3EB41523A8B35 /* MIMETypeUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C5F696C3848D7A6FDD2E1C22961F701 /* MIMETypeUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		42F990CF5342F065C9652D7DC3068ED3 /* NSArray+PureLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C9EEBE366A61188F34E05DFE069ED7A /* NSArray+PureLayout.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		43365D2DE3449C7E1CCD66023A8BA1B3 /* field_mask.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4617C414FDA7572894FB3847C3DDBA43 /* field_mask.pb.swift */; };
-		436B243AD18FD0B06992BFFE177A48C2 /* SignalIOS.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95D6EB48C19F87617D31BB4D7A903EC1 /* SignalIOS.pb.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		43D8FDEE7C651D12040782F2D48CB8E0 /* BinaryEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16B87BD1B27355C4FC42A482CD606EF6 /* BinaryEncoder.swift */; };
+		4426B1A1681D57C5D161F304AD4BCE16 /* DataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E992D4725D49631CE910EFB9CC5F178 /* DataSource.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		446291A44646A1ADAD1535C360E793E6 /* PhoneNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A32C0BE5E1782FE67C2496B688571C3 /* PhoneNumber.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		4482CBE933D05E861810EC3BAD7E6AED /* TSCall.m in Sources */ = {isa = PBXBuildFile; fileRef = DB2431D19257F23B2DB55E825A85ED64 /* TSCall.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		44BD872643692D3D22C7BEF47380C489 /* OWSSignaliOSProtos.pb.h in Headers */ = {isa = PBXBuildFile; fileRef = 45961EB04D858EF9E9FA00D322CFFFEF /* OWSSignaliOSProtos.pb.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		44D118CE43CC3B9C672838AD48608DDF /* HKDFKit-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 5EBACA78741E11B54F1E4ED758109055 /* HKDFKit-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		44ECBCDD914C58C657E90C93DC8934DB /* OWSError.h in Headers */ = {isa = PBXBuildFile; fileRef = 1BA90CAF907A0DD4E4B6A4723083B9AE /* OWSError.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		44F48C0C28E861C9FAF7426A02ABBEB3 /* YapDatabaseRTreeIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = 388721C6A4240F24E1EC506C03B0EC5F /* YapDatabaseRTreeIndex.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		453F0202533957340A456879C5662F40 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BD368BDDB885B3B1BA842C7F924B53A /* ImageIO.framework */; };
-		4622D6AE6B151BAF43DAA417923D78DF /* OWSEndSessionMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 30E2E7E8D6EFE651F74FE88E9C1019AA /* OWSEndSessionMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		454194B36CAB62209CB708E4BC77AEEC /* YapDatabaseTransaction+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 25C84FBCAED4F3C8AFEE046BCDD82B51 /* YapDatabaseTransaction+OWS.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		45D25FEEDF7D326C76B24B8FDF05581B /* TSVerifyCodeRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 211039AE24332F4F5941D5AC23BA97E3 /* TSVerifyCodeRequest.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4627B0456F10B02E73F7C446576E0D04 /* YapNull.h in Headers */ = {isa = PBXBuildFile; fileRef = 9139A177DE044232E7C891F1E1918B41 /* YapNull.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		46403D4C79109AC3D26914A84ADE09E7 /* OWSSyncGroupsMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 256789598406ADCC06FF53FB980E6264 /* OWSSyncGroupsMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4641A61DDB6FAE271B83CFB978682C99 /* OWSCallHangupMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 479F36C9AE0FA0880B9E5EC24FD19E7E /* OWSCallHangupMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		465882F2E8F5C079C2AB9052224A4813 /* TSNetworkManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 90083AF766FB0F3777FF574CF6170AA8 /* TSNetworkManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4674AFDCC326E8F8E6594115E32B8D59 /* YapDatabaseSecondaryIndexSetup.h in Headers */ = {isa = PBXBuildFile; fileRef = 0058608EE0C9E65E31B64D49E2E98E2D /* YapDatabaseSecondaryIndexSetup.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		46AAADAA8C10A0B79895D95EA52CD06F /* DDLog.m in Sources */ = {isa = PBXBuildFile; fileRef = ECB0D3E2B81029B1AC13FDEA8D36998B /* DDLog.m */; };
-		46F3E4C34FEBB15D68A2AA995BB23743 /* OWSError.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AB4AE89FA16B4E41D43A85F3B41A0E0 /* OWSError.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		46F909CCB87C7888BD7127EEECD959E5 /* Google_Protobuf_Struct+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 115FDB916872EA8E3845AB126F28E469 /* Google_Protobuf_Struct+Extensions.swift */; };
 		47395293B7B0DA38EEE7068743A44A86 /* YapTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF39DF0839A2B44E7F8C0BC17CCFD70 /* YapTouch.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		475241F55A3D3170DE79AE0517E3D132 /* OWSProvisioningProtos.pb.h in Headers */ = {isa = PBXBuildFile; fileRef = 69AA404A4E3440AB1C85B079BAB045CE /* OWSProvisioningProtos.pb.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4790162FF4A87BD791CC78618752EBA7 /* JSONEncodingError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26E26B199815DD1C6CD074D9F622A0E5 /* JSONEncodingError.swift */; };
-		47BA85A57E71B76D3E18FF508A181920 /* OWSSyncContactsMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A159DCD42E4205B519C7EDB6DEDE44F /* OWSSyncContactsMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4796B5413A15192223E413B0503D6757 /* NSObject+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = DD3D525EF6D7FDFE1727C2BF5ED81D65 /* NSObject+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		47BC7A8061DDDA35FAB9FC6C189138BA /* YYImage-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 65043F53D716BDCBDD453C7C073D7887 /* YYImage-dummy.m */; };
-		48004D2D8C744A22702D493B1884EF94 /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.h in Headers */ = {isa = PBXBuildFile; fileRef = 1346FDE91DDA9B5B68E19C684816F4E7 /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		47FB3C3C7FAC4BAE69F483941C467AE1 /* YapDatabaseTransaction+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = 79070E01325F5103A367E1BFA31F45EE /* YapDatabaseTransaction+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4814FBCBA41C46946D1962953C32622D /* OWSProvisioningCipher.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C33A516659A62D5D21FED3187BD834C /* OWSProvisioningCipher.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		48A1E4B759E3A9F6C1ACBE650A63572B /* YapDatabaseRelationshipTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = B45594B4099E67CFEE631CC4E736B146 /* YapDatabaseRelationshipTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		48CFFF8DAFB084226900971231BA8B65 /* YapDatabaseManualView.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A5BE37253F41C97886B9AC80A874A2 /* YapDatabaseManualView.m */; };
+		49009713252395535054FE14CF975385 /* OWSDevicesService.h in Headers */ = {isa = PBXBuildFile; fileRef = CA446E27EF7B254698B5B24595A7381E /* OWSDevicesService.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		492054D772AA54BBCFD6822619FE2391 /* TSGroupThread.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF9C8E73A5EB01307AF2E96B74261A1 /* TSGroupThread.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		494B25078D20DAFE3DE77BEEFBA1FD9C /* SRMutex.h in Headers */ = {isa = PBXBuildFile; fileRef = 02F2FD011700282B195A31E18E33BDDB /* SRMutex.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		495D7D47479227BB2FAE8CED290A5C99 /* ZigZag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A950C8DDF1EFB45632B06A97B7CB20 /* ZigZag.swift */; };
-		496EBB408614C6755891604BB8A8CF32 /* OWSSyncConfigurationMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 0590F2ECDF0D648DF868733D68529126 /* OWSSyncConfigurationMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		497D630F524FF3718413EF57B34280EF /* Version.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35AE3A8CEC25B35E85D4135F7162F459 /* Version.swift */; };
+		49853C65F804E62CBA9AB54523578836 /* OWSQueues.h in Headers */ = {isa = PBXBuildFile; fileRef = E24600DAB2B39B420164E063454366FC /* OWSQueues.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		49E701765DED53F8758B028DB4872814 /* MutableField.h in Headers */ = {isa = PBXBuildFile; fileRef = 73F9FD34E5B95AB4328C275E6A61D1BF /* MutableField.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4A6F018863120259673B8470CBD11B7F /* YapDatabaseConnectionProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 63A2D02BD71F242A99CA9D0CD6F881E5 /* YapDatabaseConnectionProxy.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4A977F67B25F4A44153F2E04D08B0257 /* YapDatabaseViewTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 1D203A269409BAD7A36F10DC7D1DF053 /* YapDatabaseViewTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -409,142 +402,134 @@
 		4AE58BA98B22DA7812A8B8BFCF9FD21B /* WhisperTextProtocol.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B048488257169323DC2FA2A17CB15EA /* WhisperTextProtocol.pb.m */; };
 		4B4CEBBF9A59E1E8C5FE901B8370C7B8 /* CocoaLumberjack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8DDABA5BD0D6CE926785667C6D20380 /* CocoaLumberjack.framework */; };
 		4B4F92F94FC7ADEB7B542CFF2B295014 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D127F5DF6BA2B6D8CACCEE990DA0D243 /* Security.framework */; };
-		4B827E9746D123F3837BF6C6801445D8 /* OWSPrimaryStorage+messageIDs.m in Sources */ = {isa = PBXBuildFile; fileRef = A7A12EDFEAED233351F9FD9867B59406 /* OWSPrimaryStorage+messageIDs.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		4BAA73BD1FAC68527DA346CB4D3CDEBD /* CDSSigningCertificate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B078DCC08E40583ACE23FEE36865E4F /* CDSSigningCertificate.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4BB4C84E091C3301C708ACBAF5F4D9DC /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D863515A54F6D279CD462BE53057FCD8 /* SystemConfiguration.framework */; };
 		4BBCC712538C47791DF687FFB8315937 /* SSZipArchive-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = CFCA1AAAFD4CA9D9E16AFE1530BA8FDF /* SSZipArchive-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4BE6F42646773B4E6005612B2DD55D89 /* YDBCKChangeSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 43AA0E3EBC14B9633FE50ADC7BAF8DB8 /* YDBCKChangeSet.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		4C129FA0413F2948FE9BB0F38BCB1FAF /* NSObject+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 813C6D0BEC1DDEA3B1A5AEFDE59E478F /* NSObject+OWS.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		4C17AC9A41EE34F652A8EBCF10793818 /* NSData+messagePadding.m in Sources */ = {isa = PBXBuildFile; fileRef = 6614862981908D10969B74135DD1D40D /* NSData+messagePadding.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		4C46E4D40D13A4EAD1A402D7FAA5836E /* CocoaLumberjack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8DDABA5BD0D6CE926785667C6D20380 /* CocoaLumberjack.framework */; };
-		4C4902B1635D8CE8935D44A0E7E1357A /* DataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = AC6D9C363A20C0E37DC236C365AE7D03 /* DataSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		4C87CE6D073919DEBDDD9207BAC70014 /* PhoneNumberUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 465843CEA74E01979F5BE46BD49650E7 /* PhoneNumberUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		4CB510D538071C8A8A29E7C7D2DC20BC /* UIImage+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = BDD81A343551770E69146E2D460CD20F /* UIImage+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		4CC287B142C9BCED2A6CA2DC465D5DDB /* OWSDeviceProvisioner.m in Sources */ = {isa = PBXBuildFile; fileRef = B41698C194A322CF24D5E3E5ED4C3A4E /* OWSDeviceProvisioner.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		4CF0E073C04DD2382945EDBE17D44417 /* OWSRequestFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = E3F22CB9803008FADD9639BC97114A51 /* OWSRequestFactory.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4D5914E8B9C60316968857CC2D9CA1AA /* YapDatabaseCloudCoreOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = E0C916E401A3681DAA5CF50E11CAC69F /* YapDatabaseCloudCoreOperation.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4D6D177E4877AB54B0F1AAC63B85F8D3 /* NSNotificationCenter+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4ECF4C71EFDBF40883BC7D2DF5182E7 /* NSNotificationCenter+Promise.swift */; };
-		4D6FB55C2DF28C503B1DEC7018DAFA75 /* OWSMediaGalleryFinder.h in Headers */ = {isa = PBXBuildFile; fileRef = A707D5D3851554FCAC1FCDBFA851AC7C /* OWSMediaGalleryFinder.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4D77196CD5CDAFB31FF088AF30672F51 /* AFNetworkActivityIndicatorManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C9EBB1188825ACD45CD0C842B426D17C /* AFNetworkActivityIndicatorManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		4DFBF5F26814B33E7E4561B07D9E0B3C /* TSGroupModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 558A800007BDBB3F5A2B48C8469F7337 /* TSGroupModel.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4E222280F837494D42927BE510C1F8DB /* SecurityUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 51AF55B7C39EAB3AC22B43681B8609B4 /* SecurityUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4E6323D4B64D56AA4EDB735050F034AA /* ge_p3_0.c in Sources */ = {isa = PBXBuildFile; fileRef = BBC26C84ECC3E9D6EAF385ECBA6A312A /* ge_p3_0.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		4F830A916A78D53ACEDB7177C5418498 /* GTSR3.crt in Resources */ = {isa = PBXBuildFile; fileRef = FDDED161BBA28B05C60D591B00C1CABD /* GTSR3.crt */; };
+		4EB25AA14F21EF9BC46812179ACDD8A1 /* TSPreKeyManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 8596D56936F338EED57C695E71A744C7 /* TSPreKeyManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4F830A916A78D53ACEDB7177C5418498 /* GTSR3.crt in Resources */ = {isa = PBXBuildFile; fileRef = 885F8FAC1A5530851EDB8D8045D36AC4 /* GTSR3.crt */; };
+		4F8401CE28341BD53CEDDDEAD302BC9D /* TSMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = C64C2ED6C40054485F42A621DD591A2E /* TSMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		4F86E5D95D91573EA0EC7C6CA071738B /* Randomness.m in Sources */ = {isa = PBXBuildFile; fileRef = 23F1BF71F00DB0D45047D81516A3B4BF /* Randomness.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		4F93164AA8C4ED6795EE037A716F7306 /* SocketRocket.h in Headers */ = {isa = PBXBuildFile; fileRef = B42BF7102F457935E3CF2AE9AF459FE8 /* SocketRocket.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4FA0C57F3BC398B516F39927B7F49C69 /* YapDatabaseCloudCoreOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FCB0EA616F2C129B331851B24E10771 /* YapDatabaseCloudCoreOptions.m */; };
 		4FBE77A191744FDF314B27237AFEB511 /* GeneratedMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C2EF9C063144CB45DB4AB2AD2C37EEF /* GeneratedMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4FE6425544F6425D698396A1B80BA35A /* ge_msub.c in Sources */ = {isa = PBXBuildFile; fileRef = FF18DC7AA2F59E69A850D457F7BE3E58 /* ge_msub.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		503E77BC010279C2662738E6BD1F17F6 /* TSOutgoingMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = E87D5362E8901814BF4F34E852A60FB7 /* TSOutgoingMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		503E8186201E283675C3979224B6FDDF /* Varint.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC00808E62C639FD60363570CD3A07B3 /* Varint.swift */; };
 		50426CDCFC5CEC73160A41B5811D3198 /* YYFrameImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 30ED92062CAB203AF6FDC7290C232D8A /* YYFrameImage.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
+		50836F2BC2C3861E52A43F50711DD71E /* SignalAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EA2FE71CD3C1908CF22DE3D4B53688A /* SignalAccount.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		51059AD01E0C96F16F20A59215F24A5D /* Google_Protobuf_Duration+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 877B2F2B5B3EE9BDF0C30EE5EB0FDD82 /* Google_Protobuf_Duration+Extensions.swift */; };
 		5120FBEC6DC22ADDA10032CB5F2C8EC7 /* SRConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 619EB934182D0650C6DDD33EC697DBAE /* SRConstants.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		51794D03AEF4F7AED1939A0A9BFC2CB5 /* TSConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = D43BA48BA07AD42F049FF7D3FEC8040C /* TSConstants.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		517D8AD93FC758C152036CC43180288D /* OWS2FAManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F93CAFFEA7531FCF100E403A1951C848 /* OWS2FAManager.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		519C6EAD253B1298DAC70E6911EE5F64 /* fe_neg.c in Sources */ = {isa = PBXBuildFile; fileRef = 3080BEBC6EE9935D0EE27A6E829D93B1 /* fe_neg.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		51A2522EC401E86C6261DBAFC5A931D1 /* SecurityUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = B480A1222618D41343C61A82E0C2825F /* SecurityUtils.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		51BF18AB8C00472E5A884A77853016A4 /* SAMKeychain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F55B712EBCBEEB50E20A4CFA654774F /* SAMKeychain.framework */; };
 		522454A1E8B96C3311FD2A86659DEF8D /* AES-CBC.m in Sources */ = {isa = PBXBuildFile; fileRef = D040788F0CE0434E40998135CFC528B7 /* AES-CBC.m */; };
+		523C0239C042A40A6C0D2623BCA8DC82 /* OWSBackupFragment.h in Headers */ = {isa = PBXBuildFile; fileRef = 5EE8EADAFE2AC26C8AABC875EBCC5FC7 /* OWSBackupFragment.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		525F97BC013AA24CED0DF8349ADC38B2 /* ALView+PureLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = D7BA5399B5DEAF6258756464D1E98E7E /* ALView+PureLayout.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		52952436D1BAD197A63C272E4B44E42F /* when.m in Sources */ = {isa = PBXBuildFile; fileRef = 33A5DF65825C403BF352E5C403775B32 /* when.m */; };
+		5297DB97C30C69F03D7E822546372D1A /* NSTimer+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = 04A99890F54D86C5277C925554089928 /* NSTimer+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		52B75459478BC4BEE170E4B2BD926276 /* NSArray+NBAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 250CBD745089C66C6AB485D0FE5FC077 /* NSArray+NBAdditions.m */; };
+		530286FD6FCA3BE01E5C38F1F3CF87C0 /* OWSPrimaryStorage+PreKeyStore.m in Sources */ = {isa = PBXBuildFile; fileRef = CF65E6F0B6C3E6BB301FB8312A27046C /* OWSPrimaryStorage+PreKeyStore.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		5314A566C3CBA85143B3BC38B5053D56 /* ProtobufMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B5E0E5F8CBB89F342BDC9BAB68A1E7C /* ProtobufMap.swift */; };
 		5330675DD2C2DCCEDA0E29CBE48B7784 /* RootKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 01C35EB7C6AC4C9515CC907D4F748B52 /* RootKey.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		533ED4012E0031A1B8B6990C23342A05 /* YapDatabaseCloudCoreOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = DE011B4194838079C30682F3DCCC9C64 /* YapDatabaseCloudCoreOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		5346E74BF47B9312F3135B85E47FF0C8 /* OWSIncomingMessageFinder.h in Headers */ = {isa = PBXBuildFile; fileRef = D57C9F093B0E1330E17B8AF4012C08F9 /* OWSIncomingMessageFinder.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		53A82399BC35958B6E83B17C826AC96E /* ge_p3_to_p2.c in Sources */ = {isa = PBXBuildFile; fileRef = 81058831C192AE8C683BF75CF95F6C3E /* ge_p3_to_p2.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		53AC4C488F8A8E4EB3B2AA58F15C1EA9 /* OWSLinkedDeviceReadReceipt.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BD06D084BDB6216F368FC5E6891321A /* OWSLinkedDeviceReadReceipt.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		53C11734760AA49C8A2B4B782D2DD524 /* DDASLLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E3A30E37CAE562A5B44D27B36DC2E17 /* DDASLLogger.m */; };
+		53F5F52EA5A2200B6E01724B9C9444B3 /* ProvisioningProto.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5045049F1E808F3792B6EDA18A38117 /* ProvisioningProto.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		5407C4B4A14C39FE75C5AEB305AAD914 /* OWSOutgoingNullMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 34CEC047500668E56EF60397E90122D1 /* OWSOutgoingNullMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		544779524C5D0E12F738589D19533EB4 /* YapActionItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 323468450CA77F780ECA085FEC57D9E9 /* YapActionItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		548A1FBD0804075F36B17946777B9BC5 /* OWSError.m in Sources */ = {isa = PBXBuildFile; fileRef = 2112A472BBE6AAE99A0E4D7333BABD3D /* OWSError.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		54FBB24E4A4D954E877A6670E901681D /* NSData+messagePadding.h in Headers */ = {isa = PBXBuildFile; fileRef = 63ECED1929426DE001DE0F179FCE4207 /* NSData+messagePadding.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5509AA06272C005DB3E4F279A6953EE2 /* YapDatabaseExtensionConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 719814488F704E22D12E470F1F41BF3C /* YapDatabaseExtensionConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		55AA7579D22DB94225467225A6E02C98 /* sign.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BD94A43FBC3E0E71D563A3D3E9374EC /* sign.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		55DAB0CAF43836A51C423B2BD7332F48 /* TSAccountManager.h in Headers */ = {isa = PBXBuildFile; fileRef = B2008E36DEA55E0C3D794B9E8A2C39BF /* TSAccountManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		5616A4DCB0721E8FBB520B559F87FD4D /* WebSocketResources.pb.h in Headers */ = {isa = PBXBuildFile; fileRef = 01E40C234C86974BBEB5036C13C0F74E /* WebSocketResources.pb.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		567C1A9D9898B16AAC098DB108F0F50B /* source_context.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FF1B06D24EB3BDACDDF1072E552F811 /* source_context.pb.swift */; };
 		567F8A19355DF5374EC06679E351C1DF /* YapRowidSet.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5D98967397CEB06BBB1E2E1EA5421F7 /* YapRowidSet.mm */; };
+		56FAFFADA51B0B30C61120569FA16AD6 /* OWSHTTPSecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = F82C03BE3A38809D84332838ADEDF498 /* OWSHTTPSecurityPolicy.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		5721A710E5CAED0DC5BC092ACD7CC1B8 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 856ECA21405E9E5161D8561EF5389252 /* sqlite3.c */; settings = {COMPILER_FLAGS = "-DNDEBUG -DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2 -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_STAT3 -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_LOAD_EXTENSION -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS4_UNICODE61 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLCIPHER_CRYPTO_CC -DHAVE_USLEEP=1 -DSQLITE_MAX_VARIABLE_NUMBER=99999 -fno-objc-arc"; }; };
 		57475F1B2752D011CC5D9ABD39425A57 /* wrappers.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAE44806190815180335069735559778 /* wrappers.pb.swift */; };
 		574DC8A5F9E9470CC4127F915F76A673 /* HKDFKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DA225D8E741072BE8C1E0FEE0F767B3 /* HKDFKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		574E10F990C6FD8312D40A63CB4AD890 /* Reachability.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B8015C4A33AEC149C912C4BA8493B783 /* Reachability.framework */; };
-		57D56EBD54DAE762D6607910E529BE9F /* OWSMessageServiceParams.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B89DD3853AE975BDE86D0DEA6C0EED0 /* OWSMessageServiceParams.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		5814A4D9BC2E1FEAEC0B5768CECF7F02 /* PreKeyBundle+jsonDict.h in Headers */ = {isa = PBXBuildFile; fileRef = 73857E17FE2EEE9E85B1D6E51334F25A /* PreKeyBundle+jsonDict.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		583D340F9483D3B61F5A8659E23020D4 /* SecurityUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5809310D98297861F6E8BE541F165338 /* SecurityUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		583DAB0984898DB7935B58A199B39DC2 /* ProvisioningProto.swift in Sources */ = {isa = PBXBuildFile; fileRef = C891B28F552BEE086699519DD3A6B0B6 /* ProvisioningProto.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		5842BDF93A7BB0C27D415C573A33AA6D /* OWSVerificationStateSyncMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 785701B05281DC2C7CCAF1D39BD2275B /* OWSVerificationStateSyncMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		578B6CCCC54B10DFF2288119EF3ECAA5 /* OWSIncompleteCallsJob.m in Sources */ = {isa = PBXBuildFile; fileRef = B8FA1C39CD90A08A728D5392075FAF01 /* OWSIncompleteCallsJob.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		583E8BA7157E9AD4D7784EE93C838E21 /* BadArgument.m in Sources */ = {isa = PBXBuildFile; fileRef = 06FBFA32CA1E18016849C8C5029BFDE2 /* BadArgument.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		58997BF580BA939866FABB9B966AE053 /* ProtoUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1B520DF4E722D5A3231CAF734C1B53 /* ProtoUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		589DD990B369C8A36079F38327CE7329 /* BinaryEncodingError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBFFFCEC874E5141C9829F20E1391341 /* BinaryEncodingError.swift */; };
-		58CF711DA2007147737E0D8D0A02EBB9 /* TSInfoMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 39D272162B10D1D246C891716C301050 /* TSInfoMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		59359299E28E7052D4F2A0922E0C1A62 /* TSInvalidIdentityKeyReceivingErrorMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AEE7E66C149200F15EC690C1C9404ED /* TSInvalidIdentityKeyReceivingErrorMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		58A84F1117ACE256BA920778E21BE7B8 /* TSStorageHeaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 16FF98FF19AC89DB42ED08B105BC6871 /* TSStorageHeaders.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		58BFC266997C65808DC455BC60751DC9 /* OWSSyncContactsMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 15094B59E422013114FA67DAA403E607 /* OWSSyncContactsMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		597EA21C99650692B4CF0D1F8ED2F804 /* ExtendableMessageBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = B4438BAB84F791E234FEBC45783FF2A0 /* ExtendableMessageBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		598F9C48ACB27E0031A20A33A169AD71 /* fe_0.c in Sources */ = {isa = PBXBuildFile; fileRef = 92418DB916CB59E4D429B30D466E45BF /* fe_0.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		599A04F681847872D2086C43FF155885 /* fe_frombytes.c in Sources */ = {isa = PBXBuildFile; fileRef = 2AC4D561FB329CD88023E61109FE92FB /* fe_frombytes.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		59AFB20741089D7E2E4E911E0424740B /* YapDatabaseRelationshipConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = F3F6BB352EA1ACE90EB6E8E6592C390E /* YapDatabaseRelationshipConnection.m */; };
 		5A127E1BB898BD9F0A65E7B15610862F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D127F5DF6BA2B6D8CACCEE990DA0D243 /* Security.framework */; };
-		5A545879DF3E12266E6BE14746CD679C /* OWSOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = FF01C653BD9261B44E266AFDD85171A9 /* OWSOperation.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		5A645A70C0A54B22551E867F121988CA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
 		5ADFD48D833DF7D1131B59B1243D46F9 /* YapDatabaseActionManagerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 06C0FEA740E2DCB8CEC3BA10A95ABC93 /* YapDatabaseActionManagerPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		5B00C3E34A5E8A0760FD56414E3809E5 /* TSErrorMessage_privateConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EFE9E609E98AB145B88AF3EDB34D13A /* TSErrorMessage_privateConstructor.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		5B0810130FE3E364B0DDD5CB344B4210 /* TSStorageHeaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 590142FDA1A26D9743A642A36DF3DB83 /* TSStorageHeaders.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		5B00157A43AB28384F5606F775D39057 /* TSInteraction.m in Sources */ = {isa = PBXBuildFile; fileRef = 94BB41AB92AC6BE28C4528FA5679C04C /* TSInteraction.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		5B2F849DC9DF0E6DF36AC2C078D51509 /* YapDatabaseCloudCorePipelinePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E7DB0738340147EE4A7D8B8397BCC16 /* YapDatabaseCloudCorePipelinePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		5B63659CCB38B102D4067FFD3CC54D0C /* PreKeyBundle+jsonDict.m in Sources */ = {isa = PBXBuildFile; fileRef = 46A50534032487C63B8D57D9360748B1 /* PreKeyBundle+jsonDict.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		5B77045A9DD912B9A401D0829F30FBF5 /* OWSAddToContactsOfferMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 555451B2AB55080B3997746AA4D1749A /* OWSAddToContactsOfferMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		5B9C6BDCE61AC917DFA371489B1F2731 /* ioapi_buf.h in Headers */ = {isa = PBXBuildFile; fileRef = B041650EE5DB19143E573E13C98192DA /* ioapi_buf.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		5BA5D28ADC82F266DE9F9D6DC20E1897 /* SRRandom.m in Sources */ = {isa = PBXBuildFile; fileRef = 842DA7AEC0723BD905A503D5FB9DC6A4 /* SRRandom.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		5C50FF5D289886F951D1204375E3C12A /* OWSDisappearingMessagesFinder.m in Sources */ = {isa = PBXBuildFile; fileRef = F3658CAD6984DF1F320843F2685A2B5C /* OWSDisappearingMessagesFinder.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		5C9EF2E62BB4C232C4026852603A7282 /* SignalAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 35375BF7DB9184D6A3BE0DE8E555CF91 /* SignalAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		5C53755FDB67E922A42DCE15232DAF06 /* OWSReadReceiptsForLinkedDevicesMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = A4AD44D7FF393559747026068FBBF5F5 /* OWSReadReceiptsForLinkedDevicesMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5CA7496417088F269FF14C3F381880CF /* YapDatabaseCloudCoreConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BC4DCCBCA302121346850AD8671E28 /* YapDatabaseCloudCoreConnection.m */; };
 		5CB197D9B6692CA402E15D73658C5C76 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
 		5CF7CA6B616011946F2C0B50EA588039 /* ge_p2_dbl.c in Sources */ = {isa = PBXBuildFile; fileRef = 10B897E466CFAFE50CC51770D7B2B04E /* ge_p2_dbl.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		5CFCBA0EC159FC3A3CA5E1D350374252 /* OWSReadReceiptsForLinkedDevicesMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = E58CE09CB4F7301622AFB5079FFFED28 /* OWSReadReceiptsForLinkedDevicesMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		5CFFE31F48167A951C10FA1A48824205 /* OWSEndSessionMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = F9C8DB45BF6AE855244F8D05D0A083E5 /* OWSEndSessionMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5CFFF4D96A7337D10CFA9D73FF4B3DBD /* NSLayoutConstraint+PureLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = C140505F09D1E01BEE42BCD16E09750C /* NSLayoutConstraint+PureLayout.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		5D7B34F54FAB5E12FDBAE671AE0E7013 /* YapDatabaseRTreeIndexOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A35CF45C44310BCA779D4F153080BDF /* YapDatabaseRTreeIndexOptions.m */; };
-		5DFD95F75E04E13C5F90DF2A9EB30934 /* OWSCallMessageHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CA26BA65F1AD248A00BB73E72FD28D /* OWSCallMessageHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		5DFEDD2B46A362A5DA43112FCCBA1A0E /* OWSIncomingMessageFinder.m in Sources */ = {isa = PBXBuildFile; fileRef = A709113FFDE1696939ADC6ED2F242CAB /* OWSIncomingMessageFinder.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		5E0D111127F5ECAF86CFF13B33E08F7E /* JSONMapEncodingVisitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFE2CD6602E1FDF9A3575730D905B0FA /* JSONMapEncodingVisitor.swift */; };
+		5E1C507C7C0CE6F60D968AEFA0C94824 /* FunctionalUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = D0E470848E72E1826D838312F73F504A /* FunctionalUtil.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		5E7A5F5186EE791FC06472773C8F9BAA /* SRRunLoopThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 97FAA5DA7710FA14E29B2661EB35C86A /* SRRunLoopThread.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		5E8564CB5EB21E67593C29D8453FA758 /* YapDatabaseExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 437210273E3EE8899A5CF840E498DA84 /* YapDatabaseExtension.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5E93E95BD541705823B51DED4043AB33 /* YapNull.m in Sources */ = {isa = PBXBuildFile; fileRef = A38B88AFA5A15E995E359B7E9AEC102B /* YapNull.m */; };
-		5F419A3A43F545FEC5FAFE4C502E3BD5 /* OWSBackupFragment.m in Sources */ = {isa = PBXBuildFile; fileRef = C8C41B93281D1BBE5185648A996590D1 /* OWSBackupFragment.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		5F37AFD87F32BF4B8E957A40954E3859 /* OWSDisappearingConfigurationUpdateInfoMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 33EE1D9EFC506BD11D92D311B7A17605 /* OWSDisappearingConfigurationUpdateInfoMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5F472871907775892BCA1B64394BC247 /* ge_sub.c in Sources */ = {isa = PBXBuildFile; fileRef = 8993BE232F607B5088398AD06E64235E /* ge_sub.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		5F9FAD746EC346FF5F27BA3DDF3770D4 /* sign_modified.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D0091C68894BF3E2A98469260DA4FED /* sign_modified.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		5F9FDB8CAE7EA7BBCAB28789E67D04C3 /* PMKUIKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 827E2B5FD86894D625EF1C5594AC17B8 /* PMKUIKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5FB70C8ABF8F549D6C901AADB5C91321 /* HashVisitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0BC0A740D0F439ED9A9D064E2622F54 /* HashVisitor.swift */; };
+		601A02387A9FDC47532185F8B16E8E52 /* ContactsUpdater.h in Headers */ = {isa = PBXBuildFile; fileRef = 1E02E665D7C7027636B3BE8101A8B0E1 /* ContactsUpdater.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		602F3743686474626DC0975FCDCC2AD7 /* sc_reduce.c in Sources */ = {isa = PBXBuildFile; fileRef = E17DC27D24D27431FC204A929D3C6EDA /* sc_reduce.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		6074EDA4DA60D59287D3E03CC31D281E /* YapDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 343880126497C8A3623D25CE1B040CB5 /* YapDatabase.framework */; };
+		60750A03FFF4EE71C56DBC52EAD3E6D5 /* TSDatabaseView.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FEC740C8B759C02D968CC7336DEE2B0 /* TSDatabaseView.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		60A8881423EF00DF5FBCB3E8C9EA645B /* OWSMessageSender.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BA9310FF66D97373376434D6AE1E8C /* OWSMessageSender.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		60AE3A894ED9E6A7A628877A47431930 /* OWSDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 9CF8CA70AFCE1E20BB888202545113BD /* OWSDevice.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		60D429D5209609A27B37878AAC86D386 /* YapDatabaseView.m in Sources */ = {isa = PBXBuildFile; fileRef = 788428129CF63CB8793BDF886C52D9E5 /* YapDatabaseView.m */; };
 		610033310578AF00797C24A9EB6D6F6B /* MessageBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CE6F4E4AE8678501398F43C200F23EF /* MessageBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		61102B78D4E3CE15FD8353202E1360D8 /* Decoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DDFDFF03A5B55033B593A47A890B049 /* Decoder.swift */; };
+		6116615FE6637CFF64965A6C971A89B0 /* SignalRecipient.m in Sources */ = {isa = PBXBuildFile; fileRef = C9D8F7328692DDAECB3C9A5DA5FFF986 /* SignalRecipient.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		61502B18450C900626E9E86A774021EC /* curve_sigs.c in Sources */ = {isa = PBXBuildFile; fileRef = 23944BCCDEB33D506B63E5F80A8517E2 /* curve_sigs.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		615ACFBBBC41003AFDCCC09BF44AFA78 /* OWSOutgoingSyncMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = B2246C0044CD8CAEBF4E2903FBAA75CA /* OWSOutgoingSyncMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6198A0C2AEA335C72D205E9A4E50706F /* UIButton+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = 963DD191F8350FE2D986D5D51253A410 /* UIButton+AFNetworking.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		61A2A6DA85720CA6A57CB18080E7CB22 /* DDAbstractDatabaseLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = BDDC248FB22A536F0EE4E1078BE8F223 /* DDAbstractDatabaseLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		61ABF1434AA5A0AA2D053A6EBD2CC990 /* OWSDeviceProvisioningCodeService.h in Headers */ = {isa = PBXBuildFile; fileRef = 5E9206D889A80072F30B09C0BD4486AF /* OWSDeviceProvisioningCodeService.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		61E99DCAB2EB49B5F271DBF3A58581D2 /* YDBCKMergeInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FB7873517DE1FE25E8DF88667D0FCE8 /* YDBCKMergeInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		61ED5A57329DC274BC37E71DB697F5D8 /* blocks.c in Sources */ = {isa = PBXBuildFile; fileRef = 1DE9B587B39F63668B90E2CDCFCB2197 /* blocks.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		61EE2A443E7339D65257229B87774E58 /* SRIOConsumer.m in Sources */ = {isa = PBXBuildFile; fileRef = A383510085E6A5CB9D91A2430C977169 /* SRIOConsumer.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		6216D682FFEC5C5F7CD6744A39229E18 /* YapProxyObject.h in Headers */ = {isa = PBXBuildFile; fileRef = AF828BA13C947D6A33C7FAF31A5FBDD6 /* YapProxyObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		62ACE90E21410E68FB50AC20761E8FA7 /* SRIOConsumerPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 43FBD28F320D1B90D031FB78B8037C8F /* SRIOConsumerPool.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		6302558C7B625068571D50193D741F06 /* BinaryEncodingVisitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09C54BB1A7D65F27CD4B11A8DC8C3FAD /* BinaryEncodingVisitor.swift */; };
-		63453520BCFC861AD5EE1E250EF3F22C /* OWSSwiftUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = B46F91D5B8C54FD4BB7CA312D9204B1E /* OWSSwiftUtils.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		6372E695F030C274EDFFE3A0F574EE0C /* WireFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = BE383F0B8FA825A3C8F64D2114F12594 /* WireFormat.m */; };
 		63A66DDED899060C50DB93505966057F /* YapDatabaseConnectionConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F77B7C0EC802827BB4C31D15D0C9388 /* YapDatabaseConnectionConfig.m */; };
 		63CF30010B1AC6CA414A32EBF285D175 /* YapDatabaseManualViewTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 6096B206F0AE0EF3DF71A1E073F76843 /* YapDatabaseManualViewTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		63D2A8C94F0DA982240E3BAB1EA68736 /* OWSAddToContactsOfferMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 582B779C6C34FE371EF9D8E8E01A4BBB /* OWSAddToContactsOfferMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		63EB7A67B86651502CDF99FB982C00B3 /* YapDatabaseSecondaryIndexSetup.m in Sources */ = {isa = PBXBuildFile; fileRef = 46D8A3AA400CD0DE070F2160A0CAB123 /* YapDatabaseSecondaryIndexSetup.m */; };
-		6406EB149C8642DADDE82ED42DBCD891 /* TSInvalidIdentityKeySendingErrorMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = B92B15C5566263821494E521EE9C46D5 /* TSInvalidIdentityKeySendingErrorMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		642135C683806A83D37E55258384312D /* YapDatabaseViewConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = DE6FE792337AD939FD1042CFB58C4EEB /* YapDatabaseViewConnection.m */; };
+		643848939D8313BAD907395975B23F0B /* OWSDynamicOutgoingMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1FDB629802B17D436910F53EACEDAC /* OWSDynamicOutgoingMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6454AB6859E859DF121A80A0C6DF7405 /* AppContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EB4E8B77B94E69E1B181446EC8D2A20 /* AppContext.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		649F163BD620614C92620E5680A30544 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F45ED4180BDE3E05401BC59F054C38FA /* CFNetwork.framework */; };
 		64D789EE2FD5F121BB3C2B398A1DD715 /* MTLModel+NSCoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 7596A6FC23CE052191FD40EE94EA2C85 /* MTLModel+NSCoding.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		64F75A75C17C8ADF7800458829F53FC2 /* YapDatabaseActionManagerConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = BD6F5E9A99EC98E84A1DEA1BE5B4B8CA /* YapDatabaseActionManagerConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		650CAC99BE4A3A2860CAF928C09A53B6 /* PureLayout+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D94B9FBF6A91DF9D4461314A821B7C9 /* PureLayout+Internal.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6555CCBD584AB85F979215E15A3935BD /* YDBCKMappingTableInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = AE2112E6CEF11172AB1EA427CE9ADEED /* YDBCKMappingTableInfo.m */; };
-		65852A8B4C7B77129F5C879AAFE0D416 /* OWSQueues.h in Headers */ = {isa = PBXBuildFile; fileRef = FF96CEAF553A48DACDCF11F36956C4B2 /* OWSQueues.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		657AC875F90D8C8C6A71DC8741FDE914 /* TSPreKeyManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 794136C6F2F8DD4DBA9F087AA98C64C3 /* TSPreKeyManager.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		658D3A79CF01BE1FCAB6460E11F883AF /* TSIncomingMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = CBF741E0ACA119EAD241DB55E063666C /* TSIncomingMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6598AF768823D838CF0B78A339419ADA /* YapDatabaseManualViewConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = FFBA2BAB7664BF6BA1E14A706E6C11BA /* YapDatabaseManualViewConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		65BB4150C94346613E55449A0CEBE304 /* OWSMessageReceiver.m in Sources */ = {isa = PBXBuildFile; fileRef = AE1C049FE1FC8213362E219A5FCECB93 /* OWSMessageReceiver.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		65D579A5513E2B2DD94D98873B0DA32F /* EXTScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 922312A36B2CF6F0CABB53F6E86CC4D9 /* EXTScope.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		65DBE1B20C216E82ADD70B5E726906A5 /* OWSOutgoingSentMessageTranscript.m in Sources */ = {isa = PBXBuildFile; fileRef = 05D3581A8EB82D1E33590FCED5FDB25C /* OWSOutgoingSentMessageTranscript.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		660A40697AF8FAAED93117FF29843237 /* OWSLinkedDeviceReadReceipt.m in Sources */ = {isa = PBXBuildFile; fileRef = 6A49CA58C91BE2291C745C9267111880 /* OWSLinkedDeviceReadReceipt.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		65E4B0D0A2DD444FECBD9F98CB2B8F15 /* OWSPrimaryStorage+PreKeyStore.h in Headers */ = {isa = PBXBuildFile; fileRef = D227353D51A5527255638EC37578ECBE /* OWSPrimaryStorage+PreKeyStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		661220FAD745BAAFF06D3512C4F696FB /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C62D74C5AF13A6CBA84F046985FD78A7 /* CoreGraphics.framework */; };
-		661A38FF2F1F6A4B7508DB9BE41ED62F /* OWSPrimaryStorage+messageIDs.h in Headers */ = {isa = PBXBuildFile; fileRef = BDB3FA54232098D6ECF79133DB208B6A /* OWSPrimaryStorage+messageIDs.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		66208042D043D8BFE3C1FF4FD4C8FAEF /* YapDatabase-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = C80C5F00843A4DDD7A5B30655DB5A126 /* YapDatabase-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		66D0E551776FCABEA5A6C7B71B2A62AA /* OWSDisappearingMessagesJob.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BB37D56F94E93AEE1AEC8F2151B8FDC /* OWSDisappearingMessagesJob.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		67028A0BF7B9CE86B82449CF579DC7E3 /* YapDatabaseCrossProcessNotificationTransaction.m in Sources */ = {isa = PBXBuildFile; fileRef = ECD124A9584FD13AC34E63F0E87B5C84 /* YapDatabaseCrossProcessNotificationTransaction.m */; };
-		6716EFA0332FC529AFE0667B5FE72F87 /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.m in Sources */ = {isa = PBXBuildFile; fileRef = DF28247262E9BBB702C4C4CFED1D1A40 /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		6740C48B35351CC4397A4DE94D36995C /* OWSDevicesService.h in Headers */ = {isa = PBXBuildFile; fileRef = 2581EEA096AB2BC76E01B2F4582A338C /* OWSDevicesService.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		67495D6BA5546D0D4DBF623AD3CB156B /* YapDatabaseFilteredViewTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A51B515035A6910F168FFDD60FA14 /* YapDatabaseFilteredViewTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		676A4F154944E097A8A46F965B675904 /* ATAppUpdater.h in Headers */ = {isa = PBXBuildFile; fileRef = BC845DBF3D21D36ED80EB47DD758D521 /* ATAppUpdater.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6778703BB48CDD57ED35AE0B24DBAC9A /* AFURLRequestSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 7094B917D29C1AA65DA9882B772FE590 /* AFURLRequestSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -557,100 +542,95 @@
 		685E522CE1B5E311FDDD150EB6B71D53 /* AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = 7424D669E274EB577200D76E3FB6B20A /* AFNetworking.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		68BD24B07806FA417870D7C20B5B77A8 /* UnknownStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA978D7F7D91B1C8EA523B4442AF9166 /* UnknownStorage.swift */; };
 		68BDCCE91E0C2113B03F87203C37500B /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13F19AD40D0A3F5A4536B6092AE94301 /* Message.swift */; };
-		68C0C74F838BF63DAB075F0D6FC16550 /* CDSSigningCertificate.h in Headers */ = {isa = PBXBuildFile; fileRef = E84FA178FAEB325B13D0CF5DD22C1827 /* CDSSigningCertificate.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6967A0BD5C0F703A4F08A8547F065820 /* OWSDeviceProvisioningService.h in Headers */ = {isa = PBXBuildFile; fileRef = B4A9FCA8A5D22505E86EB851F171C428 /* OWSDeviceProvisioningService.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		698E574B794A1800B0EA2272E738112D /* hang.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D35FCA2E54DA17AA370F2F9D54275B4 /* hang.m */; };
 		69BC1CD8838C62A5D8D78BACB73CD926 /* BinaryDecodingOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC9F84F80852128D4763BDCA893FA2CE /* BinaryDecodingOptions.swift */; };
 		69E9611C8CFAFC53DAF8B2138F5E3DBE /* DDAbstractDatabaseLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = B24B789CDBDF256D4F96F0E9C5A839AC /* DDAbstractDatabaseLogger.m */; };
-		69F047C1750C5FD03FDE7D4641C5F2FE /* OWSRecordTranscriptJob.h in Headers */ = {isa = PBXBuildFile; fileRef = 71AEB98EB20C0E652A2D3FB55DE3CED8 /* OWSRecordTranscriptJob.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		6A5BA50058DDEBA47CD0F81CE2DCE9B0 /* OWSMediaGalleryFinder.m in Sources */ = {isa = PBXBuildFile; fileRef = 95968E175C0D1E96EDCF62BFEB525F81 /* OWSMediaGalleryFinder.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		6AA8CF2D5E1F14F65469831DAAF4628A /* DDMultiFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 35EF1FB0275CB42853819E92CE0DD0C2 /* DDMultiFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6AC9F67BEF62DE6F401AFE3228DC8B59 /* NBPhoneNumberDesc.m in Sources */ = {isa = PBXBuildFile; fileRef = DFD17EE1B3A7D2D3A72CD86C5C0397F5 /* NBPhoneNumberDesc.m */; };
 		6AD61056E3C40EBF9F51A2E0F63F9086 /* CodedInputStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 46B729DED2D61C7A7B250A6B270B82B3 /* CodedInputStream.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6AEB100DE2966EC0F01817203677D746 /* OWSIncomingMessageFinder.m in Sources */ = {isa = PBXBuildFile; fileRef = 1130089E2997880F8E70C17EE38EE08E /* OWSIncomingMessageFinder.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		6B2C358AD4A9B912A35B54DA5B350FC5 /* Mantle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35DF221334AA010A7163228B7BEFD21E /* Mantle.framework */; };
 		6B4808A1C6D4A39D19D1BA8C37B9760F /* YapDatabaseManualViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F80626A1BB358C89765A992290FDCF54 /* YapDatabaseManualViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		6B5F67462D9D49B0F155480231E31A0C /* GeneratedMessageBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = E9E3794EA8686580A1B44B678AFBEAF5 /* GeneratedMessageBuilder.m */; };
 		6B89E589922B8DF2CC20CEBE8E8EED3A /* SessionBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A320CBAF72F083F1BC859D06DE58109 /* SessionBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		6BB9F9A8DF2D6A02E6678B71D942501B /* PhoneNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 436D11384E6EDA27D0C37F8E5F8425A6 /* PhoneNumber.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		6BEF8FE42ED8E55EAB1C8F2A18E86A24 /* OWSContact.m in Sources */ = {isa = PBXBuildFile; fileRef = 485F3AA27F05542213B759678894DD65 /* OWSContact.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		6C62CA43997D14C9BF40CC135FAF39CD /* ProtoUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = E4E58832B5059FA04AFEE9FD01BE6F6B /* ProtoUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		6D07CA8FACB219BE10EB695064209F06 /* OWSCallIceUpdateMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 83461F5F8585B3BF15202D01BE781E3D /* OWSCallIceUpdateMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		6D3DC6C2A0CDB838E0D2BD3193C9EDC3 /* ECKeyPair+OWSPrivateKey.m in Sources */ = {isa = PBXBuildFile; fileRef = A9653287DC20D7EA4577C7169551EFF8 /* ECKeyPair+OWSPrivateKey.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		6C551DD8D790F2CE6535D23F62E022BE /* OWSRequestBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 819FC807BADF319C386A31D0D94DC641 /* OWSRequestBuilder.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		6C6EE4BC2A4FC234F9F6B1FADB6ECE46 /* TSRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = C0733F441FB33CFC0D663540EBBCA4E2 /* TSRequest.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		6D92C0A99EABDBBB6237CBE03B61ECDE /* AFURLResponseSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 633E0DE1D4C5A48D2D7FDE79A93D9E36 /* AFURLResponseSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		6E25874B5B7A5D458159EC71AD3648C3 /* TSAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 253DDFBCDD9A370C005E357AFBB0CE0D /* TSAttributes.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		6E1BD51EB5BDB422DE653E8952D9117C /* OWSReadTracking.h in Headers */ = {isa = PBXBuildFile; fileRef = 27465E08E4AFFC03931ACBADC61C277D /* OWSReadTracking.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6E463382EB293BA65E888C809230673F /* libPhoneNumber-iOS-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EE27D4720465A48AA5E7F7D6A292101 /* libPhoneNumber-iOS-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6E48B05AAE64DD28C6EE0219B4B74A0D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D127F5DF6BA2B6D8CACCEE990DA0D243 /* Security.framework */; };
 		6E8BABE7B4355F162E29EDD5C8294B6D /* ge_add.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EC723351F7AAA34F1CC4C23B8580BFA /* ge_add.h */; settings = {ATTRIBUTES = (Project, ); }; };
-		6ECC52CBB19481F26B5D7E33B657F9C2 /* NSURLSessionDataTask+StatusCode.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DDFB51C2F07FCC5B553270036D45A95 /* NSURLSessionDataTask+StatusCode.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		6E98BA12610F3AC908A633B94CCCCF03 /* OWSIncomingMessageFinder.h in Headers */ = {isa = PBXBuildFile; fileRef = 9F3E2BF7B01183DB55C1DA4D57440D3A /* OWSIncomingMessageFinder.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6EDBF4AE23C5CD20857B4C66054CEDA7 /* NSNotificationCenter+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = 584A8DAD5F48D106520353FC13391C40 /* NSNotificationCenter+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6EFE637E6023190F1C8711FCE13202EE /* MTLTransformerErrorHandling.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E61CD28B5D26159BC36BA5FAC5A5E2F /* MTLTransformerErrorHandling.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		6EFFB7675ED52098D56B7B58B118E3D0 /* ExtensionFields.swift in Sources */ = {isa = PBXBuildFile; fileRef = D42832E7A656A50FDF21643E1D73FB1D /* ExtensionFields.swift */; };
+		6FB5AD2720457FB142B3467256808D56 /* OWSMessageServiceParams.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D4A607733EEFABC0BBE85CB65AFBEE8 /* OWSMessageServiceParams.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6FBC42DE86AF5FCD6B144DC4DA469A57 /* DDAssertMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 672202F9F58A8AACA98222C250AE9AF2 /* DDAssertMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6FECD8A01B92E7363997508A823E07FE /* ProtocolBuffers-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 508C4A1B3213BA484404538C7EC030DC /* ProtocolBuffers-dummy.m */; };
+		7015CC3CAB0BAF8A2D840D44418B066D /* OWSOrphanedDataCleaner.m in Sources */ = {isa = PBXBuildFile; fileRef = FADDB75AF9469EB1A17E8F19C6F68358 /* OWSOrphanedDataCleaner.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		702A9335A04729081DC450D8DF0A4C4A /* ProfileManagerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 904CAE7574122FD8A57A7E9DEA6F822F /* ProfileManagerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		70F6FDBDC95AAA7371CB8E5C0F0FD89E /* ge.h in Headers */ = {isa = PBXBuildFile; fileRef = 234B223B0E0FE23DC251FB4F9994259F /* ge.h */; settings = {ATTRIBUTES = (Project, ); }; };
+		714A8EA16D75EBA6AAF298B7C8C4DAE6 /* NSURLSessionDataTask+StatusCode.h in Headers */ = {isa = PBXBuildFile; fileRef = C6BBD211883D04DA7B250F0DC15F8457 /* NSURLSessionDataTask+StatusCode.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		71B14C74525A819779F9C0C5901B4127 /* SocketRocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BB53A4832AB0BC446C8829D292E06D5 /* SocketRocket.framework */; };
-		721090F7A7A09BDA8FC9F70858D92D04 /* OWSEndSessionMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 72A53CD530014009065DF21E9ED6B13A /* OWSEndSessionMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		721457677DC7EA7643876D68A59D947F /* PureLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F1E46631D33BECA6BA494FDA629312 /* PureLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		722ED66C2D30327267E249B1FACA8D57 /* RingBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B95BA1886F4679F054DF2977465CA8C /* RingBuffer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		724912E1158D2FBB76476353DCA209A8 /* TSMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E0EE7409103C1ED2F41E9A5B38FAC57 /* TSMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		725EED5AB034DEF3D4ED2AE9C566A69F /* fe_sub.c in Sources */ = {isa = PBXBuildFile; fileRef = 612B77893ABA03229323F41D2FC16BEC /* fe_sub.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		7281CE4F4E1056DBA7E9F13ECDF54B1E /* TSDerivedSecrets.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B3A872D3CCE4DF92AB79F6ADF3322E6 /* TSDerivedSecrets.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		72B69959BFA824C3CBEE878719531E80 /* JSONEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94FD75002907C8C639C17878876E0DFA /* JSONEncoder.swift */; };
+		72CD33C9174C23C91CA472388CEDB4BC /* OWSWebsocketSecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = 668A8F1450DB61F6EA8B1218B4026518 /* OWSWebsocketSecurityPolicy.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		72E79B04B05910E061B4C1A5F50ED2E2 /* YapDatabaseRTreeIndexSetup.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CE44464D62D322BB68651ABCBEB2CBE /* YapDatabaseRTreeIndexSetup.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		73320B5F42890311CEDF69B6B76EF85A /* OWSDeviceProvisioningService.m in Sources */ = {isa = PBXBuildFile; fileRef = 8510288CFF00F6C00D0034A3B1833EEB /* OWSDeviceProvisioningService.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		738540F7FF49F2F0589F54E82D475BCE /* TSDerivedSecrets.m in Sources */ = {isa = PBXBuildFile; fileRef = 22385D2DE60EB33291FA173C6DDC3847 /* TSDerivedSecrets.m */; };
 		7385FBD0F307D284C3E7657EA380D57D /* ProtocolBuffers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BECC9C24A3B8A9CDB422142A29650041 /* ProtocolBuffers.framework */; };
 		73A2AAB1ABBF1F5EC9AB95C28CEE2A62 /* Pods-SignalShareExtension-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 541C621525EFD0C321DE78092D72F9FA /* Pods-SignalShareExtension-dummy.m */; };
 		7405DE1E55008211F065329178D2F5A8 /* YapDatabaseCloudKitPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 59BDFF8B4726D6EDE4EB30E8317FF444 /* YapDatabaseCloudKitPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		7408317C73F690131410FE2512D5E730 /* FingerprintProto.swift in Sources */ = {isa = PBXBuildFile; fileRef = C090C9385E2A11FA3B4CD4A9AE2336C6 /* FingerprintProto.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		740D4840274EBA2CFD0EC7DC98E3056C /* Mantle-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 84AE59F2F0562C9F446647E5E8FAFCD7 /* Mantle-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		741C1DBA7147F55C8E8B181C67F02973 /* YapDatabaseCryptoUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 73CA0FA3617F0A21060018B28D94F257 /* YapDatabaseCryptoUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		74458F34888836FA933BC76C00CFD5F4 /* MTLJSONAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D4F583622080DFA731C45F1024CA24B /* MTLJSONAdapter.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		74E33C106EED05022538BE77A91F2B38 /* TSYapDatabaseObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0F37DBB8A316131C822ED9E95FEAFB /* TSYapDatabaseObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		74E50924CBCF655534D815D31949B0F3 /* fe_cmov.c in Sources */ = {isa = PBXBuildFile; fileRef = 1407A72B43C04A026BF22F2E178C228E /* fe_cmov.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		75022451FE9CCDCB5F54EDAAA40A381B /* SignalRecipient.m in Sources */ = {isa = PBXBuildFile; fileRef = E2AAC5E69421FF1640869EF39CF950FD /* SignalRecipient.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		756E5FF62005620CCD878C5A0CDF2882 /* aeskey.c in Sources */ = {isa = PBXBuildFile; fileRef = 68FBD263D4390E29DA6FE68E2439647E /* aeskey.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		75912F1D99A609158BBE25AE3FD22A98 /* SessionRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 203AA3912DA26B03346DBE17AF96ADBF /* SessionRecord.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		759EE8537E7B11734F91EA1F1F7E2637 /* MTLModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F4E87F59D8041A130C5AE289C426ECA /* MTLModel.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		75B9791B0A89F3E0F7F483311CFEA10D /* NSData+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 451D4CBD6551E643DAE8CD949A2941C6 /* NSData+OWS.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		762AD3BBA594AF227F627C9867355205 /* NSURLSession+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = BAC068985EA7FA6CC4329EB7E863667D /* NSURLSession+AnyPromise.m */; };
 		767562BACA7B0BCE90696023B9C81CF7 /* crypto_verify_32.h in Headers */ = {isa = PBXBuildFile; fileRef = 345538D6031118578A05A9AEA15C2A29 /* crypto_verify_32.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		76AF2D56488710DE3926F9572C4C8CEC /* WhisperMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 22BB422059744A32EFCC9061576A8C10 /* WhisperMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		76D08F40854288DB09BED64D6CB4AF78 /* OperationFailed.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A478C0101962F7CA5F8C9FE3698B7B5 /* OperationFailed.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		76D9D2CDB8D021A48EF2A48ED9A512C7 /* fe_sq2.c in Sources */ = {isa = PBXBuildFile; fileRef = 2A50A100E3C20C142D9D2C70CDD12F08 /* fe_sq2.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		76E7A41202E8DDFFB011E89846BEE698 /* YapDatabaseManualView.h in Headers */ = {isa = PBXBuildFile; fileRef = D79E8058A1A623B79218E5A1D4D2B087 /* YapDatabaseManualView.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		76F480E8EE6A61C1CB6D4374C9E4203D /* OWSProvisioningCipher.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FC67C430811D1CD33EE910999097A05 /* OWSProvisioningCipher.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		770F6E52CF0EE47BF47179AB0682CED0 /* JSONEncodingVisitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C51125B085E8F5D3ACFE167219FD2F8 /* JSONEncodingVisitor.swift */; };
 		772DCB5ACBFAF90C69F3954A84D4DD8B /* fileenc.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB89C380723763CE6FF4A0CF96612E0 /* fileenc.h */; settings = {ATTRIBUTES = (Project, ); }; };
-		773471A10F427E98BE7AC40447432A4A /* Fingerprint.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61B2A5170ED563DFF028C123435FD716 /* Fingerprint.pb.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		773C9219A567207E93DDAF8C7F292F17 /* SignalAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = B81AE76BE4A2311A5D18790B3D322988 /* SignalAccount.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		77450EE995D807B483F7DE06609AC766 /* YapDatabaseRTreeIndexHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = CF9C88B1E526C563F59B83459928EBC6 /* YapDatabaseRTreeIndexHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		775B760811B406AA82ECE66086807808 /* YapDatabaseExtensionTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 17CD25DFBE1C2392B4DE6F5FA52D9362 /* YapDatabaseExtensionTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		778EEF9F4DAFBF92A61C13735C944266 /* OWS2FAManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 518BCD1FD6BCC27CBB30F777A972D70F /* OWS2FAManager.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		7796552E1B48722351B133E16200FE7F /* OWSCallIceUpdateMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 321B0046904E5ECC79D317F3484187E9 /* OWSCallIceUpdateMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		77A4CFC408CCD0F0B4F65706EAC6D25D /* NSDictionary+MTLJSONKeyPath.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A3D3FE994C49C7F9C42A52022727AC /* NSDictionary+MTLJSONKeyPath.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
+		77AC86C68D048844D45B57161CDECEF4 /* TSGroupModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D05B6121CE66B51D2F095419730910F /* TSGroupModel.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		77B5DB7082F29DBA5D7EABA886FC8B8E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
 		77E69B310890FCA89E8D622431C5D4E6 /* PreKeyBundle.m in Sources */ = {isa = PBXBuildFile; fileRef = 13C99A640916FDDAECE1E4C64AE6397B /* PreKeyBundle.m */; };
-		77F78AAF452571FE9BCFD86D075B68DB /* OWSReadReceiptsForSenderMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D7161078EA205A9DFC583892B89A496 /* OWSReadReceiptsForSenderMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		77FEDF50FE80F985BE8159EA6B623A82 /* yap_vfs_shim.m in Sources */ = {isa = PBXBuildFile; fileRef = 800C292F9E6B9B1BFFB61C8A2A248A78 /* yap_vfs_shim.m */; };
 		78227ED2C231FD1CEC9403EA48B5DB93 /* Process+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58CAA021F58340D37942BBEF4AE362D9 /* Process+Promise.swift */; };
 		78469E87ADDE24C252AB25F2235A3665 /* HKDFKit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E3E9F563E3145CE10FB60C39E2D0490 /* HKDFKit-dummy.m */; };
-		788CFE584B4F2EE435EE33A9D1B31A64 /* TSInvalidIdentityKeyReceivingErrorMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = A496EBFA8C9973C409412FF9A40AF9DC /* TSInvalidIdentityKeyReceivingErrorMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		788F1E132229F7700F146DCEFBD318DC /* pwd2key.c in Sources */ = {isa = PBXBuildFile; fileRef = 3EF39FC543CCE87A9BBF3DEBEDEB5745 /* pwd2key.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		78ACFD4DACD218315D07FC8E47D59E38 /* AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 7571353C5B751FA6A54B799EC3A40621 /* AnyPromise.m */; };
-		7976A576D805E3338AF7383B51B5217F /* OWSPrimaryStorage+SessionStore.h in Headers */ = {isa = PBXBuildFile; fileRef = A7C33853369DEEFAEA8587875B1862E2 /* OWSPrimaryStorage+SessionStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		79959ED13F3F582D4C9313369657C263 /* OWSMessageUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 39746EDEB77B7BD826D6C93C9AEF4B42 /* OWSMessageUtils.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		795914C13C7AA09D6E576DAD902A89BE /* OWSSyncGroupsRequestMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = F184ABE7028E5812A3E2A77B1B0A1D83 /* OWSSyncGroupsRequestMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		79D1C355C943F69FE0283914102C0F18 /* fe_1.c in Sources */ = {isa = PBXBuildFile; fileRef = FA3A02A1FA5AEA8A7493206D69D50CCA /* fe_1.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		79E936DA7C3437553F2D2CBBA7398B6F /* DDOSLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 187E5E91C3FAE2A5F331C03434AEFBC9 /* DDOSLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		7A31C90F07D5E0D0BF0405C6B25366E6 /* OWSSyncGroupsRequestMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = E467C5C6FEA93E7BAF2CA5B464B6FB3C /* OWSSyncGroupsRequestMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		7A33F72B5F270A2B7538D36159BBCBF5 /* OWSContact+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = C3E4631DDCCA58353A3C8A2D5BB9F730 /* OWSContact+Private.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7A656E230A6971A280AF861F151C6D39 /* Ed25519.h in Headers */ = {isa = PBXBuildFile; fileRef = FEDEDC51244258F8F411EBA3A080F9FD /* Ed25519.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		7AE380D413E2846256F649FF19384BED /* FingerprintProto.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC812AF6B4EC91F9F83930F603B6B705 /* FingerprintProto.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		7AEB1558003C87AB6504CA4B112523D0 /* WebSocketResources.pb.h in Headers */ = {isa = PBXBuildFile; fileRef = B8AF60FF53D28195286F2509AD3AFFC5 /* WebSocketResources.pb.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		7ACE998DD85584FF4CA8EFDD1F16E475 /* OWSBatchMessageProcessor.m in Sources */ = {isa = PBXBuildFile; fileRef = DEC48287E6CBFC8A07383E195B69F88A /* OWSBatchMessageProcessor.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		7B191392EE71C0F70018492A87CE10A4 /* YapDatabaseCloudCorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 85252C099402BB9D723F420D18426A1F /* YapDatabaseCloudCorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		7B36EC66955F97DBDAD1CF3E028AFDBD /* fe_copy.c in Sources */ = {isa = PBXBuildFile; fileRef = CEDE714AF7600B956EAA40249316AD27 /* fe_copy.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		7B67647154502E0C6F36D396BC9F9FE7 /* OWSFingerprintBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = AD882D52995294914A2C716BA1147D18 /* OWSFingerprintBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		7C10B038162E916AD9C02351C7613799 /* OWSContact.h in Headers */ = {isa = PBXBuildFile; fileRef = DEE0C6A7D9826BDB00B7253207581ED0 /* OWSContact.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		7B744011A43217BB2D68F24FF6E9A61B /* TSYapDatabaseObject.m in Sources */ = {isa = PBXBuildFile; fileRef = F5FEB05DA0271D6D699F9834190A80CC /* TSYapDatabaseObject.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		7C1AE563C8D84463D9ED7CCF775C61BD /* YapDatabaseViewChange.h in Headers */ = {isa = PBXBuildFile; fileRef = 70C276D1E6B8137D08A0E72B16E213A5 /* YapDatabaseViewChange.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7C4066FA3D98F7BC8EA4BED99E7B64B7 /* Pods-Signal-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 190D9C4B6462ABFED569FE01F2A6D7FD /* Pods-Signal-dummy.m */; };
 		7C4C6D6F7016A98BD0E55CA2ECD61BF6 /* ge_double_scalarmult.c in Sources */ = {isa = PBXBuildFile; fileRef = 6B814007A77B0A4265DDADA7FC37C9CC /* ge_double_scalarmult.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		7C5F6DB1C96DE4A875B79BB7C5EB8A7C /* minishared.c in Sources */ = {isa = PBXBuildFile; fileRef = 51A61A9F683820997520253884261F2E /* minishared.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
+		7C994C79084C83B80642D3AAC19C4D7A /* DataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D2F271352A41D918B5E48011C203A1F /* DataSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7CFA9C0F9BE94453B8FEEA8AFB52ABF0 /* PBArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 101DEF933F79A2A9B9F97FD131BF3B16 /* PBArray.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		7D26E82AD5045F08FEAD09D9B0C8B24D /* Contact.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD4FDDCD380EE461D15EE8D91C5FA18 /* Contact.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		7DD81A3AA7D63AECA07DA4F162F379D2 /* OWSProfileKeyMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 44D4F8F189065B5F92D8B2A7F49C7D44 /* OWSProfileKeyMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		7D2F565D1006D94F530CF6A2348EC248 /* TSInteraction.h in Headers */ = {isa = PBXBuildFile; fileRef = D979CD8342646B5E176C5783C85C65A7 /* TSInteraction.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		7D53898E52C46D151F0DD6302B91A410 /* NSDate+OWS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 045AB9359A54A83587F6B9E02FA09ED7 /* NSDate+OWS.mm */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		7DA9194AA322B84A7977CA3687D40E13 /* OWSMessageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 26336F0FFAF2C7AD027373753BEE9E2F /* OWSMessageManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7DE5EFCCBDBF33051BDDFA81F5044D8C /* ExtensionRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = C6D03595AAC439461CC75F0D2913848B /* ExtensionRegistry.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7DF95FBD2BE1AC073DE82B331878B7FA /* SSZipArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D63B40A8DB04314DCD0862F15D8765E /* SSZipArchive.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7DFCC6009A2EB3CF2509E1C1B049A84D /* TextFormatEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 804C95E144665A47911F31C7CB4908FE /* TextFormatEncoder.swift */; };
@@ -660,418 +640,428 @@
 		7E7EC25EE30D90FDB9EE9D304481AEB8 /* YapDatabaseViewOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = BB669F816DF19D9FA59CFBE1C684A158 /* YapDatabaseViewOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7E8E4A57A3B06E3C972ED7A5D71D275D /* NSObject+MTLComparisonAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A58B07B2A35EDE7D180DD9328FDE9FC /* NSObject+MTLComparisonAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7F10B98DCA130B91CA5F0E13F2FCDE79 /* AFHTTPSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = AE8DA7708745CD54B5E9352390C9F197 /* AFHTTPSessionManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		7F10C612B8A361562A44AD4D1A0C488D /* OperationFailed.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C17CB70C354F25AC18C50F1AFB44196 /* OperationFailed.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		7F6061842A41C9C07D2F483E8989155E /* NBPhoneMetaData.m in Sources */ = {isa = PBXBuildFile; fileRef = 4076D4BFC97912D05390446D3CF004AB /* NBPhoneMetaData.m */; };
+		7F6211784E9655D3B7EFD02D05521136 /* TSErrorMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F66366D88E53DBCC785272FE883F9DB /* TSErrorMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7F854669DCC8ECF2CF3B6F7F57C90968 /* PreKeyRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 11C4ED7CE0CB4A35AAC7CB9A400D7396 /* PreKeyRecord.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		8038CD9E595B613E3BFD6A194E886826 /* TSCall.h in Headers */ = {isa = PBXBuildFile; fileRef = D9051A47AD0D7B7D8A8E7B000179B195 /* TSCall.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		804964826B01E622A807B72DDFA9F2FA /* AFNetworkActivityIndicatorManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DB36171A4E4135DBDDAC7B88AAFBA6A /* AFNetworkActivityIndicatorManager.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		8073D551B8926ADF04143B9E3B63E271 /* YapDatabaseFullTextSearchSnippetOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = CAA3AD1BD1DE97FEB8A1541541A46BF5 /* YapDatabaseFullTextSearchSnippetOptions.m */; };
 		808EB9CE13C78DB469D154EBD4E174A8 /* MTLModel+NSCoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 9330DF0B1284C1EF2B02B25DB12AEF01 /* MTLModel+NSCoding.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		8099093C1BF73D0D1D8A97CC4533C515 /* OWSRecordTranscriptJob.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E40448A477BBC81012377EABEEAD545 /* OWSRecordTranscriptJob.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		80B5208B3E39055BF0AB4133ECB9811F /* NSError+MTLModelException.h in Headers */ = {isa = PBXBuildFile; fileRef = A4816F5F14D8E16046B95EC8D86F15E2 /* NSError+MTLModelException.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		80B756B71CA45B3767DB9E3C5B72E3AD /* SFSRootCAG2.crt in Resources */ = {isa = PBXBuildFile; fileRef = E32338AF00492DCBD7322D7A9CCE3EAD /* SFSRootCAG2.crt */; };
+		80B756B71CA45B3767DB9E3C5B72E3AD /* SFSRootCAG2.crt in Resources */ = {isa = PBXBuildFile; fileRef = 5BE61ACAA0FF24C273C6E099BF1583F0 /* SFSRootCAG2.crt */; };
+		812D3E404B3420AA6C3726421DF2AD9D /* NSError+MessageSending.m in Sources */ = {isa = PBXBuildFile; fileRef = 35CE2F9AA16964EE6FADAF5537299D32 /* NSError+MessageSending.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		81365EAF3BFD124307BE8B3B7FE3E61F /* unzip.h in Headers */ = {isa = PBXBuildFile; fileRef = A3C93BEB10532E1FAD03B5B867AD9937 /* unzip.h */; settings = {ATTRIBUTES = (Project, ); }; };
-		814355F96CEB7AD7632B7FA083918D7A /* OWSMessageHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 671636927A748208D988BC51C8EAAF19 /* OWSMessageHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		8173FD329C5DB57C969BD9EFC8FE0752 /* OWSOutgoingCallMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B302ED12C45E43DA9DBD0ADB5410A18 /* OWSOutgoingCallMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		81A355CCC46D0B6600C55D59C4194EC4 /* empty.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F38C07AE81A6AD6E183AEB01CDA9F84 /* empty.pb.swift */; };
-		81D3B034EDA5AD71D4A59CF6869FEBB1 /* TSQuotedMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = DC23E5955F92D5EA0A4656115D6860A0 /* TSQuotedMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		81E6BBEEF2A0123D4C654C297183B0B0 /* zeroize.c in Sources */ = {isa = PBXBuildFile; fileRef = A5B373AE7339BEB8A7EF85A0C1A57B03 /* zeroize.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		81F77A163C6A3A7EFE7135F4D9360116 /* YDBCKRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = DE67814E67EF69C889B3059EFFAC891A /* YDBCKRecord.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		82160091DC6872B6B58360924F5A0A45 /* YapDatabaseCloudKitConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 29F4C39B1169A5E7378239D9C44ADBEB /* YapDatabaseCloudKitConnection.m */; };
-		82348DF983D0A432BDAE2C1503D3F3E9 /* OWSDeviceProvisioningCodeService.m in Sources */ = {isa = PBXBuildFile; fileRef = 596BA942A04863C384A205870D94A458 /* OWSDeviceProvisioningCodeService.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		829B3A58B31C6396FC30ED1FD8F830EB /* TextFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CEDFB2928C57CCB422DE4A14FC483E5 /* TextFormat.m */; };
-		82A6A4B916FCD64718EEECE453F48339 /* OWSGroupsOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = A6F40EEFAAF8F62D0666354EB7049DBD /* OWSGroupsOutputStream.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		82A761EF60651840E701F364C83A3721 /* YYSpriteSheetImage.m in Sources */ = {isa = PBXBuildFile; fileRef = F92CED7048463A6F5E0116484FCCA937 /* YYSpriteSheetImage.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		82EE26C7EBF5BE313BBA223511E9567A /* YapDatabaseAutoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 0FC6F13280425B38777FADD598745D80 /* YapDatabaseAutoView.m */; };
-		831DF93D2321A56BCC5937AE53F667E5 /* OWSSignaliOSProtos.pb.h in Headers */ = {isa = PBXBuildFile; fileRef = A4F02C901AD78CE66D2E47057CD07E4E /* OWSSignaliOSProtos.pb.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		838B6714929292228C0F75DD6DAEC59D /* OWSDisappearingMessagesConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = BB3436A861110E3D49FAEE5CC6B063DA /* OWSDisappearingMessagesConfiguration.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		83A482E368995A62FCFD05FD62922574 /* TextSecureKitEnv.m in Sources */ = {isa = PBXBuildFile; fileRef = 439E21C375E6B238C1CD62A80ECD3FDF /* TextSecureKitEnv.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		831207DF37E7115A9550778F2ABED217 /* OWSRequestFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 16C1D94BCB4011F6D9C0E98F070C29EB /* OWSRequestFactory.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		83DCC2799974CB21ADB480E5E6510C1F /* OWSVerificationStateChangeMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = B8B932F27B6A1D9027A7DE34B77A3704 /* OWSVerificationStateChangeMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		83F61501E1FCA5F456A7A17E5635C56F /* YYImage.m in Sources */ = {isa = PBXBuildFile; fileRef = E1918285BC1A524367F812D6250CD570 /* YYImage.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		83FE3E917303A743795242613E4BF5C2 /* YapManyToManyCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 580AEC4742A3860A1B12F93B9BA9CBB4 /* YapManyToManyCache.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		842944B77C51519661203BFBD41D9C66 /* Curve25519Kit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 44B67D3DAB41B302755D41EFD42F727A /* Curve25519Kit-dummy.m */; };
 		8438A801D491E324B51BEBE208BE2DB9 /* YDBCKRecordInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 13CC0F63E2660D6CC2EC234D6EBD6E13 /* YDBCKRecordInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		844A9E048E9FAE362C988981F6FC3238 /* OWSCallAnswerMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C77D42EFF7BC38E8AEEEA77EC8FB4B6 /* OWSCallAnswerMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		844D6FC5969363F5946A557D348A990F /* YapDatabaseRelationshipNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 78CAB4A866A171DB034C43663BBCDDFD /* YapDatabaseRelationshipNode.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		848B0A703E95027A8890A5373044E150 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
 		849D2DF25064DABBDB1B9165BE2043C5 /* AES-CBC.h in Headers */ = {isa = PBXBuildFile; fileRef = D9B923BD82ED9F1B7A6E4D3D6062850D /* AES-CBC.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		849F0DB70DF9A98BDC04B9D8009FE4BF /* OWSMessageDecrypter.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D768F59E01262E53D84035AA52BC6A /* OWSMessageDecrypter.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		84A16FD538C0DAFDBCA0EAA466B59409 /* OWSVerificationStateChangeMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 011D35AA5E13775DDE30470FE5D73061 /* OWSVerificationStateChangeMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		84D15652A195195D764D0E9EA043C3B4 /* NSString+SSK.h in Headers */ = {isa = PBXBuildFile; fileRef = B4965DA1D17633A8F76C1168BE750652 /* NSString+SSK.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		84AC3D312E46F2BCD2980BF94D3306D5 /* TSErrorMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = F34269F2ADFFC4B0B79038AD0DFDD1FD /* TSErrorMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		84ECCAA339298B4F77DE1A8E6ABC2A2A /* aestab.h in Headers */ = {isa = PBXBuildFile; fileRef = AAB35B83FB2BC5E601F7F16C15E5D611 /* aestab.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		850964A6903AB228B0DFEC3074146E88 /* YDBCKRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = D1AD255434355779BAA8ABDBD8BC4E8C /* YDBCKRecord.m */; };
-		8561E14BE550B077F2FD6625AFEF903C /* OWSReadReceiptManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 45D5924C45AB7A0036D734A888A181AA /* OWSReadReceiptManager.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		857D5E401448A2DEBB94C21ADF05B96B /* OWSUploadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = E200940278B8060F500F8AF6BF807F45 /* OWSUploadOperation.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		85E474E3C0BD160A3B4E9060B47E79BC /* NSData+keyVersionByte.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D997537547ACBACC57E031715EAACF0 /* NSData+keyVersionByte.m */; };
-		864160A04B36E0DE865DFC679BA32C48 /* OWSBlockingManager.m in Sources */ = {isa = PBXBuildFile; fileRef = AA2B07F87BCF71573F1ED93156CFCA4C /* OWSBlockingManager.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		8698ADB797D32D2162410B33DACAE188 /* OWSPrimaryStorage+SignedPreKeyStore.m in Sources */ = {isa = PBXBuildFile; fileRef = C62FD32DA9CE379D1B9EBAF216C3C4E6 /* OWSPrimaryStorage+SignedPreKeyStore.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		86E96BB2AAD3BB9ED0FA832A9CCF0A8F /* Mantle-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D8E80AA5A8A8A273EB49D81D5FBE510 /* Mantle-dummy.m */; };
 		87124DBB191A73AAD6B2512052EF9AC1 /* SRError.m in Sources */ = {isa = PBXBuildFile; fileRef = A37E4D4D328A0F6579C75EA99649ACBD /* SRError.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		871ED0B5664160118B1FBDF50D5B4B63 /* YapDatabaseSecondaryIndexTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 5510AF788FE9FAA4611ACB33168AF9CF /* YapDatabaseSecondaryIndexTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		871F930A3D350A33DE46C0A9086B2724 /* ProfileManagerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = F0E7DE343118333D3B22ACBA9D27E0E5 /* ProfileManagerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		8723A09ED03B10671B9E8969BA80EA92 /* WeakTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADEFB780F5009781A090E569DB299286 /* WeakTimer.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		875835BB23871668D8F3AC7935846FBE /* TSQuotedMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 00DEE21CEC8BE12BA9D980FD46AD79D1 /* TSQuotedMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		876E17FB9761E1256339782997E3F3E0 /* OWSProvisioningProtos.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = 40FD9A7F6B8D6AF6CDEA1642D31E2DCB /* OWSProvisioningProtos.pb.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		8787B576CC6D4CB84A7F45E03695EF82 /* TSIncomingMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E6B399DDB41985E9A1EBD7C60FB0304 /* TSIncomingMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		8788D04FEF8F69007918A2A17113C793 /* api.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A0EEAD31CCF786F54B69920126095F9 /* api.pb.swift */; };
 		87C3F192CDD16AE9C3B4FB5323CECBEA /* YapDatabaseCloudCoreTransaction.m in Sources */ = {isa = PBXBuildFile; fileRef = DF65DBC91E0EA91A46C0DF0C95B3AE79 /* YapDatabaseCloudCoreTransaction.m */; };
-		87DB1266B1B4CD9D4C5E7761AB9A8ECD /* OWSPrimaryStorage+keyFromIntLong.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C4DE47C5240AD6AAF4C1FE1D0E4185A /* OWSPrimaryStorage+keyFromIntLong.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		87C5AE0681100AA2F82971360FD1D338 /* OWSPrimaryStorage+keyFromIntLong.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FD1B6FB2C340B761F4A4BB4BF303500 /* OWSPrimaryStorage+keyFromIntLong.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		87E28F237E4A23B8FFE2AC43F933CDA4 /* SignalServiceKit-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 11173F7510904C73FE5849F7ADE936DC /* SignalServiceKit-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		87FBF9F27C40129FBD88F0B219603703 /* NSArray+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DCF0BAB5C770833C718276E246B2CAB /* NSArray+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		886A5735670C5E42E1C5A589C02044EB /* crypt.h in Headers */ = {isa = PBXBuildFile; fileRef = FC6F8529556A99EE8231F9E75158AC8B /* crypt.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		886E31D3B7F2E8E68CC9D50BA0CB199F /* YapDatabaseSearchResultsViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = D22F67B70E5AE0E14EF088B03E6C7164 /* YapDatabaseSearchResultsViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		88904C204EC85F40F6AFB4F9A9CF5FEE /* OWSEndSessionMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B09227097DDAECE2A8B1AA2E0ACBE29 /* OWSEndSessionMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		88929727C505F53CD7C49AB4D78F94BF /* SRURLUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 84BE6297F5A0D3F3890764BEB1F8D040 /* SRURLUtilities.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		88AA5BB61C267C3E1C664F758A122E12 /* YapMutationStack.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C9578E0EC0A6DF4F91E650754375480 /* YapMutationStack.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		88DC54EF660DE387165EB052E06D30D0 /* Provisioning.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5782C8AD593C2A5FFFB1F0A0C6009F12 /* Provisioning.pb.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		88FF36872DC32CA21F648EF14C205C66 /* TextFormatDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = EF25E0AD38352538C70FAF3845E28289 /* TextFormatDecoder.swift */; };
-		89D89E4E04D622898C50A422F9B4EF75 /* OWSReadTracking.h in Headers */ = {isa = PBXBuildFile; fileRef = BED91F6DA8CD15F04C3C7D4C1F46CD84 /* OWSReadTracking.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		8A2E67D0693C7F062445E602CE2D9768 /* Reachability.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E45F9DEBEE66EB34BB57B96BC69B26 /* Reachability.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		8A314F56E83BC494C1C95D4A069CFAA4 /* OWSDispatch.h in Headers */ = {isa = PBXBuildFile; fileRef = 0893BE6D85C604B0A2D7FAC56FDFB5DF /* OWSDispatch.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		8A6B95C1A5B411D224A4206BC7209213 /* NotificationsProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A7FA2DAC71D1A8FCBE62535A68090D2 /* NotificationsProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		8AA589F41F310D7FB20BFDBCEAC46003 /* YapDatabaseViewRangeOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = D0054D9EA39C205D526BF77994F377A8 /* YapDatabaseViewRangeOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		8AA6C06080DA2A89ED6593C221F4D2F0 /* OWSVerificationStateChangeMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 667BE2FFA46DDB79406BA7EA91CCBF14 /* OWSVerificationStateChangeMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		8AAF11DF1A1C69EA621B4A9D2AC56E44 /* YapDatabaseSearchResultsViewOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 96D7E6AEA27952A2F3C772875BD9E144 /* YapDatabaseSearchResultsViewOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		8ABC272166D43DAF8897DA3C218574A0 /* PreKeyBundle+jsonDict.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E3567A0248C1930F1CF875E793C0E84 /* PreKeyBundle+jsonDict.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		8ACC902B38963A156D88F3E7B5C6BAB3 /* OWSFileSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 241FE9D8086B95D1CA2E43FB695F91B7 /* OWSFileSystem.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		8AF83A8B3A5CDDB77138CE699EA81BFB /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1226ECB940A2EC82DA29114E2924353 /* UIKit.framework */; };
 		8B2190198807CC02E300C99C5A8BCDAA /* ge_p3_to_cached.c in Sources */ = {isa = PBXBuildFile; fileRef = 2A71B2A5D3279EC58F474DF7C0DA65BF /* ge_p3_to_cached.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		8B25E2483107F36794B9CA43910BFC37 /* OWSContactsOutputStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C1100D1C77081B6A87D71D7074C08AE /* OWSContactsOutputStream.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		8B37BDE6816097C46693EC38CA55153D /* YDBCKAttachRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 49E87D264617D23922B3F499DFB03ECD /* YDBCKAttachRequest.m */; };
 		8B381E54BD239FBA9473E630D9999F2C /* YapDatabaseFilteredViewTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 5812028427528E5A1F8C46C84E36D832 /* YapDatabaseFilteredViewTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		8BD52DFE8458CFD8504FC86A2A47F29C /* BadState.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CC87D5880B9AC57FA1D1269A3EEFF50 /* BadState.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		8B737EDB4A1DDE901E314DA57EB0540D /* OWSDeviceProvisioner.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BECC8E964198B02DB57C987F58A17C4 /* OWSDeviceProvisioner.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		8B8EA86BE84303FB864B5051238F8C9A /* TSAttachmentPointer.h in Headers */ = {isa = PBXBuildFile; fileRef = AD6EFC8A6835A1CC299DC723A188189A /* TSAttachmentPointer.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		8BE159798E8636E456D0F4BDD68FE6AF /* prng.h in Headers */ = {isa = PBXBuildFile; fileRef = 816066FAF19A6D32DF9A452B0BD84528 /* prng.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		8C09EF3E7505B767E75D95F35C8654B6 /* SessionState.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CF60CD57C6442D55B0C0BEF049E91E2 /* SessionState.m */; };
+		8C113A0A74822071C61F6DFEC1E5763B /* TSVerifyCodeRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AF21CE2B7841024D1A43E87A2BE745B /* TSVerifyCodeRequest.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		8C1F7C76C6281C4C2936FABE6B3BE770 /* YapActionItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 9593EE82EDCB9089DF203EF2001E83CD /* YapActionItem.m */; };
 		8C2AE3613C371BD09EB97011653C0E60 /* YapDatabaseSearchQueuePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 839D150397DA263D73B4ECFB18788C1E /* YapDatabaseSearchQueuePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		8C35B779B373244BBED6168B84807A63 /* OWSDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 071A24F786F3D0511D98EDC9DE7579BE /* OWSDevice.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		8C4C53C4521803A960515C963CE84FDE /* OWSDisappearingMessagesConfigurationMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D2CB7969F38990667E34BAF41EBB5F8 /* OWSDisappearingMessagesConfigurationMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		8C9C7DC91636FD5431AD782713449FF6 /* OWSReadReceiptManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A57F5765F3EDD6F5E9C81CA19317947B /* OWSReadReceiptManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		8CD125CEDB0F83C57D7062334A706144 /* YapDatabaseAutoViewTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = D51BFB18D30831C4B15D873B9FBAAC31 /* YapDatabaseAutoViewTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		8CF7E325D364388BB21D03901C831F03 /* YYAnimatedImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3442B442F8438095CB208397440B6C58 /* YYAnimatedImageView.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		8D0EC9B064D545F3EE9DC24DAB5566B0 /* TSDatabaseSecondaryIndexes.h in Headers */ = {isa = PBXBuildFile; fileRef = FF9B0AA2DA538FF97D300865E07DFCD5 /* TSDatabaseSecondaryIndexes.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		8D374BF295C3765223B15BFD904D67A8 /* YapDatabaseSearchResultsViewTransaction.m in Sources */ = {isa = PBXBuildFile; fileRef = CA5C56A2681B8CCC6C8DCBB09883D895 /* YapDatabaseSearchResultsViewTransaction.m */; };
 		8D785FFC6BB32F7325A8FCF9BF01995B /* YapDatabaseFullTextSearch.h in Headers */ = {isa = PBXBuildFile; fileRef = ADD6DE4415A2F4AE688D0816E28C13D9 /* YapDatabaseFullTextSearch.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		8DD76DFB54ED462F6ECB2D25D8940691 /* Contact.h in Headers */ = {isa = PBXBuildFile; fileRef = 143012388BF28FE5C2E878BC7FDBB8D5 /* Contact.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		8D95F6A16D59CE8EBBBA51A8B8EDD2DA /* TSGroupThread.m in Sources */ = {isa = PBXBuildFile; fileRef = C821D636DA7F75D2248A5C07538E046A /* TSGroupThread.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		8E1187FB8275077D02402B9BB8489EED /* YapDirtyDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = 008C121E1E02F1D63DAFBE7A2688E9B3 /* YapDirtyDictionary.m */; };
+		8E9DDEC7E98E04B37DBB0EFC762A5B77 /* BadState.m in Sources */ = {isa = PBXBuildFile; fileRef = A7D98573FB3580784DFD794FAEAFB37D /* BadState.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		8EA44A73AC1230F6A49CF2779EF7E424 /* DDDispatchQueueLogFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F4297736580AAB7AACC0FD762D9CAD /* DDDispatchQueueLogFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		8EBAF11651007FEEF4860F39BC1A815A /* NSData+keyVersionByte.h in Headers */ = {isa = PBXBuildFile; fileRef = 031FB93DBE1287FD83768C1E2C864F27 /* NSData+keyVersionByte.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		8EE8DF3F50ACE5F4B45C111C378644C3 /* OWSCensorshipConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F02A6C1613BADC6AFFA81311DBE70BA /* OWSCensorshipConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		8ECA26040650E2C33AF5A16C04C86160 /* OWSSwiftUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = B06E0C4A729577AF4B6715808B7506CA /* OWSSwiftUtils.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		8F298FCA0A7ECE98E81D9D37B3463272 /* YapDatabaseRelationshipEdge.h in Headers */ = {isa = PBXBuildFile; fileRef = E5D914D74C282993BB0D9CE6E6CF627C /* YapDatabaseRelationshipEdge.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		8F9C5B55FA254DDECB0946B506C5D5AC /* OWSAnalyticsEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 77E7BC5893B697095E9E6F30B35B057C /* OWSAnalyticsEvents.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		8F938FAEB8CFB08628707FD652ACBEC3 /* OWSReadReceiptManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 108535065E178B57C9C38DD6D50E730F /* OWSReadReceiptManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		8FB620268402F36F5BD3CDD2315A5804 /* OWSPrimaryStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 2941F73C7187C240ABAEEFC9E525BE75 /* OWSPrimaryStorage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		8FBB770FC5E03A90DD06088D7DBBC38D /* YapDatabaseSecondaryIndexOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0158446BCE5CD02A9C91BCCE8A0F061 /* YapDatabaseSecondaryIndexOptions.m */; };
+		8FD9C20CED0277EA56157EB209C756AE /* TSYapDatabaseObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 53ACBFDD2057FEE90EB48C548F3D241A /* TSYapDatabaseObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		8FDB91EEBD2A8BC7EFB51C35102178C9 /* BinaryEncodingSizeVisitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9ABAD88FA0F5DCDC9F9EC83B1CA5D75 /* BinaryEncodingSizeVisitor.swift */; };
+		8FEB29CFBE65CB5B3FE295CA8283514E /* NSDate+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = E5B1F47515199B7D49B7B2AA134CEC42 /* NSDate+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		902D54E869FE9E3D2FDB580549B5533F /* ChainAndIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = A97F2C41124C519608CEC5DFAE67CA36 /* ChainAndIndex.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		903D5DDA99C931BC9447ED4EEA7596C8 /* OWSAttachmentsProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 7968CD81F6A34A2DC0191AACE786180C /* OWSAttachmentsProcessor.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		905E2284C87068919AF7D4C61A93B244 /* PreKeyRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E869B251DB17126CCADDAE1E7B2091A /* PreKeyRecord.m */; };
+		90CB14DC2FE28D6E9EC278F8E21512BD /* OWSBlockedPhoneNumbersMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 94318ACB0DBDD8B0DF438B44C8A188F7 /* OWSBlockedPhoneNumbersMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		90ECABC55C4DB346655E025502A5581F /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = ADD901589E87590DB6071D9B73DEF450 /* sha1.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
+		9111918E613B904D046BC828B7958ECB /* OWSIncomingSentMessageTranscript.m in Sources */ = {isa = PBXBuildFile; fileRef = CCD4F31BBCD27F02A92A807D0C67DC34 /* OWSIncomingSentMessageTranscript.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		911E1C1200F0743A8EE4022930AC1618 /* NSNotificationCenter+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = DB9CE03C39DEA3FF2AF2EE7FC78D42CB /* NSNotificationCenter+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		916B6E4DD972CAFBD3A0587886F75C59 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = A4E331B0E6739B366322608ACD48F7A1 /* Reachability.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
+		918D88816D34CD963A8F970E5CB34281 /* WeakTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66C94825C32FAFA2D19CB436143834D3 /* WeakTimer.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		91BB6CBC79BDF223348D443BE4406E22 /* fe_isnonzero.c in Sources */ = {isa = PBXBuildFile; fileRef = 5341973AFA9FF69DD59CD0440BB047E1 /* fe_isnonzero.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		91C5660D2C31F6A91B4611FCDB8DA109 /* libPhoneNumber_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D45C1E35ABEC6A6BBF780595937BC0EA /* libPhoneNumber_iOS.framework */; };
 		920DDF3AD6658280E8F550D8C1C263C2 /* NSURLRequest+SRWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 374E808541C2F78C98AB88BB77BD510D /* NSURLRequest+SRWebSocket.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		921CF340AB173A4AC3F8378B5BE60C8F /* OWSStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 17B12C9E83E87ABC85206B959FE49305 /* OWSStorage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9225D7A0BDC48E18DD14F2C0ACB0613A /* YYSpriteSheetImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 58BA0DF2CE6725DEEDD5D8BFC357A4A9 /* YYSpriteSheetImage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		92B3561129F7C0026E29724888941AFA /* AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A5E4B1BB42AEC3AAB973151E1C5C4B /* AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		92C5D7EDCE8765D969E97F62A0EFD47C /* YapDatabaseOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 7FEBD04FEDF9AEFECFCDC63499407473 /* YapDatabaseOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		92F41BB46777FA607C568DDD8D10892A /* PBArray.m in Sources */ = {isa = PBXBuildFile; fileRef = 86FC8851397509BED9E0AE85640B9D6A /* PBArray.m */; };
 		92F9B07EF8B9F77503A68B0A5494975F /* YapDatabaseSearchResultsView.h in Headers */ = {isa = PBXBuildFile; fileRef = 971826CB06B3756BC89904DB0BA6599D /* YapDatabaseSearchResultsView.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		92FAE0D2F64B2D7B30ABE140B5B3427B /* OWSRequestBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CB6173B704474AA5B9F76ECFD145ECE /* OWSRequestBuilder.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		934649A51D676013B5720668CE1D03FD /* OWSBlockedPhoneNumbersMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 8EDEEB3EFA77F9B6CAD65DE7B437A136 /* OWSBlockedPhoneNumbersMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		9361F15B78129C02DF97BE1991B42803 /* OWSMessageDecrypter.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D5A902A15173DC16F0108AC9153D5BE /* OWSMessageDecrypter.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		9307418D26AD9A5DF7F3B2CCC0437606 /* BadArgument.h in Headers */ = {isa = PBXBuildFile; fileRef = DD69B9600F1759408BD75489DAE2D018 /* BadArgument.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		94099D36AA4E722159E8097C0F29EF78 /* OWSOrphanedDataCleaner.h in Headers */ = {isa = PBXBuildFile; fileRef = BF9E7C59CAB1D19FBD0380C4D716E611 /* OWSOrphanedDataCleaner.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		940CB4F33A265CE40F9AFC6F621E02BF /* sc.h in Headers */ = {isa = PBXBuildFile; fileRef = 8177D17DED31641749B10EBA14698505 /* sc.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		94538269A9FB0E3171648C03814BB1E4 /* AFAutoPurgingImageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = D37FA31908C8A38F0452743A7E38EA1C /* AFAutoPurgingImageCache.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		947906FA199031BBA07857432A0F7836 /* TSDatabaseSecondaryIndexes.m in Sources */ = {isa = PBXBuildFile; fileRef = F0401DB050A9995150C3A9A283E36255 /* TSDatabaseSecondaryIndexes.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		947E91899076BF496E526D356E5D9F5F /* SwiftProtobuf-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 44260A4954413EBE2D5564F65AFA3372 /* SwiftProtobuf-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		94850C35B65B97136431F88060AFC0C7 /* NSError+MessageSending.m in Sources */ = {isa = PBXBuildFile; fileRef = 298381EB8EAC1709104D74910D55D413 /* NSError+MessageSending.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		9490DC7652E6EB0B65F7029FD3787361 /* DDASLLogCapture.h in Headers */ = {isa = PBXBuildFile; fileRef = 597DED59FFE308998A410D451F4F1B5C /* DDASLLogCapture.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		94C37FF0A63BFF61D2E70590199EF6C2 /* AFURLSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 20326FDD7B7912A23FE46036408439BA /* AFURLSessionManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		94DC81CB5F60175577367932EC9BAD8B /* OWSHTTPSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = F07702B47EB4881E2F25D6E50AF5F655 /* OWSHTTPSecurityPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		950376FD362FFA38B70961E63B8935B8 /* OWSBackgroundTask.m in Sources */ = {isa = PBXBuildFile; fileRef = 7355830E51ECC78EAE38388E1E9F3C11 /* OWSBackgroundTask.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		950FA73AF2016E1D37AC8CA640C74232 /* OWSDisappearingMessagesFinder.m in Sources */ = {isa = PBXBuildFile; fileRef = F631165837D7A47024E20D3BBC907F54 /* OWSDisappearingMessagesFinder.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		951000A6A33B20F0807F0EE3906439AC /* OutageDetection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36B153DC65DDD85B5C92A24D684258E1 /* OutageDetection.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		95151027677039F1820F7F98B692B9D5 /* YapDatabaseRTreeIndexPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = EAF33202CDF0688CCA67373D3A52C8B3 /* YapDatabaseRTreeIndexPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		951F2E9500AAE5D071F00834B7F186B0 /* ByteParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CED919651EFE0027B1950434246D9C0 /* ByteParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		95C8181B718CCC3AF16E0EE0E20D4CBB /* OWSDisappearingMessagesConfigurationMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = AB583B11EEFA4314CC7C2B58705B4C00 /* OWSDisappearingMessagesConfigurationMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		95E82ABED2AC3185858D47AE74051269 /* YapDatabaseQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = 714DA607045059A381980AD04B80CE24 /* YapDatabaseQuery.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		95EAB96D3EB54D934F25DBDA16E9F5B5 /* MTLReflection.h in Headers */ = {isa = PBXBuildFile; fileRef = AF55029E4C9991D6B841823015871A82 /* MTLReflection.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9606D25CA89496E483448EFB3D303216 /* SRIOConsumer.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A387A8A92BCBB201B39BA066F8AECC3 /* SRIOConsumer.h */; settings = {ATTRIBUTES = (Project, ); }; };
-		964C134487FDC9AA4178D277E4B5186E /* OWSAttachmentsProcessor.m in Sources */ = {isa = PBXBuildFile; fileRef = 25B437DF8B726AF9B65CEA2BB1046C7F /* OWSAttachmentsProcessor.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		963D98B3F4CA21242AD00512975F5722 /* WebSocketProto.swift in Sources */ = {isa = PBXBuildFile; fileRef = F51EEA8A6A450EE11416380C7C307A60 /* WebSocketProto.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		967D0E9FDE74BA1F9099E9CAF62BD135 /* NSError+MTLModelException.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E9B5E8035BB2DF1B72CF74112D2365 /* NSError+MTLModelException.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		968A8D6E80BFBE366D074229F5F1E48D /* PromiseKit-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = C0D9B03D9D4F24634D0D348BCD21308D /* PromiseKit-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		972D574F996815F0406F9C71432440BF /* PromiseKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 73DCB182D945DCFEB32A7F918C569802 /* PromiseKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		974D9D5D2C4AC2274CC6E6928F15DF94 /* OWSIdentityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 08575BC5C7EE825352C80CCA3F5EA9CF /* OWSIdentityManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		976EEE082C0B814691DA583C0A275BA8 /* UIRefreshControl+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = F2FC88A2F80932EF6E96DD2382B9EE00 /* UIRefreshControl+AFNetworking.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
+		976FEC9BD2B713F86B3FA4347AA743B9 /* OWSRecordTranscriptJob.h in Headers */ = {isa = PBXBuildFile; fileRef = 075BCB0FBBEB977829D52154B3F814D4 /* OWSRecordTranscriptJob.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		97760AABB746C6EAE7A65B35438B8786 /* SignalAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E62FC4F5F7B3442992FD334B4F63EAB /* SignalAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		97797EFC9FB055AED5EFA49BAC778903 /* TSConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = F70103724A492A4F2EFF4E65C1581CC2 /* TSConstants.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		97A0BFD8005FBF201FAE91773A21D34D /* OWSContact.m in Sources */ = {isa = PBXBuildFile; fileRef = 90B697318E4B747966BE4C4C7209EE59 /* OWSContact.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		97A0F13D11EB173D16B3DDE5A0B6FD71 /* ProtocolBuffers.h in Headers */ = {isa = PBXBuildFile; fileRef = 84E6BE0CA78F6A4E1B33D31D3F9C094E /* ProtocolBuffers.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		97F1A9D1C0A726B46EBD3C090FC2E3C7 /* OWSLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 343B93F86FDDA869FDA6BAE5DECEDA3B /* OWSLogger.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		983C3ECB2872BC13C3D7F24B8FF66ABD /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.m in Sources */ = {isa = PBXBuildFile; fileRef = C7E88C37B63D1B5450CC492FA86BAD77 /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		987FBCAF267E94E1FCE01D66B6FA2C9D /* OWSMessageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 22C14B755CB9F693EAE950700239D783 /* OWSMessageManager.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		9884DB7887557F0720B7BFDD8392ECB7 /* compare.h in Headers */ = {isa = PBXBuildFile; fileRef = 60D66445A4F9A809F679ACE4144CA493 /* compare.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		98CACE9983DBB65406BF6923EB349809 /* YapTouch.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C52A618357790355BFEFC36565AF073 /* YapTouch.m */; };
 		98E9E1C14E436ADB7CCBB3F42B0627EF /* SessionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 5728EBD0C4AAFAF6F1AFAE0F0E8BE379 /* SessionState.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9907C076270108542CF22F96E2737062 /* YapDatabaseViewPageMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = D1BB57B6AD81C0DF82FA7EAF9FEC559C /* YapDatabaseViewPageMetadata.m */; };
-		9912EE153352A68334B6E3480943D01D /* OWSIncompleteCallsJob.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B96A139B687FCCC4F3C3A1800CAAAA2 /* OWSIncompleteCallsJob.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		99387BDA2D8774B314C4EBF46E8DDCC6 /* OWSDisappearingMessagesConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C4DE8F9E1F66FC5E7696463BF0E09B2 /* OWSDisappearingMessagesConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		99A3AC29181AC684A251E0BF089771CD /* YapDatabaseCryptoUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 755E7CB9088D3418CDC05297B19E977F /* YapDatabaseCryptoUtils.m */; };
 		99CE44356D4D353EBE9AE74E6FBE6D1A /* open.c in Sources */ = {isa = PBXBuildFile; fileRef = C730C6A684EB5406E1F26FAD8DC7021D /* open.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		99E9BF10C42A27E89B5018E14D1E4F99 /* OWSWebsocketSecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = 50806551F77ED533C85531F6EB834F68 /* OWSWebsocketSecurityPolicy.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		99FB882923BD09FADEA7B0249D0C2BE8 /* OWSContact.h in Headers */ = {isa = PBXBuildFile; fileRef = F4D7A91B7DCEC1C62C061D2FFB52DC9B /* OWSContact.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		9A1B3FCD4187450C9616CE7F9B1C8229 /* NSURLSessionDataTask+StatusCode.m in Sources */ = {isa = PBXBuildFile; fileRef = 34320BDBD45225021843DAE8BBBF69F1 /* NSURLSessionDataTask+StatusCode.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		9A23F3C66309145FF0F3EC2F3B852762 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
 		9A6394E1673353D4848356DA4ECF4530 /* SRPinningSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 91D09585AAFC4A384B5469C66E09D7B2 /* SRPinningSecurityPolicy.h */; settings = {ATTRIBUTES = (Project, ); }; };
-		9A6EE11A511AAADF418C8D5CE5E855D5 /* OWSLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 7051BA719B3C071098AFD4F2AF41A4DC /* OWSLogger.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		9A73395CB31D10B33FABA702AFA037FF /* Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F26671CBC733B8BC737D199B44A2972 /* Promise.swift */; };
-		9B1CEEBCC6863C2DD3698088943DF67E /* NSData+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = 340643BD1BFC9A5A6E6CF39344EEC514 /* NSData+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9BA29B39278640AB26E58F8F2569B313 /* YapDatabaseExtensionConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = D8E084A41152D558F5877FC47D724249 /* YapDatabaseExtensionConnection.m */; };
 		9BF446B2AB8C7DE40F5168AA5475172F /* YDBCKChangeRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 5E689808E04C3BEED672C04E8A328826 /* YDBCKChangeRecord.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		9C463BA2FCBC3D89448FCB86F3F4B520 /* curve_sigs.h in Headers */ = {isa = PBXBuildFile; fileRef = 40609413CD20975C8F021B5549372A7E /* curve_sigs.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		9C78C6DECB90B6056068E9FBC59E4F62 /* YapDatabaseSecondaryIndexPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 188970BB1B37361607766C9E123442A0 /* YapDatabaseSecondaryIndexPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		9C7E02C56F62B66D51A8A5C67FE95821 /* CodedInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = B1E3F343179DCCEB57A5AD9C91034D18 /* CodedInputStream.m */; };
 		9C8356A0A2A6BA115BFF2A51F7F76D57 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
+		9C9FDDE6F30D60862C1ECB6919B180D2 /* BadState.h in Headers */ = {isa = PBXBuildFile; fileRef = 94D3FDD1A240DA373FD7448379474C8F /* BadState.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9CAE8D9D5196DE46CBBA8F7387E22D56 /* YapDatabaseSecondaryIndexHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 94EE2C7BF76300AC94BD20E8456B8159 /* YapDatabaseSecondaryIndexHandler.m */; };
 		9CCBE614288CDC7F4CECA1D2A7995518 /* YapDatabaseCloudKitTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F42572C4941BD247D1D77D5557EFA3 /* YapDatabaseCloudKitTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		9CDAF4A4BC7E6DCCA2F8F648512E9F46 /* OWSMediaGalleryFinder.h in Headers */ = {isa = PBXBuildFile; fileRef = 341D6C26F8B718F82D62436807A19672 /* OWSMediaGalleryFinder.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9D11128D49349AA661B040B431D9EFB2 /* SRSIMDHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 46579B59D8F61FC1B96EE2B16C67E0C7 /* SRSIMDHelpers.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		9D3407C1B5FC09408985A91B755611CB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
-		9D61D1BDCA86F32665EFE2C91BB42FD7 /* OWSDeviceProvisioner.h in Headers */ = {isa = PBXBuildFile; fileRef = 116DF0F36D875D67E7ACACD7E5FA0879 /* OWSDeviceProvisioner.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9D844549025D21C03EF0B92B2B6A1545 /* Promise+AnyPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB75C97D9F4498D3E96AB1DDB0005B06 /* Promise+AnyPromise.swift */; };
-		9DA104FCE0F0ADA9A7A245237C7075AA /* TSAttachmentPointer.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D0E1FAFB33224B3CBF6C84C2F61D2F2 /* TSAttachmentPointer.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		9DB44971118EAC86704F4A6FF717D4BE /* YapDatabaseHooks.h in Headers */ = {isa = PBXBuildFile; fileRef = B25983951E9473A96ACC840AF59472F1 /* YapDatabaseHooks.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9DFA4D077FE25B57E7317A5CF5B2DB0A /* NSValueTransformer+MTLInversionAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = DBB8E8A9DAE9B7A8201E0DB0B28E4A14 /* NSValueTransformer+MTLInversionAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9DFF70C7117830FDF2ABD78E00A5DEF8 /* YapDatabaseCloudCoreOperationPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = E8FCEEBF46DF051B2451562B3E37CD34 /* YapDatabaseCloudCoreOperationPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		9E07FDF404D275045FA22EC2B8CDF778 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
 		9E0A22B50B1A2AAA7C3CF21C33910112 /* Google_Protobuf_Any+Registry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AF7FE4D4D84F1E85ACD9CAE57568931 /* Google_Protobuf_Any+Registry.swift */; };
-		9E0BD0FEAFFE3CC8EDA356EC1D2DA6AA /* TSMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A353239A2F5DB1F69EA1B8F137345E1 /* TSMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		9E191CBB6D43C9A89AFC7178FDB00B84 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 672CEE510CD88CAA449178C85FF33DD1 /* MobileCoreServices.framework */; };
 		9E2D2C1583BFBD2CA9F0C68FFDEC7B49 /* YDBCKChangeQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D8DE791F037FA39EFB8237C49C126FB /* YDBCKChangeQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		9E3CE36BF2A8BC0CE0C9175EFDFA00B5 /* NBMetadataHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 26183B2DB5853FB301E6AC2102E4869E /* NBMetadataHelper.m */; };
 		9E72FDD1934D7A85B08728FA0A31D4F5 /* YapMemoryTable.m in Sources */ = {isa = PBXBuildFile; fileRef = 8280E6EC7EC4129CA6AAADEB539C67E0 /* YapMemoryTable.m */; };
 		9EB1D95A85C5AD61BE4E05F417B39868 /* YapDatabaseRelationshipEdge.m in Sources */ = {isa = PBXBuildFile; fileRef = 3396639BA2F239D7CA63505ADCF7BDCD /* YapDatabaseRelationshipEdge.m */; };
-		9EB4A9344B7BF267D53BC5CCD9B728A8 /* OWSOutgoingSyncMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = E9BA554A07FD4C0AAEDD2599860A92BD /* OWSOutgoingSyncMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		9F090199BEF803AB39877D259BD0F377 /* fe_tobytes.c in Sources */ = {isa = PBXBuildFile; fileRef = C08CC4B1A70FF79391F2D555B6F8039D /* fe_tobytes.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		9F8881EF5902F8037E2DF70E3C2A2CC5 /* TSAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = A04F52856FCC4437AA59675217FC6B59 /* TSAttributes.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		9FB588648EB4D0B9F40FED8A7184CB38 /* pow225521.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F78E3BE9A9AD95EB9D8EB58BAB52736 /* pow225521.h */; settings = {ATTRIBUTES = (Project, ); }; };
+		9FBA3E63772879CE34CD476416062740 /* TSInfoMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 862376E2432440456445CE750F156E5B /* TSInfoMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		9FD6333DC727D0686CBC49E51176207F /* OWSIdentityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4647B51C5238D60EE7150931EF1F819A /* OWSIdentityManager.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		9FE42284660265ED0456311B5CECFCED /* PureLayoutDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A5DBAA5DB83691C7E78FCE27CA6485A /* PureLayoutDefines.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A00C49470F258B093051A8740D8F899D /* NSString+SSK.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DF161EF1F5AF9F1B3C0EF7F66028DDA /* NSString+SSK.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		A0492FC1066EAF62ADD0341890871997 /* TSStorageKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 1E32D54FF306AF2DC89825CFD58AD92D /* TSStorageKeys.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A06E1C2F27A405D1326E6025BA48A7E3 /* Visitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03431675C2690F6D543CBBC4A09D46FD /* Visitor.swift */; };
 		A0B401907761E3D4FE76A6EC8302CC46 /* MutableExtensionRegistry.m in Sources */ = {isa = PBXBuildFile; fileRef = 53B20DD656C27FD676C895B65A156C45 /* MutableExtensionRegistry.m */; };
 		A0C013905D3200AD3F85214BE86552D5 /* NSDictionary+MTLManipulationAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A073B11F26E496ADA7F58FCFE025877B /* NSDictionary+MTLManipulationAdditions.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		A1328C70CE1A280CB1C68B7A12C25DF0 /* FullTextSearchFinder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D9846201C785B61728B211C05628CEF /* FullTextSearchFinder.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		A1532EE01261C65DDFB6B4671EBFB4B1 /* TSAttachmentStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 466DD73B6EF54D1E3A297D1982CD568A /* TSAttachmentStream.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		A115F945801FA0690DF2EAFCAF38D492 /* OWSBackgroundTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 0EC5C462F0679A6B1DD6512A4E6DAB97 /* OWSBackgroundTask.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A17498D159E85244723DCE38C55E3408 /* YapDatabaseFilteredView.m in Sources */ = {isa = PBXBuildFile; fileRef = 0622C017D0958DABD71D39C573869F2B /* YapDatabaseFilteredView.m */; };
-		A1CEC5A564912867C8C997F350F68E1D /* OWSAsserts.h in Headers */ = {isa = PBXBuildFile; fileRef = 77A6474B2713E1851F707240DD972CC4 /* OWSAsserts.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A225FE6E084E96315EE31AD0452D4F23 /* OWSPrimaryStorage+SignedPreKeyStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 01774CB3C3CEA2D81316D45375550178 /* OWSPrimaryStorage+SignedPreKeyStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A26A148FACE26697927F95044B75A30C /* aesopt.h in Headers */ = {isa = PBXBuildFile; fileRef = 875DCC4CB3F63B31BECFA3F115370A6C /* aesopt.h */; settings = {ATTRIBUTES = (Project, ); }; };
-		A2D10E303A6C7C9D63B023F88145F112 /* OWSDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 43CF70AFBF22B0BAC9826C6C756BF35E /* OWSDevice.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		A305E8B9173384984EDDCB2E24975394 /* TSCall.m in Sources */ = {isa = PBXBuildFile; fileRef = E9195C958F6BA7FB29538724DE01EE95 /* TSCall.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		A37AE6C2E6F65FCA424C91FB8642ADF9 /* OWSAddToProfileWhitelistOfferMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D44F05E1707CC0EC9576D19A44F326D /* OWSAddToProfileWhitelistOfferMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A382DB5E76193BDEC2222BDDC0F91856 /* NSURLSession+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = E45A5611438C3603883F32C51A515717 /* NSURLSession+Promise.swift */; };
 		A3B81487AD398FA84D6CA720495486FD /* EXTRuntimeExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = ED58D8990DB09CF13CCA22297700AABF /* EXTRuntimeExtensions.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		A3DF1CDE38058089DEAA48989054E7A9 /* BinaryDecodingError.swift in Sources */ = {isa = PBXBuildFile; fileRef = A61CCF6F3329F88E7099E383F957FC4E /* BinaryDecodingError.swift */; };
 		A3E21118272B067AF73C7B0E09B0282D /* EXTRuntimeExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = C39734D1F85C8C7CD804B81F2CEC7DDA /* EXTRuntimeExtensions.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		A3ED196C3B1DA27367B665FEDDD56F58 /* brg_types.h in Headers */ = {isa = PBXBuildFile; fileRef = CF6517B8DB0D5956009A7E0041C8E135 /* brg_types.h */; settings = {ATTRIBUTES = (Project, ); }; };
-		A489B79FE731751902352E5B142515AF /* OWSOutgoingCallMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = FA52478855E389788B4AACD2BCD40FA0 /* OWSOutgoingCallMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		A4A5E70BF3F899FEB683684F5A32614C /* YapDatabaseSecondaryIndexConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 43098D09FEEC73CB216B17D84C5EA6FB /* YapDatabaseSecondaryIndexConnection.m */; };
 		A509F561D8774B5D15A88290726E9E5C /* base.h in Headers */ = {isa = PBXBuildFile; fileRef = 884692D543E7DC5043C2A89083232FEA /* base.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		A5628F33C8DE442ED7064D87DAD46C2E /* ExtensibleMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFB79B85A02B9E90BFE0C4A6C1B0FA81 /* ExtensibleMessage.swift */; };
-		A5656058857EF233CD39E8115ACC072C /* TSNetworkManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AEF39334EBE6F2564F416834C985882 /* TSNetworkManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A56D06981FB7AFEDDA6DAB234A50DB2F /* Ed25519.m in Sources */ = {isa = PBXBuildFile; fileRef = 11445833B2969B23F0F4AFBAB14B2EA1 /* Ed25519.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		A58DE693F584C5FC6800596F370CF0D2 /* TSMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = C34574B2BFD4CCEE88AA9979DF847E61 /* TSMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A58B6FF88FC75C3106428FE286F1C2BA /* OWSPrimaryStorage+Calling.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B2D8ABED50562D5C1617DFFA248E3DE /* OWSPrimaryStorage+Calling.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		A591323D0DDFDB7A5FB90842D54DC5F4 /* SRSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 50EC86727001F94393807DC0AC225CFE /* SRSecurityPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A5A56D6E5AEDDA232E2056397F58128F /* YapDatabaseViewMappings.h in Headers */ = {isa = PBXBuildFile; fileRef = FE028EDC6304AFA2D685B9C4438FB067 /* YapDatabaseViewMappings.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A5A6120FC856633A66382E66FE1C450D /* Message+JSONAdditions.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACA16AB8D475BBCF7AB76CDD102AA582 /* Message+JSONAdditions.swift */; };
-		A5DCCE9F331D33983C5D09A207DD8879 /* OWSDevicesService.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F3BBAB32BF70C93B1520883E3FA90D6 /* OWSDevicesService.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		A5CAF3BF5BC02B5558631BE7E3179C9B /* OWSPrimaryStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E4790A1194FF7CCBE21424D6A2CB910 /* OWSPrimaryStorage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A5EA8900A917764819592383664C887F /* OWSFingerprint.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BC374CC89C11921D965544CC3EBD925 /* OWSFingerprint.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		A5F3CB35FBBB4D86F4DF8951B85C5112 /* EXTScope.m in Sources */ = {isa = PBXBuildFile; fileRef = F73BD94F9399045E45E781E780B0200F /* EXTScope.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
+		A66E3A518771BA8F86CDEAA76130CC68 /* OWSSyncConfigurationMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5EF96254992E503E99BBC7960DAD69F4 /* OWSSyncConfigurationMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A67D5E1DD842A47F550D7305233193D2 /* SRLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 5529109E123F992E0206638D9B88A216 /* SRLog.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		A68E433F4A695C39DE385D5EF653035A /* aes_ni.c in Sources */ = {isa = PBXBuildFile; fileRef = 08904FD5421EA2DEB6CA929CEF6914E8 /* aes_ni.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		A69AB5B39F674CBD53CA925247FEEF02 /* OWSStorage+Subclass.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CAEA36AEEF712AD191C55AFF26527A2 /* OWSStorage+Subclass.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A69D80BD366CBC8460D90D2F3FC8D319 /* NSObject+MTLComparisonAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 3001C9A686CC8DD7BE36E4CD0DDE9AF1 /* NSObject+MTLComparisonAdditions.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		A6A54BABE90B8E1D66B9F10270A2B91B /* SRHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 06205F4D53CCBB10728547B2D6839845 /* SRHash.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		A6ED0B32E658196B286D38AED72797B0 /* AliceAxolotlParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5661A9AADDC5B0791BEACB9C3658B3 /* AliceAxolotlParameters.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		A6F02FF015BAEE67F42A8AFAAD22BAAD /* OWSRequestFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = A487CF1EAF4EC94EBC80CE340CE7C534 /* OWSRequestFactory.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		A6F9A668B89F81442AE5F736FF405AC4 /* YapDatabaseFilteredViewTransaction.m in Sources */ = {isa = PBXBuildFile; fileRef = C09675336CB4CCD42E9DBDF66FE80C3A /* YapDatabaseFilteredViewTransaction.m */; };
+		A6FD8FB5A21FD8CAABF9F005645FDE69 /* TSPrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = 275758C11772E395A44B710876719E1B /* TSPrefix.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A6FF35A7918CE9359EB0FC382478AE92 /* AbstractMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = B9399EBEE32C7923D33729DD709F63FC /* AbstractMessage.m */; };
+		A7326E86D4F101A4F4F99590B3D9A55B /* OWSUnknownContactBlockOfferMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 668B495FE40701A1A357AE4442642BE4 /* OWSUnknownContactBlockOfferMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		A7535322389C6A1553F24F131EBDA72F /* YapDatabaseConnectionProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = C554D54AD4352A273FD9675A74691E23 /* YapDatabaseConnectionProxy.m */; };
 		A7729D60979613BFE43FF9468E76BB93 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
-		A7E003622B06E3CDABEEEEB27B1E2567 /* textsecure.cer in Resources */ = {isa = PBXBuildFile; fileRef = BCF2316B1AADDCBE5CD553C6EE306731 /* textsecure.cer */; };
-		A7E5B26E15614CBE48B29264425557C7 /* OWSUploadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = F32D85BD5DDA763EECB28D71CD58A714 /* OWSUploadOperation.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		A7E003622B06E3CDABEEEEB27B1E2567 /* textsecure.cer in Resources */ = {isa = PBXBuildFile; fileRef = 26F44995B18E1A0CC8374021C2391F06 /* textsecure.cer */; };
 		A807D9085F8D0C57AEA3F09F9BF59067 /* NBPhoneMetaData.h in Headers */ = {isa = PBXBuildFile; fileRef = 7F699B21B71C75616998D8843587ED1C /* NBPhoneMetaData.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		A8435D7B4A04948E13E7312F5B4A89B5 /* ByteParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 89045AD5563770A8C168A08A0B4972E2 /* ByteParser.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		A845C1E5FB25FB50CE82E4D51614A7DF /* OWSFingerprintProtos.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = 00F684F2BF62BC9279EE67BEDEA7672B /* OWSFingerprintProtos.pb.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		A847CB668967B026D2C969A055D20E39 /* OWSCallOfferMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = B70282588C815066CFA577E06E12AC22 /* OWSCallOfferMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A82AF8AAF8C430B270113DD1D7C87900 /* OWSUnknownContactBlockOfferMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = D25366A7C3DD93AE19D0F90B138C7FF4 /* OWSUnknownContactBlockOfferMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A851EB4F8E86D1E283D4DE13629EC399 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF3DA11CD9B47FE040AAB36EA62B5852 /* CoreTelephony.framework */; };
+		A853C14898257817656C954CE1B6062B /* OWSContact+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 59A8C2B91F7A27A7351A00B64F929426 /* OWSContact+Private.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A85EAE983CC0DEC2098A4550D87ADAAC /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4CE3189430CB0751FDB2B3F0D577A99 /* AFNetworking.framework */; };
 		A8B348A19B8CBA0364E5DABE2AF48650 /* YDBCKChangeSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 045BFF07CC3146C5C3CCE5B20E5A2464 /* YDBCKChangeSet.m */; };
-		A8FDF006B059C14DA37258D7A2EDC82D /* OWSBackupFragment.h in Headers */ = {isa = PBXBuildFile; fileRef = E56669DA81F7018732B8268061ED6618 /* OWSBackupFragment.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A8C0084E7A35F6A775A5229B24A9991F /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 518AD2F9804CAB60B809061ABAB3F3B8 /* NSData+Base64.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		A90A5AF62E49CBB6042E156FC972DFE6 /* pow22523.h in Headers */ = {isa = PBXBuildFile; fileRef = 82D92B7DE46AAC9BB71F26C18CDE375E /* pow22523.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		A9266856B176C095340F559E2F961851 /* SRMutex.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E033E8D2FF5A66526CBE30C84993924 /* SRMutex.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		A99D2F83CF46A69FB33E82D3186FDC1F /* YapDatabaseConnection+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = 21BCEE340F37BE33F7E2B4D26C3AE9AC /* YapDatabaseConnection+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		A9A406871150EC3F5C7BA90399D203DB /* OWSPrimaryStorage+SignedPreKeyStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 67D3A2928796AC9C4BF3DC24173CF23E /* OWSPrimaryStorage+SignedPreKeyStore.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		A9CCA0CE852E4D96E045905BE8AB4686 /* SerializationUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B5E1D9BAF4C36A347F6AF09D77D07C4 /* SerializationUtilities.m */; };
+		A9FCAEDB2B563EB15907597F729CE3B1 /* OWSStorage+Subclass.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F58622245F60AD7ABC5E616F55EF5CE /* OWSStorage+Subclass.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		AA4660E2E8D5D89225E96E393534EC31 /* ge_tobytes.c in Sources */ = {isa = PBXBuildFile; fileRef = 4E102F3A656CA7AB56B2AA5AF09ED828 /* ge_tobytes.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		AABAFE796818EE63721CBFE4425C8139 /* OWSDispatch.h in Headers */ = {isa = PBXBuildFile; fileRef = DFE5EB3520EAF5808BC9E0A6DA6B1503 /* OWSDispatch.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		AAC57F18034A02FD92ACE63C54242674 /* NSURLRequest+SRWebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = B423DC7873B0C58405217476075A5FF6 /* NSURLRequest+SRWebSocket.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		AADAF70579E599C682C8A53233313238 /* OWSDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 3313B915D87FEF48D617EA911E54C68C /* OWSDevice.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		AAF6C103086686F7201B32F146D0970F /* ExtensionField.h in Headers */ = {isa = PBXBuildFile; fileRef = 17276945622586E39A50D0EF45520FFB /* ExtensionField.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		AB1D0C320EAEE4E14292513D6E48ED9F /* DispatchQueue+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCE0EB314B836CDFD5BB29A1FBFB035E /* DispatchQueue+Promise.swift */; };
 		AB66C804F533B9A05448E24FF8A4859D /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 2741F03BD1A72B365666088322A17BE8 /* unzip.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
+		AB752F05C595550ED683287759BCF47A /* UIImage+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F735985656EE5B82E9A59291A91532A /* UIImage+OWS.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		ABEA099D20E627AD94F8069B7A7AF939 /* YapDatabaseViewTransaction.m in Sources */ = {isa = PBXBuildFile; fileRef = 139DDA9A9A55DA3D5A987EE5A3BE1424 /* YapDatabaseViewTransaction.m */; };
 		AC05F3A9E01B01198A3D27FFE459C791 /* YDBCKRecordTableInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 54F97D5EDE8FD0BC325B496AE0D5A30B /* YDBCKRecordTableInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		AC2BDAC8F82548CB763F6CD441F91CAB /* OWSCallIceUpdateMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = D27036F11A73CFF04719DE21EA403D2E /* OWSCallIceUpdateMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		AC7976BECE080DC6E29BE4AFA650BC71 /* GSR4.crt in Resources */ = {isa = PBXBuildFile; fileRef = 82DF67E166EE8390B11DF63F8C9A1ED3 /* GSR4.crt */; };
+		AC38CCABE75E5A405A845E467409FDE9 /* OperationFailed.m in Sources */ = {isa = PBXBuildFile; fileRef = A52E14A402BB0FB86A2538D29D757A2B /* OperationFailed.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		AC7976BECE080DC6E29BE4AFA650BC71 /* GSR4.crt in Resources */ = {isa = PBXBuildFile; fileRef = F33535F61A45AB839CD158E9A9B6528A /* GSR4.crt */; };
+		ACF7B9E1CBC1DD885DF0CAF20B75DEE6 /* Promise+retainUntilComplete.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28FB771656DD9B1F0EA3A857C341F41D /* Promise+retainUntilComplete.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		AD0A200871DC729FE2BCE76D30EBF434 /* YapDatabaseRelationshipEdgePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 02EF9A8879082680FD4E1529A7784A1F /* YapDatabaseRelationshipEdgePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		AD1A5A246E606188F2C8ED6A0A2CB514 /* NSNotificationCenter+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 225B29321380AF82AD5B52167E58E9FD /* NSNotificationCenter+AnyPromise.m */; };
 		AD284A2299AA6853C606A1AB621C3677 /* HKDFKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E5718D39EE88DBA37458533790CA57BA /* HKDFKit.framework */; };
-		AD6030455DCD561F3BB5FFDA1D06CAA7 /* OWSReadReceiptsForSenderMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B42151CB1C32FAD2027C773B0AF2EAA /* OWSReadReceiptsForSenderMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		AD7D33CF45DADE74E63769250E0FB1E5 /* DDTTYLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CDF09C23B6CD24E5D24BE08AFA98705 /* DDTTYLogger.m */; };
 		AD816DB0AFB8B0D8FE1D9E47E7852445 /* CALayer+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 26A7217BB0BA27CA6C8EECEE160D8957 /* CALayer+AnyPromise.m */; };
+		AD88582347A871F9CCA297D97F02A034 /* NSUserDefaults+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BCC1A80A46B04B2CB6232972B4A0678 /* NSUserDefaults+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		ADD1A033C0BD67A71319B568E0893396 /* YapDatabaseActionManagerConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = CD6898578DDFB4D0C0E42C1AD39A7F77 /* YapDatabaseActionManagerConnection.m */; };
-		ADD465D40DF15862A90971AB67D6A7F3 /* OWSCountryMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 41028999D598531A11F32FBD6AC8F717 /* OWSCountryMetadata.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		AE2DE8052382282E0E6456AF156D3957 /* TSQuotedMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FAC6A25E6B4FBCEF95B56E03D65B3EF /* TSQuotedMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		AE3C20630E7135EBF0C0F7139EAB8B92 /* ContactsUpdater.h in Headers */ = {isa = PBXBuildFile; fileRef = FAEAEB6856E3B8844C3C46F0E6B2C59B /* ContactsUpdater.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		AE47EC7BB0A730DE6C65A914C94A3F3B /* OWSMessageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F5DBC54477F173CE4322BB2A8F0AB556 /* OWSMessageManager.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		AE08C170C8314FA8E4DBF6DD051D87C9 /* OWSSignaliOSProtos.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = 6740843C68EF6A758AD3BB898B43B642 /* OWSSignaliOSProtos.pb.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		AE4ABD60D55C3B191C2177CE1BAC562B /* YapMurmurHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A4E30D1FDAB30466FC1B2893CA3FBCA /* YapMurmurHash.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		AE762D7DF2DCC4E3E31B2ACBE105B9EA /* Google_Protobuf_Value+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F46F4EBC90337D76725ADEDE9EF75248 /* Google_Protobuf_Value+Extensions.swift */; };
 		AE8EA518B14ABFDB22DF3F5FA18B1AB3 /* curve25519-donna.c in Sources */ = {isa = PBXBuildFile; fileRef = DB59C21EFF2DFE0333BAB5FB79828ED5 /* curve25519-donna.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		AEAF90882BFDD4D27034B86DCA59CE97 /* SignalRecipient.h in Headers */ = {isa = PBXBuildFile; fileRef = F997C9D5DEDD97E353F0E383691F358D /* SignalRecipient.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		AED75221D538054DBD4D0CE8E7B2F116 /* OWSFingerprintProtos.pb.h in Headers */ = {isa = PBXBuildFile; fileRef = 92B7627F8AFB212AF3A25D78AE413159 /* OWSFingerprintProtos.pb.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		AF1DB507506E2C1C1082412AF2900393 /* YapMurmurHash.m in Sources */ = {isa = PBXBuildFile; fileRef = CB2C7DE131565BA4D0B3A808C0F22AA7 /* YapMurmurHash.m */; };
-		AF3028A08E356AE70CED4DA9E77490D6 /* CDSQuote.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B19412213EDD2F55EC4D9B70DD56520 /* CDSQuote.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		AF599F71CC8689A428123C3F8C618756 /* OWSFailedAttachmentDownloadsJob.m in Sources */ = {isa = PBXBuildFile; fileRef = 030DF529C31A24D2B5169866C68051E7 /* OWSFailedAttachmentDownloadsJob.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		AF5BEC9B2FACC9C8D57DEAD9848E1E92 /* MTLReflection.m in Sources */ = {isa = PBXBuildFile; fileRef = 135B7963B5848FBD734F4A4A9E11099D /* MTLReflection.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		AF977920E24DB593AA3212DAE6D8F097 /* SignedPrekeyRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A5FA49AA01FAC290BF2C2ED2511CDBD /* SignedPrekeyRecord.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		AFEA8E7862FF4FE4CA5EF75E1D7FBE4C /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 056B6192E98A8F64952F27F78DFE8A95 /* zip.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		AFF81C224BECA1A18BA09876656CE162 /* RKCK.m in Sources */ = {isa = PBXBuildFile; fileRef = 9064B28AFC3E20939753EFB2B9A2C6AF /* RKCK.m */; };
 		B0170B61DFAEA14FF873A3E82E206DAF /* MessageExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03209DCF8C62522BF65CB936CB78A2AB /* MessageExtension.swift */; };
 		B043C0A07A2BDB24DD0A41B1C798E639 /* YapDatabaseConnectionConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = FD62A329B5763C49C1857247C3C13286 /* YapDatabaseConnectionConfig.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		B056E2F116E826BDB99D3B4062DC481C /* TSThread.m in Sources */ = {isa = PBXBuildFile; fileRef = DD40A60C385F1B815CFB839B843A3817 /* TSThread.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		B098858FF0706ED7EB853CF857566E82 /* pwd2key.h in Headers */ = {isa = PBXBuildFile; fileRef = E3CCC5D9A8058110C057396D35F5A59F /* pwd2key.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		B0AB010555340DF22F96FFEE662DCF83 /* Promise+Properties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18CC6775A952EF3A20F962CF860FA60E /* Promise+Properties.swift */; };
-		B0B51B5A45CBF96E7E93A747E7495134 /* TSGroupThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 24CADA6D839FDEF156EB1035E3EC4E6E /* TSGroupThread.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B0E0AD2F85538B827F3487D9B1547263 /* YapDatabaseCloudCoreGraph.h in Headers */ = {isa = PBXBuildFile; fileRef = 07B744278D2AFA3F73A13D9C70FC4314 /* YapDatabaseCloudCoreGraph.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B124E93D617377B1989D8314C895E1F0 /* YapDatabaseFullTextSearchHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 852029CE2499C0E1B7AC6E1E433C6C72 /* YapDatabaseFullTextSearchHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		B1667050B925E21433A5470E7C356EB4 /* OWSPrimaryStorage+PreKeyStore.h in Headers */ = {isa = PBXBuildFile; fileRef = DB8F8FD087C469E4BE81701CF105FDD9 /* OWSPrimaryStorage+PreKeyStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B17E44E6EC181DC08AF99F3B6F92B095 /* SRHTTPConnectMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 50386EA1FC6F9C10ED459F753F630C94 /* SRHTTPConnectMessage.h */; settings = {ATTRIBUTES = (Project, ); }; };
+		B18E94FE0A18A3FF2E8EE6030E4D2D1B /* OWSDisappearingMessagesFinder.h in Headers */ = {isa = PBXBuildFile; fileRef = 03FF8730D027CF37A57EA4643A2560BE /* OWSDisappearingMessagesFinder.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B1B595E2CB9BE277A9F0AFE40866E8EB /* DDContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 38678F561C51251975E86DBDE22010BB /* DDContextFilterLogFormatter.m */; };
 		B2078B36F49A9CED6AF12B570BFF0031 /* SAMKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E44A816D1C9A23EB683C84468772A9 /* SAMKeychain.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		B20C7913E982B7B1D99546077AAF9B73 /* TSInvalidIdentityKeySendingErrorMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = A4E10BBC87EB46F2B88426422F8AFED9 /* TSInvalidIdentityKeySendingErrorMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		B27A7C73510A248969DC7192ED7DFA6E /* YapDatabaseExtensionPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A26B11B2DCBCB49F075720905FCF0DA /* YapDatabaseExtensionPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		B2806C7B789CA2C5F046909568E774B5 /* TSAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = EAD746CCF71A77D00EB2BC594E1C8394 /* TSAttributes.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B281DEA3F1C6335BA38EF9C9A20D9174 /* WireFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A9C0D7494B90FCE5D9FD40C705792CB /* WireFormat.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		B2945E7E2121A9E497FCC810A4055231 /* OWSDisappearingMessagesFinder.h in Headers */ = {isa = PBXBuildFile; fileRef = C64097879454AF28094C433B3270F4BA /* OWSDisappearingMessagesFinder.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B2CF0738BDBBDE027A9E7E9362F52FCF /* YapDatabaseViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FE8AA0C4FF0FA6195430F00232820F8 /* YapDatabaseViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		B30E6DCB157D75C65CA18729EECB8BFD /* YapDatabaseRTreeIndexHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 1974E8BEBDE1A599A4D575D7EF01E658 /* YapDatabaseRTreeIndexHandler.m */; };
-		B38AE90436CB6FD6987F5F49074AE5A1 /* NSData+Image.h in Headers */ = {isa = PBXBuildFile; fileRef = D96708651683272BDF510A982045755A /* NSData+Image.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		B318C8B8A37F1CA564504D4F92B86CB7 /* OWSPrimaryStorage+Calling.h in Headers */ = {isa = PBXBuildFile; fileRef = 5636307CB3BD384DD6F7153CAE75583D /* OWSPrimaryStorage+Calling.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		B3323CB9E38A27B528361F320E1A57B9 /* OWSRecipientIdentity.h in Headers */ = {isa = PBXBuildFile; fileRef = F5AD67A595FB3558457F2AE0C457686A /* OWSRecipientIdentity.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B3CC0E2711F16A645C4E6B6E6CE804B5 /* Internal.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC46B3E1F86FF7C08F3670C60E1C53C /* Internal.swift */; };
 		B416D9E9C1FC73EA5420EAAE396EE47E /* SAMKeychainQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = 35789035A5591EE8805BAB0CFAC89568 /* SAMKeychainQuery.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B4176E6E3F825BBD1EFB64DC3DC4AEBD /* YapDatabaseViewRangeOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 101BB3F5D66EFFA08CD69AE9431914F7 /* YapDatabaseViewRangeOptions.m */; };
 		B43844E313297B68C0819FDDFA51EFC6 /* UnknownFieldSet.m in Sources */ = {isa = PBXBuildFile; fileRef = F7D2F98745AB0D3EC0541D0B43291F3F /* UnknownFieldSet.m */; };
-		B47981FE11A37B660C57E7149C40F485 /* ProtoUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F7860E43CBAF938C820D385D27B6235 /* ProtoUtils.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		B4BA592617F07C8F02718FCD0484F86A /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8286F25917FC241FE265BD68FBE20418 /* AssetsLibrary.framework */; };
 		B4F0E946F2BD0E3D4E3D70BCA3C2FA66 /* PureLayout-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4066A414F8BEBB60843E49661CC54E8D /* PureLayout-dummy.m */; };
+		B53DAB23ACA5978CDB929F42A4A9AFC2 /* Constraints.h in Headers */ = {isa = PBXBuildFile; fileRef = 5BC84436AE84D186EAE7AC43D61F12BF /* Constraints.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B54022C48839CEBAEB2650895F0F5512 /* fwd.h in Headers */ = {isa = PBXBuildFile; fileRef = 6CD4B466A4250F194288728EA9C59F3C /* fwd.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		B54E8B4FE395E0B6F6FD2ACF33F3D894 /* AppContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 1703DBEA9A0F5BF2E6FDDABB1606D23F /* AppContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B56BBDD461FCB2A839C1FC1CC5B76A0B /* UIView+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = D3424EDABBDDA94759B4BBEBFF5C45B1 /* UIView+AnyPromise.m */; };
 		B56D998015EC71542EAA848A08D17925 /* YDBCKAttachRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A92A913345952078144CEEE63CDAF /* YDBCKAttachRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		B5ADA65CD2C5770E342AB14DDFEE6CDB /* NSArray+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = 85A55A417805D3D06E3B2F3F85C3F717 /* NSArray+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		B5B2348F47417FC1CE10947DE43ACF69 /* GSR2.crt in Resources */ = {isa = PBXBuildFile; fileRef = C075CB74306186930823FD7B24B4B3E4 /* GSR2.crt */; };
-		B5E614083E4185C366AB92B357CD15E3 /* Threading.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CD7BE7CB8812EA8ED02ABD3AFFFB8E2 /* Threading.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		B612C0191635DF697ED9D3D7002AA9C3 /* OWSSyncConfigurationMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 53537CC518F87545C5569BC6D967597A /* OWSSyncConfigurationMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		B5B2348F47417FC1CE10947DE43ACF69 /* GSR2.crt in Resources */ = {isa = PBXBuildFile; fileRef = 404DCC447395895E59573656CDD3DF66 /* GSR2.crt */; };
+		B5F3AAA32118251EF39C9E49B1D1EF16 /* SignalRecipient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D75DFE0828B6F9097CDE2160F09558B /* SignalRecipient.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		B628990C9CF03B3FA0B3FE2DCCE22B70 /* TSAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 59BE0B79DD2BDF47E562F4400ECEA78E /* TSAttachment.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B64FFE837145B23C33A0DCBC1F96CC45 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 08385FDC553C15ECE85BAD14EF3B69BF /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		B661CEE46251F8A6B4F4E8E007843B13 /* OWSProfileKeyMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = A35845F6C7205D135D658157E14E7823 /* OWSProfileKeyMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B67DD2FF85331DA6613A00583F53E337 /* minishared.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A8791558503E86B3BB2B1B9C83B94F0 /* minishared.h */; settings = {ATTRIBUTES = (Project, ); }; };
-		B68497B7D8D87AA51BD9629FA94A0854 /* ias-root.cer in Resources */ = {isa = PBXBuildFile; fileRef = B60201AB93CB0DF5D19C28BDB0E38E2E /* ias-root.cer */; };
+		B68497B7D8D87AA51BD9629FA94A0854 /* ias-root.cer in Resources */ = {isa = PBXBuildFile; fileRef = FD871833164197A9A3CE673BB748D76A /* ias-root.cer */; };
 		B68D06F3B01A1778FCA54FE03941CD8E /* SRRunLoopThread.m in Sources */ = {isa = PBXBuildFile; fileRef = 74D88C47A1AFBD9BB2B561EC393FADB5 /* SRRunLoopThread.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		B6ABE5B4D086C82B5B59C2045072CA7C /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6A218DCB73E7453C1F54EBAEAE97E4F /* Error.swift */; };
+		B72F54534E45DC11E90265F571B71F39 /* PreKeyBundle+jsonDict.h in Headers */ = {isa = PBXBuildFile; fileRef = 31C2C72487AC3C95637445C0E9D1C720 /* PreKeyBundle+jsonDict.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B737656DB10CB24C6F6BDEC8FC06D21E /* RingBuffer.m in Sources */ = {isa = PBXBuildFile; fileRef = 08735BC2C6E81DD84E1C777B8E4EF096 /* RingBuffer.m */; };
+		B76B1462B1240899C4CBF9E32DB013F8 /* OWSMessageHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = B390F841F9CDC0BE583E391284ACDD14 /* OWSMessageHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B77148795ACAE5F3EADD03D19BE2571D /* Reachability-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 97ED1E3DF81E7B340DB195EAC2E05494 /* Reachability-dummy.m */; };
 		B78C8730618F9AA7C224BB7B687045A3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
-		B7A89473D6237133EE21D7F0EE5836C3 /* OWSBatchMessageProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 948D91AF9838058941F0904F9F1DF8D9 /* OWSBatchMessageProcessor.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		B7E65E91C17DE6E313225798863C228B /* OWSDisappearingMessagesJob.m in Sources */ = {isa = PBXBuildFile; fileRef = F12D43BB9185A4094D6EB57A2F8DF8F5 /* OWSDisappearingMessagesJob.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		B812B7E25EBC2D3D8D5418CB00F16093 /* TSDatabaseSecondaryIndexes.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F0036C3E76DAC19CBDD93B2DF72BE37 /* TSDatabaseSecondaryIndexes.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		B847E64048824A268C5AD39DCFFD6CDD /* YapDatabaseConnectionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 995CB71C5DEAC377FC75F2006069FEFD /* YapDatabaseConnectionState.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		B8ECBE9AF7392A7D662283E559204726 /* YapDatabaseTransaction+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = A9CF62217C10E39A43772424BF83F2C8 /* YapDatabaseTransaction+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		B90C9D3F40F87DC315C5832B6D236C2F /* TSInfoMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 37686D25E62539FAE9D225B5D4FB739B /* TSInfoMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		B92C263BBFE1E0FB2FB12949A2F7B144 /* NSUserDefaults+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = A141AA872CB6BD74274E5F236FE8179C /* NSUserDefaults+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		B8E09B3970DE6BFFD0E03517667B695D /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.h in Headers */ = {isa = PBXBuildFile; fileRef = CD3771419E86ED6A25144F856CA50EFF /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		B8F51FA6D40770770275A99BD0BC498B /* CDSSigningCertificate.m in Sources */ = {isa = PBXBuildFile; fileRef = AC722862EA7AF7EACCD5042E9C902DEC /* CDSSigningCertificate.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		B93394BDE375318367908D99BAF6EBCD /* NSTask+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = D5F72231DC112F79A4533474C9E7466D /* NSTask+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B935124186ABC8B2C1294C26A5E82AC3 /* ge_p1p1_to_p2.c in Sources */ = {isa = PBXBuildFile; fileRef = 6B0B14CECA13794DD2DCAB99188246A3 /* ge_p1p1_to_p2.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		B95B568D7A5A9ADAAFB99DCF2B054333 /* OWS2FAManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F802507C7327CB2AD041164C4ED1181 /* OWS2FAManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B9829BBD5E7CC68A15ED4F3A75BA68C2 /* ge_sub.h in Headers */ = {isa = PBXBuildFile; fileRef = 3101A9297141955D3815C4CD2911BA6B /* ge_sub.h */; settings = {ATTRIBUTES = (Project, ); }; };
+		B98D579C3E541B85A0F48A299D61CBA2 /* OWSCallAnswerMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 24820FEAEC1BA8EB9D17C25A3BD9DCFA /* OWSCallAnswerMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		B9A50E86793289158DDE3A07F98CC890 /* SRHTTPConnectMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B4E8DAB62EBE2CA52AE8D97F02890F6 /* SRHTTPConnectMessage.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		B9D0D61B6B88DC62A52295A9E4A4FA5F /* OWSOutgoingCallMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = C2ABEA8D2B6C2178AF07899A274BCCF5 /* OWSOutgoingCallMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		B9CD2540E5EA5EF6218F61C9F1AF8126 /* OWSAddToContactsOfferMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 877F2388D703248A79AA31A182A58DE3 /* OWSAddToContactsOfferMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B9DB97174C24DFE0D8F5AB8BC303C6F2 /* YapDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = FB71B40F4AF492637731ED764567BAA0 /* YapDatabase.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BA5363620456EAB29FA2584A947FCABA /* AbstractMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D17C01B118B12B4AF2F9D34F52084DB /* AbstractMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BA74E87E41C76C08BCAFD5AA7B3F1F49 /* NBPhoneNumberDesc.h in Headers */ = {isa = PBXBuildFile; fileRef = 09869935AB3B5AAE19E51DC51E22FE3D /* NBPhoneNumberDesc.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		BACAB2644C55D917B0F0F4582B6B222E /* TSAttachmentStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 399C2B6FA2154176F51ACD8D9F977ED4 /* TSAttachmentStream.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		BB1433D154D6013910AB8C9CF5C6ED2B /* OWSMessageUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = BE76AB5FFB6311B4A9F77BE3C03F6928 /* OWSMessageUtils.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		BB15D3D2BE4C07503F695649C094691B /* YapDatabaseSearchResultsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CCEEEE47EED3E228749182F2AA6BF0F /* YapDatabaseSearchResultsView.m */; };
 		BB75BA5EEB9D7D8D8FAA0D1EBF84AA86 /* duration.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F165A0B37AE7F4A62DDF5F698625BB /* duration.pb.swift */; };
+		BB954E2B982E48174D4FE1F2ED091926 /* OWSSignalService.m in Sources */ = {isa = PBXBuildFile; fileRef = 017561A12FF4B06A240722521B53D247 /* OWSSignalService.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		BBC0A2E9A732785F8103C3F5BE61C2D1 /* ioapi_mem.c in Sources */ = {isa = PBXBuildFile; fileRef = A828CE62357C3091DC78624DEF37795E /* ioapi_mem.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		BC37227E7FBCD4D58B626966C1747796 /* OWSCallBusyMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 664812D70D6CA8EB7B221D694E153628 /* OWSCallBusyMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BC775312781394259D77DEF69A9F1BC5 /* AFImageDownloader.m in Sources */ = {isa = PBXBuildFile; fileRef = BA6E7166A7C6434DA6A39C3F1C434C08 /* AFImageDownloader.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		BC872741DDE0DB44ABD6197FE7ACF206 /* BadState.m in Sources */ = {isa = PBXBuildFile; fileRef = 14041F632026C15678C02C297476122F /* BadState.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		BC9DB5BA316514C2BACE5BCEC4ECBBA8 /* ExtendableMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = A2E2B8F4A3CCC944F2D9EE03B87911FD /* ExtendableMessage.m */; };
 		BCB78C60ACD87A0935D6594DF8474D53 /* BinaryDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31205D218CAD6B5852CFC7A4E6AF6CB4 /* BinaryDecoder.swift */; };
+		BCC54BEEA5E2B5307839E4038FCE929C /* SecurityUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = C0C9610E40AC6E7207697D426289ED1C /* SecurityUtils.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		BCF08521E37DE651AE62649F15FD1710 /* Fingerprint.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AC2895E920313C18311659E3A45B1A1 /* Fingerprint.pb.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		BCFC7AEDDC5C7D762A9CB2E95F73EF36 /* ReceivingChain.m in Sources */ = {isa = PBXBuildFile; fileRef = 637E2FB1F01F40F74BD2FB1A01DE4431 /* ReceivingChain.m */; };
 		BD3653350A764F63FEFAD05F0190070E /* PreKeyStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DB6FA50ADE943AE0E682BA5BB45A1A5 /* PreKeyStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BD38EC21348CB8F88DE7DFF9EFE5C111 /* DDLegacyMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = FD7E37E7E21D608D95141FC24B9868E3 /* DDLegacyMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		BD3E9EEBE0F7A11A29407210B12A0B21 /* DigiCertSHA2HighAssuranceServerCA.crt in Resources */ = {isa = PBXBuildFile; fileRef = D8E89DC82ED0C9D6FEE56F28D89B515C /* DigiCertSHA2HighAssuranceServerCA.crt */; };
+		BD3E9EEBE0F7A11A29407210B12A0B21 /* DigiCertSHA2HighAssuranceServerCA.crt in Resources */ = {isa = PBXBuildFile; fileRef = 7E2D4510147555CF056136635AB6D26F /* DigiCertSHA2HighAssuranceServerCA.crt */; };
 		BD5AD1AE30AD4CF7F470667ABD464CF3 /* YapDatabaseHooksPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DA62AAD915F1EF728CC9EF7A5208CA56 /* YapDatabaseHooksPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		BDA20C0F49294B414EAC1891709F17B2 /* ChainKey.m in Sources */ = {isa = PBXBuildFile; fileRef = B79C96CEA903260F853177B3D8CF968B /* ChainKey.m */; };
-		BDCB66686EE69EF63BE03C02D45EE927 /* OWSHTTPSecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = C4038DB00C5382E26B4F41A442873113 /* OWSHTTPSecurityPolicy.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		BDDE1237B9A9BFF839B0E7FAC34CAAE9 /* UIProgressView+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 58636F3B92F9340025DE3CE5880C2C90 /* UIProgressView+AFNetworking.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		BDDED87366A624AF3CB0E3FDBA0D7627 /* ZipArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = EED76D8B414A5C0AE84830D38DC7D17F /* ZipArchive.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		BDFD0A96E426136FCAB7226882A43EA1 /* TSDatabaseView.h in Headers */ = {isa = PBXBuildFile; fileRef = E11BC8DD95DB855E1DFB83981AD9B2A6 /* TSDatabaseView.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		BE68384F40F3A4619B48D0E8FCEE2E22 /* OWSRecordTranscriptJob.m in Sources */ = {isa = PBXBuildFile; fileRef = 19D657432FF0DA968475B8EB757BDEFF /* OWSRecordTranscriptJob.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		BE6D8AB0C42D6167260F382B6D8508F6 /* NSError+MessageSending.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DBDD55E20879C384DD61CD631F718AC /* NSError+MessageSending.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BE9A432E12902D521049D8D625B059F4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
-		BF330B3D5D075F4B3A91FE45E44A2BEC /* TSAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 438A2EAE9B8A3C839DA31EB88C7B27EA /* TSAttachment.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		BF36417E39EBF6FD973F698923C1877A /* OWSOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 322267C8FAE8A3E23CF77D75611B933C /* OWSOperation.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		BF00117C8AC2DEA9B45672821C7FACA3 /* TSInvalidIdentityKeySendingErrorMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 30C0065E9D22C04882D5F769C4EC99B7 /* TSInvalidIdentityKeySendingErrorMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		BF17DD7397D29A9DBA6BC8D11368CF49 /* NSNotificationCenter+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 18063A6F2C02DF18E3ED8EF5AAFC2938 /* NSNotificationCenter+OWS.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		BF347ADCE0F16BFFF7686E126F14B8A3 /* OWSWebsocketSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = B49A98FB3349B090ABFD0C5FE42C1CF1 /* OWSWebsocketSecurityPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BF8447BB2C1B0FF656F712C10F268CAF /* YapDatabaseFilteredViewConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 1256FCCDF2676669926609C29F5BFCA2 /* YapDatabaseFilteredViewConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BF9F9952E5D65C1DF5D7895B99943BA0 /* YapDatabaseActionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = A8F3C2945EFC93F3CF5F6363C9C826F9 /* YapDatabaseActionManager.m */; };
 		BFEB6BFF4CE00A321E58ED152ED492D6 /* YapDatabaseViewTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = D8519BE2C10B1E623CE37BD6846BC001 /* YapDatabaseViewTypes.m */; };
 		BFF30ABA7A5DD9AA7E62E1FC9196FCB4 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E33584A4141FB1947383067481414FE0 /* QuartzCore.framework */; };
 		C00E296EB9E755284C8E356C3B483006 /* libPhoneNumber-iOS-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 56CA89147397B958FD55F564DA3BBF33 /* libPhoneNumber-iOS-dummy.m */; };
+		C04D5CBCF81E052FD3E3FF20A406B909 /* OWSUploadOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = B490C198DACABB332BF11BC3A5A04149 /* OWSUploadOperation.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C07062B558F7015D2DAE233CE66F5FF3 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E33584A4141FB1947383067481414FE0 /* QuartzCore.framework */; };
+		C097090F94E448AA73DFED60B6731A28 /* TSContactThread.m in Sources */ = {isa = PBXBuildFile; fileRef = B9DB4A6FCBD42EC3737D0730D500E442 /* TSContactThread.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		C09B9CA8FAE8DB4C9EE1C2D89EBE1619 /* IdentityKeyStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BA5D952C77F748CD5BA698C91406551 /* IdentityKeyStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C0B3DA23397A9BD325D2410C7AE9CEA8 /* AFNetworkReachabilityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D66EC3D026096B5BA9B222F76492160B /* AFNetworkReachabilityManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C0CC7EF813175678DA254CED395E9A38 /* CocoaLumberjack-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 661D2EA7F1B68CD27D31C0958CA16AC6 /* CocoaLumberjack-dummy.m */; };
-		C0E53B24E399C5F98F39706994D53C83 /* YapDatabaseConnection+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 0851EB2881FFFB02C4F2CCA6EDFCF93A /* YapDatabaseConnection+OWS.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		C1514C8AD86135ABB68464FA7EBFB9D7 /* ATAppUpdater.m in Sources */ = {isa = PBXBuildFile; fileRef = C644C301D215785F9F858AA21E50DF76 /* ATAppUpdater.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		C15214E1BD190F6EE7177BD429006D91 /* NSDate+YapDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = E400DD68D1D88189ACFE235C50075D26 /* NSDate+YapDatabase.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		C175AB7F9E0BBB82B546CED47C6B1E44 /* Curve25519Kit-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 09EEACD323C49CACC333FE60E5CC52D4 /* Curve25519Kit-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C178DD53A67D6078550CA213848E105C /* TSCall.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C48A257E1CA1568D911376470DD9F1E /* TSCall.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C1A7F5F2EB5D40C4685BADEDCFC6214D /* YapDatabaseTransaction+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = EDA5B5EAAFB689D1C9599607950682B1 /* YapDatabaseTransaction+OWS.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		C1ACC8B067F70A7C696C9EE92EA8E055 /* ge_add.c in Sources */ = {isa = PBXBuildFile; fileRef = B48256D6CD538E23A29B2B9B64E572B8 /* ge_add.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		C1BEAE88548B8A6894B0B5BB7CE6FF8C /* SRProxyConnect.h in Headers */ = {isa = PBXBuildFile; fileRef = 854F81F4E99585F9130C292BF5C473E3 /* SRProxyConnect.h */; settings = {ATTRIBUTES = (Project, ); }; };
+		C1C31586D21672F311603C99CBC0A22F /* SignalService.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 985CA3F14126C98F6533E725992B5D76 /* SignalService.pb.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		C21230BD0F6124F84AD502D172EB26CD /* YapSet.h in Headers */ = {isa = PBXBuildFile; fileRef = C6CC222D6DADC1EF468439F7678BD542 /* YapSet.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C23103C43360ED500988E2F287CF4084 /* YapDatabaseCloudCorePipeline.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B50160334B5BA0049F0AFE5B86548A4 /* YapDatabaseCloudCorePipeline.m */; };
-		C2357A658D7A658997B83CAF2CDDDF5C /* OWSContactsOutputStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 31D43F990CC92E2B9030CA2DC76D5B96 /* OWSContactsOutputStream.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		C27AD1DB923CD2131A52EEF088C3B697 /* ProtoUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 4FBB76A2E328893494AB8E86040BAAB8 /* ProtoUtils.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		C27B7C8AECBCDE6BC0DC60ADD0A64B9F /* AFAutoPurgingImageCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 335AAF1CDA77115DB97F4DDA497D125E /* AFAutoPurgingImageCache.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
+		C2841D42AD7EFB6B978F0A69C397688B /* OWSReadReceiptsForLinkedDevicesMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = C513ED51764AD18FE8B2E5FFFD78D1AB /* OWSReadReceiptsForLinkedDevicesMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		C29718F23C9C0A27B2DEF9CF595C352F /* TSAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 21C69349E95262BD57B6DB987E62E49C /* TSAttributes.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C29AAE59E96A6C504CE2BA471EFB2C54 /* UIViewController+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 74E2A6DD9A85D99CA0FABC0C11FB1C4D /* UIViewController+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C2BC662B54D502CA276C9FDA71E0AB35 /* OWSSignalService.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B92FF1BE766287BE51D12075DDD5A85 /* OWSSignalService.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		C2A2C3250DA08CA17C8A526509FCA57C /* Cryptography.h in Headers */ = {isa = PBXBuildFile; fileRef = 87BF49C75D773E100EB1EC5CB9001B74 /* Cryptography.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C2CC6C96B906A7AB437D615C155ABFA5 /* SQLCipher-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = D66AB5BC37D6C35ADA4AA1E34A37A1A7 /* SQLCipher-dummy.m */; };
 		C2F59A745F70CDCAD7B6AF11E53DF0AA /* YapDatabaseViewLocator.m in Sources */ = {isa = PBXBuildFile; fileRef = 21C89A6FA9B7EA71CE1A5F1C974CDC2F /* YapDatabaseViewLocator.m */; };
 		C33F156DFC779EB9C366E335EA69EA5D /* ge_p1p1_to_p3.c in Sources */ = {isa = PBXBuildFile; fileRef = 330F2BB6097F23B472D1A0D05862961D /* ge_p1p1_to_p3.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		C39B7F1B00CB7257918BB6DF1959C615 /* Randomness.h in Headers */ = {isa = PBXBuildFile; fileRef = E3A1B72DB2203D88F5FE44973CD6BD49 /* Randomness.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C3E5A812890947B0845DEDDB35D2AB32 /* ObjectivecDescriptor.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = A958D7EE9104A7118BB672764DA4E422 /* ObjectivecDescriptor.pb.m */; };
+		C40A5B592B47A60463090FA0838363DC /* OWSFingerprintBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B180AAF39ED2C9E2A4D1E10B4800069 /* OWSFingerprintBuilder.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		C41D435E3955CEE96C2ED3DD2E30EBE6 /* AxolotlStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E131A266E18D944140B1EBE685EFBFF /* AxolotlStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C439BEF8264AF42FA8910F0D103CE73E /* OWSRequestBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = A95C83DEB57AB884D861C72F716672C4 /* OWSRequestBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		C46CC2F4E9392A3CC516D52097AA19FC /* TSAccountManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E8D8AAF5EF97D9ECA0C1F1A12ABF338 /* TSAccountManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C4E4745E20B48E107C79BDC07B865535 /* YapWhitelistBlacklist.m in Sources */ = {isa = PBXBuildFile; fileRef = EAD1898ECEE9DAC2052DD9468011764B /* YapWhitelistBlacklist.m */; };
-		C4F7EDFB1FBE60000BAFB870E641949A /* AppVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F6AFA30514B9C30CE70C6D091EE7982 /* AppVersion.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C50759DFC091E755F84B9DAB976C1056 /* Threading.m in Sources */ = {isa = PBXBuildFile; fileRef = 6A2B3D0C31B6C60E3B9B84830A638268 /* Threading.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		C514C66F6872CF0B5C234FE190DE6C16 /* NSError+MessageSending.h in Headers */ = {isa = PBXBuildFile; fileRef = 63219847586296EA9FF7EED0294D3895 /* NSError+MessageSending.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C520200CCE6661037A0C2492897DE2C7 /* YapDatabaseCloudCoreConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = CCA23F9C96E107BAD3587F4654C9CA37 /* YapDatabaseCloudCoreConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C529D585D121683BC187D0E8028B5374 /* NSTask+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = C68606CDC165E3310DF47EF1F432B104 /* NSTask+AnyPromise.m */; };
-		C567B669F096D79BB72CD5DE7BA25C52 /* NSDate+OWS.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED06BCDF9223725A6F8DF2E462EDBE9F /* NSDate+OWS.mm */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		C57219497ABD5B580D953E2F41278139 /* OWSFailedAttachmentDownloadsJob.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D35708074542E5B1B94EE8DB1F909F5 /* OWSFailedAttachmentDownloadsJob.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		C5DDEB41E76B6C34DE26AD75A2ADBFD7 /* AFNetworkReachabilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 27FE9AE04A8B4D9CE0D75CB29C358A15 /* AFNetworkReachabilityManager.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		C5EF7352CADCEB5E3FC2685B8FAA1B81 /* YapDatabaseRelationship.m in Sources */ = {isa = PBXBuildFile; fileRef = 87BBF2381F9F29F9154010D3F7DC87FD /* YapDatabaseRelationship.m */; };
 		C66C025252256FE9F6B88C9A8EF5E83A /* CocoaLumberjack.h in Headers */ = {isa = PBXBuildFile; fileRef = ECAFC02231F93C6E4FDBFD5DA9303C20 /* CocoaLumberjack.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C69D6EE6034B6B365A056EA35DF39295 /* ChainKey.h in Headers */ = {isa = PBXBuildFile; fileRef = CE43309DB7FC467AF6CAAEA075828BC1 /* ChainKey.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C6D31528DBA95966D63303AF0C0F0AB8 /* Zalgo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EFACB3C584F0907AE240AFA85167023 /* Zalgo.swift */; };
-		C6D9ADCAFDDB029D5181F24B4876880A /* OWSCallAnswerMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 9846585A727D27C7CD8156256A03DC68 /* OWSCallAnswerMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		C6E19DE3989764599545D269D7AC7207 /* NBPhoneNumberUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = E3B7E3D60A910FB286F4C176A0E1F45E /* NBPhoneNumberUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C6EEF1439309BBB1F87F546DCA99DBBC /* api.h in Headers */ = {isa = PBXBuildFile; fileRef = DA7EC66C0898401958A1A00BC911F8FC /* api.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		C6FFD4C65C77F4065466BB1EC2C1ADB5 /* YDBCKMergeInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = A4EBE5B44031A63DE66C70BFC0A6744F /* YDBCKMergeInfo.m */; };
-		C706D95FDE44F9CCEFE92376205D90A0 /* OWSPrimaryStorage+keyFromIntLong.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573F9308BEB1B394E4ED42441475DDA /* OWSPrimaryStorage+keyFromIntLong.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		C73AD64830477B5A0E0BE311E383FE67 /* SAMKeychain.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 67078F0E33DCBA8C74EF28F944E5ED89 /* SAMKeychain.bundle */; };
 		C73CE88F68E8CC011A3ACB8ED0CE16F9 /* YapDatabaseActionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3086857ADC4785296A9A428003AB65B5 /* YapDatabaseActionManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C7787D9F5F2DB501061B556BE7B07120 /* YapDatabaseSecondaryIndexConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 9442C90BA23E6D5BF827E38DF7098F9D /* YapDatabaseSecondaryIndexConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C78B53CA78978E73DAD579280569E745 /* DDDispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 048409DB45493B3A79474EA1B21173AD /* DDDispatchQueueLogFormatter.m */; };
+		C7D65E35CCD77375CA937D89C2879D01 /* OWSRequestBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 02C90CE65864E3BF9C298E3E3341B68D /* OWSRequestBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C82E0BE99FCAEDF0B9F7F640E1234771 /* ProtobufAPIVersionCheck.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95827DE9B459EE407B3AEA1BAF0890FE /* ProtobufAPIVersionCheck.swift */; };
-		C838F3D12DB24A33E6940B9433887974 /* OWSCensorshipConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 852D31442A4E131E065F61228DA28B01 /* OWSCensorshipConfiguration.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		C844A17832872ECE46633C0EA8972DF4 /* TSErrorMessage_privateConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = E273C9583DC2C29CBA32159C9F8C1EB1 /* TSErrorMessage_privateConstructor.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C8AC8F950A62FCC9F448C9E0E0805329 /* AFNetworking-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6348DD48DA9F3A2FE5B99BBC806DD1E8 /* AFNetworking-dummy.m */; };
-		C920BDBDCEC5DC58A868B6D5784D9703 /* OWSContactsOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = AFC86810E9AA895404160BAE2FACA1BD /* OWSContactsOutputStream.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		C8B6957FBD5E6BB2B6B14315E9FF8030 /* OWSDevicesService.m in Sources */ = {isa = PBXBuildFile; fileRef = B9AD63DC8216282BFDC5A98D4AD28A71 /* OWSDevicesService.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		C8D094C47EF1F87AF52B2F9A85DF8861 /* OWSPrimaryStorage+messageIDs.m in Sources */ = {isa = PBXBuildFile; fileRef = 212AC1E81BCDD6EE825B47928CDEA1A0 /* OWSPrimaryStorage+messageIDs.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		C9A10506A50B8962CF7A3284A2AD3562 /* BobAxolotlParameters.m in Sources */ = {isa = PBXBuildFile; fileRef = BEEFD679127BDB16BEB80AC97628AD57 /* BobAxolotlParameters.m */; };
-		C9E6D730143E78C8E9CA2B566689AE8C /* OWSFileSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FCFAADBBB3452010B8C2CF8BF482F2F /* OWSFileSystem.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		CA4079A4511C395E5F3F7BAFF5924823 /* OWSBlockingManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F1101D6A8E30AA339C6EF1FFBD639F9 /* OWSBlockingManager.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		CA5CFCFD4FDD2DFD39961CD04EAE0B90 /* ioapi_mem.h in Headers */ = {isa = PBXBuildFile; fileRef = 47511E6B0D8A484D5D2CC7F8D487A443 /* ioapi_mem.h */; settings = {ATTRIBUTES = (Project, ); }; };
-		CA8D78DBAC75A8BD63BAE42DE19DCE71 /* OWSIdentityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 15F2DC51513BE6376A4ACC63D42267BF /* OWSIdentityManager.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		CAA0C9AB3A84B8D5B9C3238FA654D131 /* YapDatabaseSearchQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 85C0CA55B227612FE773DD06D6DE905B /* YapDatabaseSearchQueue.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CADB8192343AB91219FEFEFC3F12CA91 /* fe.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F5897ACCEDC56878296B41651A5C48 /* fe.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		CAF8BDD77041DB0646A84F17AA29CA90 /* YapDatabaseFullTextSearchHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = A2501D2AEE1DA8A3AD00235D6AD158C0 /* YapDatabaseFullTextSearchHandler.m */; };
-		CB0834C034E477151DF4753547FE6051 /* TSAttachmentPointer.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5D2F8081D1C3A447C2B0ED202DBBD8 /* TSAttachmentPointer.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CB099624BC6258CD18448761150B4F68 /* DDASLLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = E6601B182467160C08A2924D173B51AF /* DDASLLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CB0DB52C162A3D80EF83C180246D4A23 /* PreKeyWhisperMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C870A5FD839F4FB190CD0D14BAD8A5F /* PreKeyWhisperMessage.m */; };
-		CB85CFAA33E7A3683C9433ECB2D758D1 /* OWSStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EFC0C12074D6D5CB634343717E1416C /* OWSStorage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		CBAD07A60A22129AB9B99687C9078D4A /* OWSMessageDecrypter.h in Headers */ = {isa = PBXBuildFile; fileRef = 781B270B44609A9A881A527DE6DC46A0 /* OWSMessageDecrypter.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CBD41EECE02CA894C4A7FE2CD66C5863 /* after.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52E95367947E3DF807B82F33C1DD82C5 /* after.swift */; };
+		CC091D1D00FAF8B1959D228751938568 /* PhoneNumberUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C9C1D812BF9553D5D1AD34CB2CDA776 /* PhoneNumberUtil.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		CC42B8A36C974BC4CAC78788800478A4 /* AppContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 9227BCDB8E9050F9F326EDD1009BF45E /* AppContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CC5904AD9EBD7D843415CB96AADC220C /* YapDatabaseRTreeIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = FE986A80A90BEDCB0372B05F126BDDD2 /* YapDatabaseRTreeIndex.m */; };
 		CC5976D7995204422AAE388A81620C06 /* hmac.c in Sources */ = {isa = PBXBuildFile; fileRef = 150F95CCFBBC0E039D3F235496CC59B9 /* hmac.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		CC72D6BCC41E0098D53A1804174EFDDA /* TSInvalidIdentityKeyErrorMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 0681BEB193DB2AA2AB110E8E458CC526 /* TSInvalidIdentityKeyErrorMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		CCC2A7BA4A7918D308539ACA8CAB16E3 /* OWSAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A1FCCF9AC11B5E83A3D5900BCB7C928 /* OWSAnalytics.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		CCCA2522D7B159D096D629A1CE877F11 /* zip.h in Headers */ = {isa = PBXBuildFile; fileRef = C1332F2E64D8767EFAE40416BFABEB93 /* zip.h */; settings = {ATTRIBUTES = (Project, ); }; };
-		CCF4BF02A889AD604EB5C535B2554D91 /* SignalIOSProto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2692E535E5CA9C710B86AF032F218C07 /* SignalIOSProto.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		CD27036D7DA81E971CD793C74AEB8921 /* Message+JSONArrayAdditions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 597541EEB8B994DB4C68B5A4DC8CF33E /* Message+JSONArrayAdditions.swift */; };
 		CD9A2A7BBFB3D1E4815E5EF18CBB48A2 /* YapDatabaseViewChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 684597896F2D6D4B3ED9E154EE302385 /* YapDatabaseViewChange.m */; };
+		CDC01889718A89ABD6E1BB6732601B03 /* Contact.m in Sources */ = {isa = PBXBuildFile; fileRef = ECBCF498FBA6BE6188F79D816CA6DA7C /* Contact.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		CE0DB372EFD0704A877E47F7523E0CA6 /* YYImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B089498E5C1C6C4DE9BCCA260B999B1 /* YYImage.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		CE2EE656CA58C1A41475607498CE4A4E /* ParamParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = E92A1505D72661FB46FA29D07128E134 /* ParamParser.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		CE16360A34502A86A96780E661D8BD2D /* FullTextSearchFinder.swift in Sources */ = {isa = PBXBuildFile; fileRef = A28B0AC50D19FE9CDC7D27FD852E5546 /* FullTextSearchFinder.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		CE572CB6E099A6F3B7A7E3FD3223CE7F /* MessageKeys.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FA3D1B0311FC329826A69630EBE3672 /* MessageKeys.m */; };
 		CE6112AD1154840F5389E049BA313CAF /* YapDatabaseHooks.m in Sources */ = {isa = PBXBuildFile; fileRef = DFEDE811D5B8B2679DF84240D10C1DA3 /* YapDatabaseHooks.m */; };
-		CE8A6D10DC79B0C251F0C439ACA131AC /* TSVerifyCodeRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 3370C5DE00549F1EA220B5DAF6E4B239 /* TSVerifyCodeRequest.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		CEA85A29657010CA307E689A8D2E0E16 /* OWSMessageServiceParams.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DEA9A213F89A980259A9040616C857D /* OWSMessageServiceParams.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		CF084DD06DC65BE3760C48860B266280 /* OWSProvisioningMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AB3DAC052A77B5856D71095FDDC2466 /* OWSProvisioningMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		CEB2397858B5DBDC7CA28F8403588BC8 /* OWSFingerprintBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = C903E89B6E77C4981F352D4BBCF3B439 /* OWSFingerprintBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		CF46629D5B41114E70BE516B298F25E0 /* NSData+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B4699F3EE3FDAFA50EAD5283FD586F4 /* NSData+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CF50D4D4103D03BCBF50E7E90875A282 /* YapDatabaseRelationshipPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 901E6793392FF873A45BBE84B57EFD05 /* YapDatabaseRelationshipPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		CFA0392934F53AF6ECD27A9E0305A285 /* YapDatabaseSecondaryIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EFBF6B8751D834CB23D03DC6D0A67E1 /* YapDatabaseSecondaryIndex.m */; };
+		CFBDF709CF29970870C2F523F8DB7544 /* OWSVerificationStateSyncMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = A1615AB834F4F871AF448283DDD24416 /* OWSVerificationStateSyncMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		D0DE42616C86042D41BAE3A48BC91ED2 /* FunctionalUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D46F08A069A867125B21A80CF9FB6EF /* FunctionalUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D13362BE5F6F8E24FC15E6841CBA3296 /* GeneratedMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = B3AE6BF7DE72BC63495FF7F39358FCD2 /* GeneratedMessage.m */; };
-		D1BBA73C0FC575BD0B98A6D393BBAB90 /* OWSMessageHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E39AC9A5A23D49F8811A91E9CA4BE16 /* OWSMessageHandler.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		D1F3BD7DFAB133E8B378BFA4EB6685A0 /* TSOutgoingMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E784B0EF1C2895C277A9417E6D6A98D /* TSOutgoingMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		D1E48EA263ED7871FC9C61654E82BBC0 /* OWSOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 69C2E2B87783B3041AE236F21A028814 /* OWSOperation.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		D219CC226350EF1CDA9285542DF949BF /* OWSAnalyticsEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 813EC8F6346C15A6A9C8ACD65E5317E4 /* OWSAnalyticsEvents.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		D24782CE02E803880F677024246BC094 /* TSInfoMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 76C2BDDBAD98DF988B4A0D15803DDB81 /* TSInfoMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D2580F1579E0B6308E798C6FC367E64A /* YapReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CF3F47C1B4D2D5138E7D6DE891F0B36 /* YapReachability.m */; };
+		D2C917586CBFFB50E5ADFB6CAA166E0E /* TSDatabaseView.m in Sources */ = {isa = PBXBuildFile; fileRef = B726CF216E4408AED51CC534AFA9DDF5 /* TSDatabaseView.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		D316D261087B6C9BCADD487BBE7C12C8 /* ConcreteExtensionField.m in Sources */ = {isa = PBXBuildFile; fileRef = 61D8112DD18D271EAB791F15BECED56D /* ConcreteExtensionField.m */; };
 		D32A5E20865DCE03CABFC9DC9E8976E7 /* NBNumberFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C8084E06185A33E86C5CCF7471DC648 /* NBNumberFormat.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D32B3E72BAA422AF13AF5355FC53920D /* afterlife.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86CE7CBAA54CB972C359A1D7D9731A1C /* afterlife.swift */; };
@@ -1080,108 +1070,117 @@
 		D3B31F8511DDC14D2CA38F42A7A7A7CB /* crypto_int32.h in Headers */ = {isa = PBXBuildFile; fileRef = FD0C96CAD3F3DED9DC4CDB0D674346C3 /* crypto_int32.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		D3C504BF3C3AB0C542D4476739FEDE28 /* NBPhoneNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AB7199815BC00800E933D7B025D6145 /* NBPhoneNumber.m */; };
 		D3D4FEE7302965A6DFAA715DEBAEEC1A /* MathUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 208A708FE5C454CF4C21F861DF286CD9 /* MathUtils.swift */; };
+		D3EB6CA632A1AA4D1284A7620C53F2BC /* NSTimer+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 446170C5A737E474E75D597E48D67CCD /* NSTimer+OWS.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		D3EDD0AEF8056914E22289DD6131D5DE /* MTLModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E80A2881D00EF28ADA181E995B2411CB /* MTLModel.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		D4319A4333CA4708E8C5015EC38F75F4 /* YapDatabaseSearchResultsViewConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = BE07946BCA78241DE7162E91FE4D8601 /* YapDatabaseSearchResultsViewConnection.m */; };
 		D4A6B36790AFFE716D8C064BF0D9D96A /* aes_ni.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FB045CC53E8806EAD12EBC0B01C95C0 /* aes_ni.h */; settings = {ATTRIBUTES = (Project, ); }; };
-		D4F50A9D8133FB9CA7EA019A3190180B /* OWSOutgoingNullMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5438334DD5215BAAEECE8AF15B34E4CC /* OWSOutgoingNullMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D500483A409312F7B2F38BAD382CADF6 /* YapRowidSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AA63CEE97DA5A2386A9674852F28F14 /* YapRowidSet.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		D503F318BF4E413265C9A5CE515504C0 /* TSInvalidIdentityKeyErrorMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 735FDD9EDC8E24E26A2D7EC10E9A386F /* TSInvalidIdentityKeyErrorMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		D51AF325E4F1A78EA34E1BEEDBF14B52 /* UIProgressView+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = 63B535F77C30C66D9E2B771E60307D36 /* UIProgressView+AFNetworking.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		D535015DC6C00BC9E688BA7FC584509B /* NSData+Image.m in Sources */ = {isa = PBXBuildFile; fileRef = 68685C031AB882FE093199F555BDC393 /* NSData+Image.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		D55449C6E4BB7157487FA21ABC5BD97C /* SRDelegateController.h in Headers */ = {isa = PBXBuildFile; fileRef = D5A7C33DD974F00F98A0B3E74D138561 /* SRDelegateController.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		D5A9A28AC8431C75F88359DDD57298A3 /* UnknownFieldSetBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 05093C5D6EB0642FF2B49BEB17A8B986 /* UnknownFieldSetBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		D5FAE8C783A97697AFC8492C11211B6C /* PhoneNumberUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 64A86B40372887E6A178EB245CCCA3CF /* PhoneNumberUtil.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		D6129411BA803829DCB8831B8FECFE66 /* YapProxyObjectPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E9AC41A0576FEB88809CFFDAB084BC1 /* YapProxyObjectPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		D64AEE05276CDC15A7953565BC8A4E29 /* OWSReadReceiptsForSenderMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 2EC9AC61F184C5919DED4173C580AE29 /* OWSReadReceiptsForSenderMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D6593C87DB2CAEC3A01DE79824714164 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
-		D6678A06AE51D66063144000B63846A8 /* WebSocketResources.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = 19FDE6AD20A254D140595A3A42BF9006 /* WebSocketResources.pb.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		D776F8D33ED37E8E614394496D4CE285 /* OWSPrimaryStorage+SessionStore.m in Sources */ = {isa = PBXBuildFile; fileRef = CCE52D3EE9359F24F1D52E04F88D74E1 /* OWSPrimaryStorage+SessionStore.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		D79DD75E566EFAE0FA924C7BAF05694F /* OWSFingerprintProtos.pb.h in Headers */ = {isa = PBXBuildFile; fileRef = 1DAC82DCD23177935F515A7707FC2D0F /* OWSFingerprintProtos.pb.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		D75AADC9D318773428B5E82C5E31D45F /* PhoneNumberUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = D01311A043347D8D707F7AE821B70A1D /* PhoneNumberUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		D7AEE0DF4CC2212AFA32D2F64EF744A4 /* OWSProvisioningMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CCA882AC659567D9114760FEC3FB51 /* OWSProvisioningMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D7DB6CDC2927B3CC43FF89ADD71FC58A /* YapDatabaseAutoViewConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 36573B789E1BE66D753A00CAE1BBB21D /* YapDatabaseAutoViewConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		D7FC3446848014E2F0DBFC38D81AA88D /* OWSAsserts.m in Sources */ = {isa = PBXBuildFile; fileRef = D52AF4EFBB0F656E8E213CB407938549 /* OWSAsserts.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		D819D9E81FFD0766B642E403948EAF0B /* OWSAttachmentsProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = A0EA4D65B523AE03FBDA66DDF8893A70 /* OWSAttachmentsProcessor.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D823C48BF6A69FD5019A813E9A3223D6 /* YapDatabaseFilteredViewTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 91483FE65368E337BADB624C1F1ADA76 /* YapDatabaseFilteredViewTypes.m */; };
 		D8B3A5502A82BB4FDA1EA6AE8E496D68 /* YapDatabaseRTreeIndexTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 768FDF9AE8AA4307CB2D74982F8486B9 /* YapDatabaseRTreeIndexTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		D8BA4125ED319F168038E0A334E0DDA0 /* OWSPrimaryStorage+SessionStore.h in Headers */ = {isa = PBXBuildFile; fileRef = C024A4D0C3AA1DDA449AF3D5305F7798 /* OWSPrimaryStorage+SessionStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D8C87C71C19DA66548F6EC3385173DA9 /* SwiftProtobuf-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E11FEAEB69E9AB31300CDDE5502B14D /* SwiftProtobuf-dummy.m */; };
 		D9294CCE2CC92EDAF1A98F899664BF77 /* YapDatabaseCloudCoreGraph.m in Sources */ = {isa = PBXBuildFile; fileRef = 0531FD361C0B8F32A47B3C133E2671AB /* YapDatabaseCloudCoreGraph.m */; };
 		D957D69362D1D2FFD23F3F248F26AA2E /* ExtendableMessageBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 167EBE01CA65A1EC8AE0ADF33FFF3387 /* ExtendableMessageBuilder.m */; };
-		D9B1D43453A8C0CD27F9E7F932FB5339 /* GIAG2.crt in Resources */ = {isa = PBXBuildFile; fileRef = 5747E92F0E0958A10A4E0B1301079A3E /* GIAG2.crt */; };
+		D9B1D43453A8C0CD27F9E7F932FB5339 /* GIAG2.crt in Resources */ = {isa = PBXBuildFile; fileRef = 578265E19CDCB21B90963B66A3FE2014 /* GIAG2.crt */; };
 		D9B2E3C50273FE0E6981A70E9EE4B3FB /* YapDatabaseViewState.m in Sources */ = {isa = PBXBuildFile; fileRef = 6952475F267C704BDA1C6119ABB13896 /* YapDatabaseViewState.m */; };
 		D9F804F8E5632E96B7E91A23C5612A48 /* ProtoNameProviding.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFFB3E575BAFC3C0F697BED25AA918B2 /* ProtoNameProviding.swift */; };
 		DA0CBEA19ED8F8876F8B154A12F4DD6B /* ExtensionFieldValueSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE5FE9B6F2878265EF469555922AD5CF /* ExtensionFieldValueSet.swift */; };
 		DA22B71DB89208F85879B3B388C09556 /* NameMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = F84C4AE4CC62366DEB51C1F3B48490EC /* NameMap.swift */; };
-		DA5CD21A847F7F93536FED1B9EEA0050 /* OWSMessageReceiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 705809ADC5CBDF8B4A575D5D0EEDDF9E /* OWSMessageReceiver.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		DA5D3DA27EE07B653176E60537E8FC18 /* ECKeyPair+OWSPrivateKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A64B6B5023C4F443BF4C27EF5071759C /* ECKeyPair+OWSPrivateKey.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DA6FE1834157E0CD7E2C3A1AD4C48168 /* YapDatabaseStatement.m in Sources */ = {isa = PBXBuildFile; fileRef = 73A2CFFE29F01F1970B668D86A087899 /* YapDatabaseStatement.m */; };
 		DA785F211AA957BCA18E13D7AEB14462 /* NSObject+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38F2F8D0FC280D31F5D8D67550AE7CE6 /* NSObject+Promise.swift */; };
 		DA7A51341DD1165D23B2E67F7730E60D /* ge_precomp_0.c in Sources */ = {isa = PBXBuildFile; fileRef = 0EB4B996948B325834BA500F624209E5 /* ge_precomp_0.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		DA93FC7FF012EB343C608D7152778CB9 /* TSAccountManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 809155732CEF30E37A57A4F2D001BD99 /* TSAccountManager.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		DA968B230E5A9E6BEFBD1E71179E5311 /* YapDatabaseView.h in Headers */ = {isa = PBXBuildFile; fileRef = F967506C521FA1B67DEF942AC727AEEC /* YapDatabaseView.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DAA0FD496AC241A69A2025319A109CD0 /* AppReadiness.h in Headers */ = {isa = PBXBuildFile; fileRef = BB47E0CB75572AC8F82A63BFC9EA487F /* AppReadiness.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DAB39A397E5BE42DC8827E6F1A8B2C82 /* MutableExtensionRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = FBF459B490270FBFD334FA6666D8B65C /* MutableExtensionRegistry.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DAB480BC922A1A6ED40A0EDDE3D7B3DA /* YapDatabaseHooksTransaction.m in Sources */ = {isa = PBXBuildFile; fileRef = B4DA5756A9C1E41801AD71A8B3A7CC3B /* YapDatabaseHooksTransaction.m */; };
 		DAD2040FF0E8FCC9D346379D21473C75 /* YapDatabaseQuery.m in Sources */ = {isa = PBXBuildFile; fileRef = FBA66D890D3AB094A867B1E7FF0647B8 /* YapDatabaseQuery.m */; };
+		DAD5A308B07003D058404D0EFE9F70EE /* NSData+messagePadding.h in Headers */ = {isa = PBXBuildFile; fileRef = A95D32138D90C34FDC3F017D2A9773DD /* NSData+messagePadding.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DAD6978E18C65A3A26144062B0D8B0BA /* YapDatabaseViewLocator.h in Headers */ = {isa = PBXBuildFile; fileRef = C710CB3C6199788C97A23DB403BD0CC3 /* YapDatabaseViewLocator.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		DB1AA9B9762BA43FD4225C8D0B91D653 /* ContactDiscoveryService.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F8891ABD159FF4F06DE4F081519363E /* ContactDiscoveryService.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		DB446ECB20272F3AD6AE5B9693399D4D /* YapDatabaseCloudKitTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 746531190F70A545C441E5FE87EF28B4 /* YapDatabaseCloudKitTypes.m */; };
 		DBAC8D79E3551585053BC908FC2DA0BF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
+		DBAD9E5ED51BBD21F4A205D8B2F60EE8 /* OWSDispatch.m in Sources */ = {isa = PBXBuildFile; fileRef = 97A0F57A8AB2F431DA78837377073BAA /* OWSDispatch.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		DC0A60B4F623D5BF9976C3BCBEC34570 /* crypto_sign_edwards25519sha512batch.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CE6EF99402DDE8FA9469DD60AC8266D /* crypto_sign_edwards25519sha512batch.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		DC2873399E654E6079666FD71A0E36F3 /* hmac.h in Headers */ = {isa = PBXBuildFile; fileRef = 37E752BDCBA3E6CCA17D4E2C33C6E1B8 /* hmac.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		DC2EC87A2394A9341F61F3100782BDEC /* PMKFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 86DA8AA690CF7871AEF0502DEB18A433 /* PMKFoundation.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DC3C985CD31DE9BFA5C074FF9BE5F189 /* ProtocolBuffers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BECC9C24A3B8A9CDB422142A29650041 /* ProtocolBuffers.framework */; };
+		DC53D0997BA403D1B50310DE8F8A7663 /* OWSCallMessageHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 0665528B8730D95E85F703E211410D0D /* OWSCallMessageHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DC5A886CA265FD5856ECB3E5689EF7B2 /* Constants.h in Headers */ = {isa = PBXBuildFile; fileRef = 80C2B5360175615E5107DA5A91379EEE /* Constants.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DCA0C1A6E322687120601CBBE96906B2 /* YapDatabaseSearchResultsViewOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4665485FBE656FE77E3B294F592E6D51 /* YapDatabaseSearchResultsViewOptions.m */; };
-		DD486490CD73F36F85DA1269C71A6C11 /* OWSUnknownContactBlockOfferMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = A611AD40294C79AB0BDA872EF21D6EC3 /* OWSUnknownContactBlockOfferMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		DCF185CF7D5ABCFDA247C2A5B2DCC294 /* NSData+Base64.h in Headers */ = {isa = PBXBuildFile; fileRef = A8E59DF59A912A9235A4191A5A92AEED /* NSData+Base64.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DD01A613C566759576081798717D4722 /* NSObject+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 209AF5EE9DA1C70A1F7EC6441373A8C7 /* NSObject+OWS.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		DDA8ABB23B6A3D788F292109ACECD85D /* SignalIOS.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = F917564E8B9090F99417C2D5C20CA198 /* SignalIOS.pb.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		DDB7B14BCB63D0FC18C9A158C224A01B /* TSOutgoingMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = F352E29A82EF0AACA2B860ADAEDEAD07 /* TSOutgoingMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DDE9834ECBC19C0FAF299E0A2899F4A7 /* NBAsYouTypeFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EFC77339E53656313E059ECCCA8DD48 /* NBAsYouTypeFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DE356862B55843C01761B538765B1D50 /* YapDatabaseAutoViewTransaction.m in Sources */ = {isa = PBXBuildFile; fileRef = 987C5D7FE7453D0AC409BC25A3D0C8C3 /* YapDatabaseAutoViewTransaction.m */; };
-		DE518F2BFECC83B76B134E9F3DC26458 /* OWSSignaliOSProtos.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = C2F962A2A0360E3980FB6E741AF67E66 /* OWSSignaliOSProtos.pb.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		DE8CBA206B364542C9CF89A9A7E200B4 /* OWSFailedMessagesJob.h in Headers */ = {isa = PBXBuildFile; fileRef = E73B001A4AA833F35857843F9E632342 /* OWSFailedMessagesJob.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DED306381B9FBF27B35C4602F012F0E4 /* TSContactThread.h in Headers */ = {isa = PBXBuildFile; fileRef = F5EB78F21D70D33731893631B393446A /* TSContactThread.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DEEB19651149D3E30204FE74727C3A27 /* NBPhoneNumberUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 48606DFC17D4410FEE949D848D1BFDE7 /* NBPhoneNumberUtil.m */; };
 		DEF1AD7246778AB799227945F8254DBC /* YapDatabaseOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 31242F589772CC3ED0D8F20EA7FFE8F4 /* YapDatabaseOptions.m */; };
 		DEF1E27206BF74B8DD561D0EBF18F392 /* YapDatabaseAutoViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 745926C6E54FFF05299D4EB47CD7254C /* YapDatabaseAutoViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		DF0156D45D2254A507188AE8D8B21E1D /* AnyMessageStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C716E82378DF78B07503F1197C4F9F7 /* AnyMessageStorage.swift */; };
+		DF12479A3DC793964E95B3766BA27631 /* CDSQuote.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E0A93AD18C590C809854A1B3B673A15 /* CDSQuote.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DF1EF67E27DE12A0919FA1DB92C026D6 /* SRLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 588B81157C418226AA621768359C88E8 /* SRLog.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
+		DF5ABE7F4658A98ACBF7F085B4DA6FEC /* OWSSyncConfigurationMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 92334274784D5B1694F34230F94BDC54 /* OWSSyncConfigurationMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		DF5FC8D4DF52C01A4A5BB15E8E104906 /* HKDFKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 82842FFA52C2E0A6E71E00AEBB3ED809 /* HKDFKit.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		DF692700E2593ACF1141B1B3D8C99CE7 /* NSDictionary+YapDatabase.m in Sources */ = {isa = PBXBuildFile; fileRef = 157F2CC030CA5BC8464D38A260CDCFCC /* NSDictionary+YapDatabase.m */; };
 		DF72C0F9C9E78FA6D327BE791428BF95 /* NSRunLoop+SRWebSocketPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = AF7E5D23BC30F25C161A7FFE492B653F /* NSRunLoop+SRWebSocketPrivate.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		DFA46D0666D37A320D7DEBCCD974AC4A /* DDMultiFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 9CB2DF1FD1E17E499F6AD15EA5CEC050 /* DDMultiFormatter.m */; };
 		DFCE62CCEBB3271F1797983DD7656212 /* YapDatabaseExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = E414FBD07B05DC78066734F769332410 /* YapDatabaseExtension.m */; };
 		DFD3055FFCE37BFB5EB92E76F4C8EFB2 /* SQLCipher-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1F81F69A6D236296DC02FDFFF8C8C /* SQLCipher-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		E042BFF8078ADC112FDF1A4FA784C263 /* ContactsUpdater.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CBE7B611AC88ECF0F2EC970F8BF4E6B /* ContactsUpdater.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		E04FE2959069FDFE8B08B45F3BAF6CF4 /* YapDatabaseManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FC5D4E3353044B094142BD488F94B03 /* YapDatabaseManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		E0594BA15B4C6C4C2ED1DBBC4268485D /* WebSocketProto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F1B862DB505A4ADF14454CDF4831E39 /* WebSocketProto.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		E07AEF3EEEFF936180CF9D1DF3BD8BA5 /* ALView+PureLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 90A0B3D92D65BA05EC997157E92D1D31 /* ALView+PureLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E0E588E8196F62870B75D743480E1D56 /* UIActivityIndicatorView+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = A30EE01DF61206D70B035A04913E495E /* UIActivityIndicatorView+AFNetworking.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		E125F6DEA27D3C6838A1A132A19323DC /* OWSAddToProfileWhitelistOfferMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 13D00E0CA2AFF30038986AEACE1897D4 /* OWSAddToProfileWhitelistOfferMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		E1434F79B8F98FB73B4C90C8E8AFEDF0 /* YapDatabaseHooksTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CDC6876A24A93F492C0D0E23833CE23 /* YapDatabaseHooksTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E14C12C0DC326882EBE9812A044983A7 /* NSValueTransformer+MTLInversionAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 500381321FD2D1292DFBF05EE0CC2B34 /* NSValueTransformer+MTLInversionAdditions.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		E16BD6BC973D923A45B83949DE35CA3E /* YapBidirectionalCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A39B0F9DEDC9CF418B284561E2240AB /* YapBidirectionalCache.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E176E7B14B96CE4028A4A83A02BB0E1B /* YapDatabaseTransaction.m in Sources */ = {isa = PBXBuildFile; fileRef = AE7FEB1517C1F6482D09F86A6A0E2B11 /* YapDatabaseTransaction.m */; };
 		E17B13496B10828AF685C049E61FD07B /* YapDatabaseString.h in Headers */ = {isa = PBXBuildFile; fileRef = 0DEBA539C61B88ADCF0907593A4546D2 /* YapDatabaseString.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		E18F8C1A0CE5F749A9413B05FF4E4291 /* YapDatabaseFilteredView.h in Headers */ = {isa = PBXBuildFile; fileRef = C1D4AC777820F67F78302AADC7CB8124 /* YapDatabaseFilteredView.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		E18FEFFF752A9F69C96839A2AE0A76F9 /* TSInvalidIdentityKeyErrorMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B638BDECF5D316EF7F431DE67D84E85 /* TSInvalidIdentityKeyErrorMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		E198EC07B6C2772FBAA58FB38392D285 /* iOSVersions.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C1DAF4114664C34F6CD9A0504353175 /* iOSVersions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		E19AF60BF45B0D8A26F8D3ECF8F82CF6 /* TSRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = BF5F5F7F1E0ED6E3A2178EAE80A9230C /* TSRequest.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E1B474FB7187BF43AA3A1FD87E11F206 /* AxolotlParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1E6A076DE0399CD03A9144E4A9C5E6 /* AxolotlParameters.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E1BB327FF5EBA124BB234BBDB44D66C9 /* sha1.h in Headers */ = {isa = PBXBuildFile; fileRef = 58E416BF9082EF0E8E2B6844CDFE447B /* sha1.h */; settings = {ATTRIBUTES = (Project, ); }; };
+		E1D30B2AD380BA99E2ADE7BD4F0CF997 /* OWSMessageHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 28D0078EFA22A52F53BD480A86BCA2AA /* OWSMessageHandler.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		E1F5679758FBDACB5D1661B592F9AB18 /* AbstractMessageBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = E8CC360E514B05E9E55F9D2547671F51 /* AbstractMessageBuilder.m */; };
 		E23FC292C51742328C7C4E19E0D02543 /* YapDirtyDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B51CFD6385EE914D014CB013A1CDD28 /* YapDirtyDictionary.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E25F0977534B34851B044E235C5B1540 /* YDBCKChangeRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = EB2F69A1441CF732471516862A1764A1 /* YDBCKChangeRecord.m */; };
-		E26A87A5F6C77605CEC06CB20A213A0C /* Constraints.h in Headers */ = {isa = PBXBuildFile; fileRef = A453F23AFFFA251571C575247A9C8D1D /* Constraints.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		E27718F3D8DA1373265B0D3AF1AF6A9E /* OWSProvisioningMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = C680BB13CBF4519CD87BDD68A522D631 /* OWSProvisioningMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		E291947476AB319F27FD4A7DA947F320 /* GeneratedMessageBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = FFCF6B724F02B01AA2AF222A53A9D79D /* GeneratedMessageBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		E2FFDECA501B553660F9F672689D57E6 /* SSKProto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03DE0A8DB101ABAC2836342BAB30DAAB /* SSKProto.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		E32C4E4CCCAB1A5C8D931AE89EB2B200 /* YapCollectionKey.m in Sources */ = {isa = PBXBuildFile; fileRef = AEE0A367D4F78E64DF896DFFE2997E30 /* YapCollectionKey.m */; };
 		E32FBE124BF764E27894D531203F3025 /* SAMKeychain-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 5BF94CA7310F33FB62057F1D8C29581E /* SAMKeychain-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		E3383E05F5AF7095FCC0DEEC67AFA5C7 /* TextSecureKitEnv.h in Headers */ = {isa = PBXBuildFile; fileRef = B8C905E6DEF334DD49AFAEE885D14A18 /* TextSecureKitEnv.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E39842D9276E665A6462B3387B2554CB /* RKCK.h in Headers */ = {isa = PBXBuildFile; fileRef = B14012450217D8B314737B40CE2A29B3 /* RKCK.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E3C0B22D648A86E9266F6830CD2E0CEC /* YapDatabaseCloudCore.h in Headers */ = {isa = PBXBuildFile; fileRef = B25A55CEBBBA7E20872FFE8CB072E344 /* YapDatabaseCloudCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		E431EAF5F8E5EEB7DDCF866966197B8F /* OWSMessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = C2D38312B925794428A3BB94D8BFFC4A /* OWSMessageReceiver.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E461667CD3DC1DCE8F4514FD529DB983 /* DDFileLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BE1DE5E96390252534F838232175441 /* DDFileLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E48532B547A79BAAAFA3F56188A97EBA /* YapDatabaseManualViewConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = B96AD47705EDF6B495B624D9BFF062C5 /* YapDatabaseManualViewConnection.m */; };
+		E48658367D485180A1B7A7DF564805B7 /* OWSOutgoingSentMessageTranscript.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BEF5B7DABDB72BA36AA54768D47DB05 /* OWSOutgoingSentMessageTranscript.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		E4EF695F2D7F3ECADB5550984F1D4FDE /* PromiseKit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 721B638F9FA9DDA4BCE5E52F65D81EDD /* PromiseKit-dummy.m */; };
+		E513F334E395002BFCD001AD7517C54A /* Threading.h in Headers */ = {isa = PBXBuildFile; fileRef = 1E5DE337300507BB63838B25F13B3D29 /* Threading.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E521D9C814B7A0F783130832B4399794 /* SwiftProtobuf.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 942FDFF630730BF36022DB8D2DF77C64 /* SwiftProtobuf.framework */; };
-		E53E099B94D321042CD76CCD97E1E194 /* TSRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C5D240EEF5FEED6CAE55979325F401B /* TSRequest.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		E55B79B0E2F1FA48633D76038A6E43E9 /* OWSMessageUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 526B756DDB3CA96A92B7EC85367B0A1B /* OWSMessageUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		E563BBE7BC2222449F24123E661E6695 /* TSVerifyCodeRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = D03C1CF11242891CAE73865ED5A08A3F /* TSVerifyCodeRequest.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		E56E9093B027F9867705A9BAB0DA802C /* OWSSyncGroupsMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 454E1F5A6285CF7E2947C0D0F679DD30 /* OWSSyncGroupsMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		E635A53A01A2C53FE219A30AF8AA09CA /* FunctionalUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = B62293EF5E91E1CDF187A64F88092D36 /* FunctionalUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E64DB456CE61A49E394FD2260597E3BA /* UIViewController+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16C8D4E6CC65B49E9184554091E54488 /* UIViewController+Promise.swift */; };
+		E6635EA57C628C1D6C5DA2CE6E80F6D1 /* OWSAttachmentsProcessor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E0887D1B87E05582FBE4CA4CA00972C /* OWSAttachmentsProcessor.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		E6A29AF500164B7F26AC09666C0BA0A9 /* YapDatabaseViewMappingsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1220A9BFED68FF6D516CC30A259A821C /* YapDatabaseViewMappingsPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		E706E088246541A74E0D01105A4AD919 /* ge_p2_0.c in Sources */ = {isa = PBXBuildFile; fileRef = CC79E49CF11243DEE534D77356489131 /* ge_p2_0.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		E722B831D9F1039FF4341B681DAC16D0 /* OWSDisappearingMessagesConfigurationMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 02A2355B55CB44268238F576778CB0AA /* OWSDisappearingMessagesConfigurationMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E7399C16A5C9AFA71104F815A30A2443 /* UnknownFieldSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F3DEEC079E1FF62635068E14A490B6A /* UnknownFieldSet.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		E73D38BF901A3FAB598432CF956611B7 /* OWSMessageSender.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E47872A04C6E7720A1B9A0B4624B37 /* OWSMessageSender.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		E7CE3EFF26A85B0B9A2FAD8B2401C045 /* NSValueTransformer+MTLPredefinedTransformerAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B70FA309CEE6E88952737B18EF6636A /* NSValueTransformer+MTLPredefinedTransformerAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E7F0E5F5AB67FCFF0B66DC9B6F569519 /* SAMKeychain-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = EB56C2FB61C7E7B13460A105B5C3E10B /* SAMKeychain-dummy.m */; };
 		E7F32D41E6542A5EE90F4CA549653DBE /* SRProxyConnect.m in Sources */ = {isa = PBXBuildFile; fileRef = 989539B4E7A0324A7DD2F107A63FBFCF /* SRProxyConnect.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
+		E8441465709FBFCEE2A7C8B39C8826FC /* OWSOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCEC3703933E8076FB3916B7952915BE /* OWSOperation.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E8725251247937D16BA106625A734696 /* Reachability-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E8A7A11AAF3D2D53871B34C223EE3C6 /* Reachability-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E8CE5DE30952300A2489419433627300 /* Message.h in Headers */ = {isa = PBXBuildFile; fileRef = 363041FB31F689A3FC4892E5CDFF018B /* Message.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E8E895D9ED88E2C7A8EB11CFFE95CB8E /* YapDatabaseExtensionTransaction.m in Sources */ = {isa = PBXBuildFile; fileRef = BA9D05D8854F3753719699C314C8245C /* YapDatabaseExtensionTransaction.m */; };
@@ -1195,11 +1194,13 @@
 		E9A48E591CC327B6DCC898A4ABD77765 /* crypto_uint32.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B9C54AE58987FDD19F230EC7EA6C243 /* crypto_uint32.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		E9B4AF0B09437BAF4AA41B2DA336F872 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
 		E9B52C1296E82F42C21564FD9214AAA1 /* SRHash.m in Sources */ = {isa = PBXBuildFile; fileRef = 90E560F8D1834F8CEC67E0394C77F8B2 /* SRHash.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		E9F4CF1E9E5EE3B13BBCAB34836DD1BD /* TSIncomingMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 3601F8693B8A4E0649F983E40AD10D0C /* TSIncomingMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EA1F86FF7A1DF9330F893CC42F3D8DDB /* OWSFingerprint.m in Sources */ = {isa = PBXBuildFile; fileRef = 73F665EF8D7A04269662295F3E8CB665 /* OWSFingerprint.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		E9C36991DE63D27BC3BAEBD20FC9649A /* OWSHTTPSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = E92C5F13CE74C286B4D24FC95B186EB6 /* OWSHTTPSecurityPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		E9EE95A157126EE35B4CA03B999B662B /* OWSProvisioningCipher.h in Headers */ = {isa = PBXBuildFile; fileRef = 52984339A6E4D693C28000B638BE0D62 /* OWSProvisioningCipher.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EA49C99DA65D942581AC322E4EFEEA4E /* Pods-SignalShareExtension-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 86217DF5967723EC4C61F7979F334B5A /* Pods-SignalShareExtension-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EAE97C6F359BE793F73FDC5BFCF875B1 /* YapDatabaseCrossProcessNotificationConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = A2D9FD9C023CAEAA5E72C772A20CD16A /* YapDatabaseCrossProcessNotificationConnection.m */; };
+		EB7F01289BA2F98D1554FC6A8644777D /* OWSDynamicOutgoingMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 09C019F39B6EBBD012F28E2DA16AD9D4 /* OWSDynamicOutgoingMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		EC0C8ED973CAC49DF8742F1B85F74A51 /* UnknownFieldSetBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 8067738489DF46A6A438ED2A869B5666 /* UnknownFieldSetBuilder.m */; };
+		EC1AE6466C17171E8720E5E47951F383 /* OWSCallBusyMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = BC6BB378E808FACCC665A106A33F4615 /* OWSCallBusyMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		EC2239A0C6015B542BDCFCB8A9B606B9 /* AxolotlKit-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 27B849F86E58F7911D4D4C5245101283 /* AxolotlKit-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EC4BADD589484931AA2E8EED50DCC092 /* YDBCKRecordInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 3994C093DEF4750BC8FCB7C920191BFB /* YDBCKRecordInfo.m */; };
 		ECA82911E5E38B15CBBAB4A331A54C04 /* RatchetingSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 74A7DCF24FA8FA59FE8AD3E2BF4FBC04 /* RatchetingSession.m */; };
@@ -1207,16 +1208,15 @@
 		ECDA8644818246288ABC27105C514645 /* Message+BinaryAdditions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEE838BE73985113A36EBC5A7664BE52 /* Message+BinaryAdditions.swift */; };
 		ED0275BC4AB245F29407FED870A76161 /* ge_frombytes.c in Sources */ = {isa = PBXBuildFile; fileRef = 7957C2614EA7B8E83317263EF4D139B3 /* ge_frombytes.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		ED1137F5016CBFF35D7CEF6A44042EA9 /* UIRefreshControl+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = C7F93CCF9B5A4B84BEC3E5D81041B413 /* UIRefreshControl+AFNetworking.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		ED3F58E154BF9AE5250F38BC1B2A8564 /* OWSPrimaryStorage+Calling.m in Sources */ = {isa = PBXBuildFile; fileRef = 98FDCB4A2CCB6F90470E8679CC6AA9CF /* OWSPrimaryStorage+Calling.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		ED75DB430BD3D1BC63666050EEC7E962 /* TSPreKeyManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DA2F10FFA8315F84DA5F1C048262D7B /* TSPreKeyManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EDC4731C46AF4DBAD125134EDD21B1B1 /* BadArgument.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E24F9FE67F842E2E47876EAEF3C6E99 /* BadArgument.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		ED9C85BD5FA4217D6F4270D8B9149E1E /* OWSFingerprintProtos.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = 48631D16A587B7EFFBFF67CBB3629408 /* OWSFingerprintProtos.pb.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		EDCC526D0877A7DD6D7175447CB30CDD /* SignalIOSProto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38FD00281DCF6EC49D11D6B4CEE7CFC2 /* SignalIOSProto.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		EDEC9645F24B1D661F7A2DF6F8EFB396 /* TSQuotedMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 11E2FEDC58CEB859369D62186C99DAE9 /* TSQuotedMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EDFA36E2C20E258098A09477DC5C728E /* base2.h in Headers */ = {isa = PBXBuildFile; fileRef = C2C9BEA1710BA38463FBF9F447E194AE /* base2.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		EE13796C514D63771357DA183DCAF7FF /* UIImage+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = 210F1ED7D9FA40F85C171BAD6D9F3B3F /* UIImage+AFNetworking.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EE5A05DADD6120A8D2BB4101D5AE4F60 /* AFURLResponseSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AF6C1939A52219C2C90678404EA1D81 /* AFURLResponseSerialization.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		EEF5F4DE6F3D598796D0932916BE8810 /* TSAttachmentStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B34CEBE4B5FBDAD2F52C8732D82FE05 /* TSAttachmentStream.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EF264EAD66935E357B95FA5834D458A8 /* fe_add.c in Sources */ = {isa = PBXBuildFile; fileRef = 97BAE05D8250D16F4B8A30438B1CCDA4 /* fe_add.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		EF45E848A7C8119597A7B457134500CF /* OWSChunkedOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = EEBCA7E9F47282065363153607C22B90 /* OWSChunkedOutputStream.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		EF6C6B883577691BFF134F8E5B344EF9 /* YapDatabaseAutoViewConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B574762CCD954F179F50682FB6B73A9 /* YapDatabaseAutoViewConnection.m */; };
-		EF9B32FEF9FDF83F280AB77FBDBED8F1 /* OWSUnknownContactBlockOfferMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = DB703A1B16D16E5987F7EBD484E31A66 /* OWSUnknownContactBlockOfferMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EFC760EADBF3F251A7E31322D639CA59 /* metamacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BF6578BACE21009E23D8C239E2BA3D8 /* metamacros.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		EFFA02CBAEA77E82B9F00D8BAC2DAF50 /* crypto_hash_sha512.h in Headers */ = {isa = PBXBuildFile; fileRef = C48CEB8F37B7E1F3FA73464BEB5BF6CA /* crypto_hash_sha512.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		F034D73F664529EC557330EFBF017EED /* NBNumberFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = A6C6C7ECC5D91B5B1A3CA63D4BD561D5 /* NBNumberFormat.m */; };
@@ -1224,73 +1224,71 @@
 		F0D593C84E0FF55EAC3B008E31AAD7B4 /* YapDatabaseActionManagerTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 7F9A83C2ECA017567F1F715307AECF3F /* YapDatabaseActionManagerTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F145DA3B97C05A7B4AF16AD276F34FAC /* DoubleFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA350871AFF95381B5A148201715117B /* DoubleFormatter.swift */; };
 		F1C5CE0F3E655B978141F14696DD76E5 /* DDOSLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DDD5C426950C86DFE7B5263E7017E75 /* DDOSLogger.m */; };
-		F1DF064149E7808F491225D0F7521951 /* TextSecureKitEnv.h in Headers */ = {isa = PBXBuildFile; fileRef = 25443B9D114F96B12799F36BAA459580 /* TextSecureKitEnv.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F1ED5DF37233FA1CF361CC07C0B14235 /* OWSSignalService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A7F67482256F97E420138E046B95CC5 /* OWSSignalService.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		F1F8C2A5EDED3B0BF54E1BB87F773320 /* OWSSyncContactsMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 93C5196F929F75446D886C9231827DC5 /* OWSSyncContactsMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		F205764B85911449DFB1F8A94706DA89 /* any.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92530B93986BA152C1B486D45746FA2A /* any.pb.swift */; };
+		F21A98911E59371A88389B538AF3768D /* OWSRequestFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BBB20B9098E2F91A52B0B89124B2928 /* OWSRequestFactory.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		F22B980AF98D96FED6455D6597E1CA66 /* Google_Protobuf_FieldMask+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C78ED5DDDA0D4F882669ED87262F5788 /* Google_Protobuf_FieldMask+Extensions.swift */; };
-		F231AD114E3F1FA99E0D45B23E1EC3CE /* NSObject+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = AC602C0278DCABEE68225B9C59961987 /* NSObject+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F2357A1E066074D8DAC0F0EF189B324A /* YapDatabaseCrossProcessNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 1945A89224B845BA076A6E2A6DA03920 /* YapDatabaseCrossProcessNotification.m */; };
-		F29B9E5CBEDA68DEF4E24320F3FD0544 /* TSGroupThread.m in Sources */ = {isa = PBXBuildFile; fileRef = 117A0660BD80E51E091800DE92CA3DD4 /* TSGroupThread.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		F2BC48C1DC46B0A081836DDA3BCB5054 /* NSData+messagePadding.m in Sources */ = {isa = PBXBuildFile; fileRef = C9D4985C424C72BB37C86E7E9B94F89C /* NSData+messagePadding.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		F30CD5EAF844BAD87E236E031FCD19E3 /* OWSAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C8E6EA45C0F033AC766F4172BCB11C1 /* OWSAnalytics.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F33C97CBA710AC96D5D750AD018CB07D /* OWSVerificationStateSyncMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E070AA7725CBE3600052A76288DEC6 /* OWSVerificationStateSyncMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		F36C7333DF2C2F4D333572D0EE81BB8F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22761305586B0DB97894B782DD672A37 /* Foundation.framework */; };
 		F36E66E21AB95C0C517DDD54FC728907 /* Mantle.h in Headers */ = {isa = PBXBuildFile; fileRef = 2ABA1DFFB506F50D05CC51777BC5BAF4 /* Mantle.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F3906A6541262E6FA936C8B786B14A11 /* aes.h in Headers */ = {isa = PBXBuildFile; fileRef = 82C478827FA1031D0519A14869C06ECF /* aes.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		F3DE93A4BD8D7B968A61261EDA5FB9FC /* UIView+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = D990DB7A3790014498215542A2AD7790 /* UIView+Promise.swift */; };
-		F3F72C8333CD1DD853FBB4558E8D9B07 /* WebSocketResources.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 480C82E67D45E2721A7B4F25C877AE5A /* WebSocketResources.pb.swift */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		F450457F6251D3AC93909ADA6FAE1611 /* NSURLRequest+SRWebSocketPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 74CDD25E02003BC39FC55747EACE0AC7 /* NSURLRequest+SRWebSocketPrivate.h */; settings = {ATTRIBUTES = (Project, ); }; };
-		F456615B94EC81BC7DABFEA225E1C744 /* OWSSyncGroupsRequestMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = ECA492D371F9EA340746FBEA65472C36 /* OWSSyncGroupsRequestMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F4D2FB0657E0330F9F33903A000089E3 /* OWSPrimaryStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D9C973951FD75AF4D4E70AF220A0352 /* OWSPrimaryStorage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		F5094A89FD33EF285E94984B276EC903 /* OWSDynamicOutgoingMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 9CAEFFAD5C051996FD4A2CDCA7284468 /* OWSDynamicOutgoingMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		F465BEC5B9CA870237E3BBE85F4A8312 /* OWSMessageSender.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A2679778C5BE6AE902DA386273F6124 /* OWSMessageSender.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		F4F0AEB771F095E8589B417CA3417A67 /* OWSFailedMessagesJob.m in Sources */ = {isa = PBXBuildFile; fileRef = 363F37E250119A0541255418CB9F4FF4 /* OWSFailedMessagesJob.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		F52E88AA6880DD6B0CD34356D36ACF01 /* ByteParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BB1F13B725960979F8BB79ECE8DDFEC /* ByteParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F569F243C04B9E1E38C6A05AD349C785 /* OWSGroupsOutputStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FE49B49ACB2C1DCEBC101D4D34FF0BF /* OWSGroupsOutputStream.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F56C7BDDB2237CDE8138A1C1CDAC1169 /* ge_madd.h in Headers */ = {isa = PBXBuildFile; fileRef = 1E63E906E61C4555318B212D0777024F /* ge_madd.h */; settings = {ATTRIBUTES = (Project, ); }; };
+		F5B26D1FF0E6C7251D907662EC5F9702 /* OWSRecipientIdentity.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ED3FD155B5F224FABF6E0AAD19563DF /* OWSRecipientIdentity.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		F5BA181842B2E970DFF92BDBC23A2C38 /* crypto_int64.h in Headers */ = {isa = PBXBuildFile; fileRef = A40891E3E30794BAB4C9DA288B5B07EE /* crypto_int64.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		F5BBE814783E81F2A836471E55B633B0 /* SRSIMDHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 16F493451C7FF35C5A3AE7230468FD78 /* SRSIMDHelpers.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		F5C331BB76C973DF8C154DFFFDF09D33 /* YapDatabaseSecondaryIndexOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 58AD1A4141B6C2D67E69D8E61496A9EC /* YapDatabaseSecondaryIndexOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F5CC1B026417DE7343B98102EFB755AC /* OWSDisappearingMessagesConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 410487ABA793C297696A3589A5C3B1CE /* OWSDisappearingMessagesConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F5E7DED5999EE1F57A4791A05802F94F /* NSTimer+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = 78445B986114E16E196E63B08A0BFEF7 /* NSTimer+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F60C221C9E179FF7371A1EF4AC354E0A /* DigiCertGlobalRootG2.crt in Resources */ = {isa = PBXBuildFile; fileRef = 2FFE7C173700FAC6BF5A82E93F7BF4DE /* DigiCertGlobalRootG2.crt */; };
-		F643776B98D994A68FC1AAE3235B00D3 /* MIMETypeUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B294575969E66B07ACFB2674C1A98375 /* MIMETypeUtil.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		F60C221C9E179FF7371A1EF4AC354E0A /* DigiCertGlobalRootG2.crt in Resources */ = {isa = PBXBuildFile; fileRef = 1E046CB740EAF9BDB893F46140765E4B /* DigiCertGlobalRootG2.crt */; };
+		F6573D07E709549325E44657BB7FA9A0 /* OWSBlockingManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 9CE4158E0B5B8A498C3EB536733E9A5D /* OWSBlockingManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F6B0E5184AAC7F3DCA8783BE15852E0F /* d.h in Headers */ = {isa = PBXBuildFile; fileRef = A046DA4FA0B345CB82EAB10C9B87CBD4 /* d.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		F6E1905A16D8E97843D69682A293D615 /* Google_Protobuf_Any+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA3AAFBB1F002B3216E13F5C822DE62A /* Google_Protobuf_Any+Extensions.swift */; };
 		F744C48990924E5F032215789310996C /* fe_invert.c in Sources */ = {isa = PBXBuildFile; fileRef = 297031EB51D00BE28020EA886EDE3892 /* fe_invert.c */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		F758F676D995BF4215D7E96467A4AC41 /* TextSecureKitEnv.m in Sources */ = {isa = PBXBuildFile; fileRef = ADEC441F01338CB4BA847F06A59FD1C5 /* TextSecureKitEnv.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		F7720C2823F0B8A17203562FE3053125 /* YapDatabaseRelationshipTransaction.m in Sources */ = {isa = PBXBuildFile; fileRef = 834952DCE37A944B1023BF83E0A8C579 /* YapDatabaseRelationshipTransaction.m */; };
 		F779B57CA3DD1BA7B24BCCAE9348171D /* YapSet.m in Sources */ = {isa = PBXBuildFile; fileRef = F3A6054AE2BE14F30D68CB80118F0C9F /* YapSet.m */; };
-		F7802FC005396F74C79713E76A311F37 /* OWSCallBusyMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = A3ADAD6AA4C431B46728C206AB0292B5 /* OWSCallBusyMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		F7B9C33759CFC6B3CF4D7C8ABF5A4FC6 /* brg_endian.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C580A7C4E396B5EC854BD239D4D8FDF /* brg_endian.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		F80C2873C5B6B248C55F9302C9944210 /* YapDatabaseSecondaryIndexHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 9EEF3735366A7DA86AA6B7970F4F0937 /* YapDatabaseSecondaryIndexHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F84D5B66BD4B022A13475C36C0953DD7 /* AppVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = CF5C46EEC133BA0ECA03B04BD210685A /* AppVersion.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		F94E4DF0183E21C9C28FC8426E981953 /* Cryptography.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BC1545E958169B2E23925FEB6365EE2 /* Cryptography.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F96E4EDC7A27E1A9C5340C8F9242C038 /* TSStorageKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 049977A61A3482B3CAE1C68A4D173906 /* TSStorageKeys.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F97DE8E44DD0EDCD33470C64D6B868B9 /* NSData+Base64.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FB7B89FEBC47E2B880EAE57CED8CE47 /* NSData+Base64.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F9D6DC23C68A8FED768274BBF271D0F4 /* NSData+Image.m in Sources */ = {isa = PBXBuildFile; fileRef = E1DC366A85C9D9DE16B5295DB1633FFD /* NSData+Image.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		F8832EF5A75A2169D1F6D0B94F99C7AB /* OWSFailedAttachmentDownloadsJob.h in Headers */ = {isa = PBXBuildFile; fileRef = 189DE6D20F64C6815969E86A03790FD2 /* OWSFailedAttachmentDownloadsJob.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F89BFF4216EC2968954F46AE18048BC6 /* OWSProfileKeyMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E878EFC29205FA4982A6F25F1F0A281 /* OWSProfileKeyMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F9FF566A0734D1210EA2C073F7872D07 /* YapDatabaseRTreeIndexConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA0A50D95B03B471B394658B3032148 /* YapDatabaseRTreeIndexConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		FA043C9D515B70978289DE6F8C4BC5F6 /* OWSPrimaryStorage+keyFromIntLong.h in Headers */ = {isa = PBXBuildFile; fileRef = D6A6CEEFA6861466743377992FB297EC /* OWSPrimaryStorage+keyFromIntLong.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		FA172B6708DDEFA00C50EC1434499379 /* JSONDecodingError.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC6BF712B0313502BD5837F9F295813A /* JSONDecodingError.swift */; };
 		FA1C4C502802B6052FD1FDE73FE00E01 /* Google_Protobuf_ListValue+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E7113A484A7C32606859B64A1FF9F8F /* Google_Protobuf_ListValue+Extensions.swift */; };
 		FA1C69BAA9317F02B7CF71BB4574E841 /* YapDatabaseRelationshipOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = F4D0417F0D6930A7FF4B46DDF93EB2FC /* YapDatabaseRelationshipOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		FA5E3F795E9BB5CEB703AD7F8785A9F2 /* OWSDeviceProvisioner.h in Headers */ = {isa = PBXBuildFile; fileRef = 52BC0A97AB00A64FAA0D8F589561EC9B /* OWSDeviceProvisioner.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		FA87154B0212866CC116E3A8E44E2DAF /* YapDatabaseViewConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = F99F02CD2BA71650E0B010C01FE9D36A /* YapDatabaseViewConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		FAACB1048B0094C8E257EF2C5C9613E8 /* OWSSyncContactsMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 305C16C8A5DA904F952EF4E1D302B0B5 /* OWSSyncContactsMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		FB319D4446B96FEA3992BC76772BC9C7 /* OWSSyncGroupsRequestMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = E789403C585B4F0654DF297F1C0E769D /* OWSSyncGroupsRequestMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		FBCB6DE1080128F50D7676CFA1D4A82C /* UIViewController+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = EDE366908CFF6B1EC7FD05D4898526BC /* UIViewController+AnyPromise.m */; };
-		FBF57E0B3BE4C27990E343A151694FF9 /* OWSRecipientIdentity.m in Sources */ = {isa = PBXBuildFile; fileRef = D522B055E7FB86F4AAF4EAD21A4C58CD /* OWSRecipientIdentity.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		FC2099B2BA37998ADAC8FF05FF8A7493 /* OWSOutgoingCallMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = FED37B52C8A4ED417A16FDAAA3AF48EE /* OWSOutgoingCallMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		FC20A9E1EF43A0CA70C6E6DF10207054 /* MessageKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 5EC14F9034C66D489EC3A6B581078F25 /* MessageKeys.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		FC2D9D711F57F905C8D36EA25DB3DEA4 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1226ECB940A2EC82DA29114E2924353 /* UIKit.framework */; };
 		FC38E66216B342F5595C9918246D9520 /* YapDatabaseRelationship.h in Headers */ = {isa = PBXBuildFile; fileRef = B44343E2ABF9444F0F9E13D6A2827988 /* YapDatabaseRelationship.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		FC3A53BB7DA42EBD44E5E79325CF26F9 /* TSGroupModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E33A7A815DB08E7B205A4293550EFEF /* TSGroupModel.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		FC8F3C9B0FEAD76EC5B43F84136A8C88 /* Curve25519Kit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F28D9FE9F67730285658675C1579F8C /* Curve25519Kit.framework */; };
 		FC936466E16685713180771133F0ECD1 /* YapDatabaseCloudCoreOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = B083A571AF322BB8548B42D677F85C1E /* YapDatabaseCloudCoreOperation.m */; };
-		FCAC62C3291A1161D2FC0F6B6F9D2645 /* OWSDeviceProvisioningService.m in Sources */ = {isa = PBXBuildFile; fileRef = 89559634B6EA113D2F13062AA595E1E5 /* OWSDeviceProvisioningService.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
-		FCEE98B795C24FCBA2DBA156B535992E /* OWSIdentityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 369A29176C6B3D4FFA8D54739DE7CC0F /* OWSIdentityManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		FCCB5DDD582BA96D8725DFB6BFBC5B0B /* OWSCountryMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 307E4232F3401FFBDFB804FB90C8498E /* OWSCountryMetadata.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
+		FCCD0B15DDD01348D80EC15415006C3C /* OWSFileSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DEFCEFB4647B8A978C734AD37F16E04 /* OWSFileSystem.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		FCF185A8EDE1535B3901F862805CF031 /* YapDatabaseCloudCoreTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = CC599D315B1037D983714E8AD3F78101 /* YapDatabaseCloudCoreTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		FD055FA7827A33017A091F6E787E27B1 /* OWSMessageSender.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C1112D2596C69C76939456ED1C79E66 /* OWSMessageSender.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		FD9B86DF9E27E3D094FE8EB0F8535FE9 /* NSDate+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = 49DF6BC24395FC978B59E20CA45AD8A1 /* NSDate+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		FD87AD05DF14B2BCEAD5FD4AEF0E4857 /* OWSCallBusyMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CAB9F597D0F505B7092B1BA97A3BBFC /* OWSCallBusyMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		FDA9D5D8A5D9DB9421C427B8EFD7AAD3 /* UIImageView+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = 712A63DF629EB8DD7DE2C4BD8807C9B4 /* UIImageView+AFNetworking.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		FDD828FE351A0161FD48391FFD56ABA6 /* AFHTTPSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6DA34D389C0CAAC2344954112B60CFE9 /* AFHTTPSessionManager.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		FE0F54F37DE935955C3B32E64F507DCA /* zeroize.h in Headers */ = {isa = PBXBuildFile; fileRef = F1C453EB99A7889F2B3D74E5EDDB64E6 /* zeroize.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		FE169CD9CBDFEEC2375B9B225D012217 /* NSDictionary+MTLManipulationAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 0779FE62A006175D800E00E80C20B87A /* NSDictionary+MTLManipulationAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		FE1DFADA620B054E0DE46425D9AA30E5 /* YapDatabaseActionManagerTransaction.m in Sources */ = {isa = PBXBuildFile; fileRef = 52B72DC1D8D38B84AD96AA07A432778B /* YapDatabaseActionManagerTransaction.m */; };
 		FE5D27B39161B930C752A200FBCB2088 /* PreKeyWhisperMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = EB074CDBE0F5874F4434A04D09A22CE2 /* PreKeyWhisperMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		FEE30D01CCF6765D5EF0DAA3ADFB4375 /* CDSQuote.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E4C2A558E1E7336049D2FB36D3F5E02 /* CDSQuote.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		FEE79AA507683EA90B3DEA0FDE05C48C /* PromiseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E86CC2E4AB97374116857447658876D1 /* PromiseKit.framework */; };
+		FF09E1E104464C3D2F0A098FF226696A /* OWSDisappearingMessagesConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 055585882912CD58F6CFDA165AA21DF9 /* OWSDisappearingMessagesConfiguration.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		FF3CB816580D35C020FF1CFD1799A81D /* YapDatabaseHooksConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 192A365B49B955B2C00D707B9EEF1424 /* YapDatabaseHooksConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		FF50FA6AE1B54D511E9B73FF909B3CC5 /* OWSFileSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 56086BB87093FE7D3B0D6DE9ECA898C6 /* OWSFileSystem.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		FF63036F83564DA7D397A95FEE26204F /* YapDatabaseSecondaryIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = 594A4E4C3BBB0DFAA85086536AAC2F24 /* YapDatabaseSecondaryIndex.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		FF8975B924011531FD2B4A6BFB5BA17E /* OWSDisappearingConfigurationUpdateInfoMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 42DF8E20B9CE4D5AD0A024BC70CC4171 /* OWSDisappearingConfigurationUpdateInfoMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		FF82409165EDE0BFFA6C6C8814E2528E /* TSInvalidIdentityKeyReceivingErrorMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = D3C100E70B26E998089D0B2F0694B999 /* TSInvalidIdentityKeyReceivingErrorMessage.m */; settings = {COMPILER_FLAGS = "-fcxx-modules"; }; };
 		FFC056C3953F2FF012D4B55B5BEAA03E /* Message+TextFormatAdditions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E311AE9DCD8D8B6D74A486BFF833AAF3 /* Message+TextFormatAdditions.swift */; };
 /* End PBXBuildFile section */
 
@@ -1967,136 +1965,154 @@
 		003619010F142A1C3011D9D5EBF05FBA /* UIWebView+AFNetworking.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIWebView+AFNetworking.m"; path = "UIKit+AFNetworking/UIWebView+AFNetworking.m"; sourceTree = "<group>"; };
 		0058608EE0C9E65E31B64D49E2E98E2D /* YapDatabaseSecondaryIndexSetup.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseSecondaryIndexSetup.h; path = YapDatabase/Extensions/SecondaryIndex/YapDatabaseSecondaryIndexSetup.h; sourceTree = "<group>"; };
 		008C121E1E02F1D63DAFBE7A2688E9B3 /* YapDirtyDictionary.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDirtyDictionary.m; path = YapDatabase/Utilities/YapDirtyDictionary.m; sourceTree = "<group>"; };
+		00DEE21CEC8BE12BA9D980FD46AD79D1 /* TSQuotedMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSQuotedMessage.m; sourceTree = "<group>"; };
+		00E070AA7725CBE3600052A76288DEC6 /* OWSVerificationStateSyncMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSVerificationStateSyncMessage.m; sourceTree = "<group>"; };
 		00E226C550A18BD6A1CAFD694E1F1410 /* YapDatabaseRTreeIndexConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseRTreeIndexConnection.m; path = YapDatabase/Extensions/RTreeIndex/YapDatabaseRTreeIndexConnection.m; sourceTree = "<group>"; };
-		00F684F2BF62BC9279EE67BEDEA7672B /* OWSFingerprintProtos.pb.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSFingerprintProtos.pb.m; sourceTree = "<group>"; };
-		011D35AA5E13775DDE30470FE5D73061 /* OWSVerificationStateChangeMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSVerificationStateChangeMessage.h; sourceTree = "<group>"; };
+		017561A12FF4B06A240722521B53D247 /* OWSSignalService.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSSignalService.m; sourceTree = "<group>"; };
+		01774CB3C3CEA2D81316D45375550178 /* OWSPrimaryStorage+SignedPreKeyStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OWSPrimaryStorage+SignedPreKeyStore.h"; sourceTree = "<group>"; };
 		01C35EB7C6AC4C9515CC907D4F748B52 /* RootKey.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RootKey.h; path = AxolotlKit/Classes/Ratchet/RootKey.h; sourceTree = "<group>"; };
-		01D0CFDB40677718FDAA37DCDE93325E /* GTSR1.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = GTSR1.crt; path = SignalServiceKit/Resources/Certificates/GTSR1.crt; sourceTree = "<group>"; };
+		01E40C234C86974BBEB5036C13C0F74E /* WebSocketResources.pb.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = WebSocketResources.pb.h; sourceTree = "<group>"; };
 		0214275162927523E20E0D1D97316622 /* Pods-SignalShareExtension-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SignalShareExtension-resources.sh"; sourceTree = "<group>"; };
 		025919229EFF5DF3A33418A4602C7D39 /* Pods-SignalShareExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SignalShareExtension.debug.xcconfig"; sourceTree = "<group>"; };
+		02A2355B55CB44268238F576778CB0AA /* OWSDisappearingMessagesConfigurationMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDisappearingMessagesConfigurationMessage.h; sourceTree = "<group>"; };
+		02C90CE65864E3BF9C298E3E3341B68D /* OWSRequestBuilder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSRequestBuilder.h; sourceTree = "<group>"; };
+		02E053A2EF6C986454673EEF8C40DA00 /* OWSDeviceProvisioningCodeService.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDeviceProvisioningCodeService.h; sourceTree = "<group>"; };
 		02EF9A8879082680FD4E1529A7784A1F /* YapDatabaseRelationshipEdgePrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseRelationshipEdgePrivate.h; path = YapDatabase/Extensions/Relationships/Internal/YapDatabaseRelationshipEdgePrivate.h; sourceTree = "<group>"; };
 		02F2FD011700282B195A31E18E33BDDB /* SRMutex.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SRMutex.h; path = SocketRocket/Internal/Utilities/SRMutex.h; sourceTree = "<group>"; };
+		030DF529C31A24D2B5169866C68051E7 /* OWSFailedAttachmentDownloadsJob.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSFailedAttachmentDownloadsJob.m; sourceTree = "<group>"; };
 		031FB93DBE1287FD83768C1E2C864F27 /* NSData+keyVersionByte.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSData+keyVersionByte.h"; path = "AxolotlKit/Classes/Utility/NSData+keyVersionByte.h"; sourceTree = "<group>"; };
 		03209DCF8C62522BF65CB936CB78A2AB /* MessageExtension.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MessageExtension.swift; path = Sources/SwiftProtobuf/MessageExtension.swift; sourceTree = "<group>"; };
 		03431675C2690F6D543CBBC4A09D46FD /* Visitor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Visitor.swift; path = Sources/SwiftProtobuf/Visitor.swift; sourceTree = "<group>"; };
+		034C6CF96E3C5DA5214BFBC7C1170B15 /* OWSError.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSError.m; sourceTree = "<group>"; };
 		035396EBD2ABBC689B41309A98C783E7 /* YDBCKChangeQueue.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YDBCKChangeQueue.m; path = YapDatabase/Extensions/CloudKit/Internal/YDBCKChangeQueue.m; sourceTree = "<group>"; };
-		03647357328B0A361BAF3E1ACDD7232E /* OperationFailed.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OperationFailed.h; sourceTree = "<group>"; };
 		038B9EA2E04BBE58D3E402FEBFF2C725 /* Google_Protobuf_Wrappers+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Google_Protobuf_Wrappers+Extensions.swift"; path = "Sources/SwiftProtobuf/Google_Protobuf_Wrappers+Extensions.swift"; sourceTree = "<group>"; };
+		03DE0A8DB101ABAC2836342BAB30DAAB /* SSKProto.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SSKProto.swift; sourceTree = "<group>"; };
+		03FF8730D027CF37A57EA4643A2560BE /* OWSDisappearingMessagesFinder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDisappearingMessagesFinder.h; sourceTree = "<group>"; };
+		045AB9359A54A83587F6B9E02FA09ED7 /* NSDate+OWS.mm */ = {isa = PBXFileReference; includeInIndex = 1; path = "NSDate+OWS.mm"; sourceTree = "<group>"; };
 		045BFF07CC3146C5C3CCE5B20E5A2464 /* YDBCKChangeSet.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YDBCKChangeSet.m; path = YapDatabase/Extensions/CloudKit/Utilities/YDBCKChangeSet.m; sourceTree = "<group>"; };
 		048409DB45493B3A79474EA1B21173AD /* DDDispatchQueueLogFormatter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDDispatchQueueLogFormatter.m; path = Classes/Extensions/DDDispatchQueueLogFormatter.m; sourceTree = "<group>"; };
-		049977A61A3482B3CAE1C68A4D173906 /* TSStorageKeys.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSStorageKeys.h; sourceTree = "<group>"; };
+		04A99890F54D86C5277C925554089928 /* NSTimer+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSTimer+OWS.h"; sourceTree = "<group>"; };
 		04F1E46631D33BECA6BA494FDA629312 /* PureLayout.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PureLayout.h; path = PureLayout/PureLayout/PureLayout.h; sourceTree = "<group>"; };
 		04F4297736580AAB7AACC0FD762D9CAD /* DDDispatchQueueLogFormatter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDDispatchQueueLogFormatter.h; path = Classes/Extensions/DDDispatchQueueLogFormatter.h; sourceTree = "<group>"; };
 		04F5897ACCEDC56878296B41651A5C48 /* fe.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = fe.h; path = Sources/ed25519/fe.h; sourceTree = "<group>"; };
 		05093C5D6EB0642FF2B49BEB17A8B986 /* UnknownFieldSetBuilder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = UnknownFieldSetBuilder.h; path = src/runtime/Classes/UnknownFieldSetBuilder.h; sourceTree = "<group>"; };
+		050C5BD66C5355ADF0D1300C6872B205 /* OWSPrimaryStorage+messageIDs.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OWSPrimaryStorage+messageIDs.h"; sourceTree = "<group>"; };
 		0531FD361C0B8F32A47B3C133E2671AB /* YapDatabaseCloudCoreGraph.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseCloudCoreGraph.m; path = YapDatabase/Extensions/CloudCore/Utilities/Execution/YapDatabaseCloudCoreGraph.m; sourceTree = "<group>"; };
 		0532B6C6D08BC23657EB47C90BCFD3F0 /* crypto_sign.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = crypto_sign.h; path = Sources/ed25519/nacl_includes/crypto_sign.h; sourceTree = "<group>"; };
+		055585882912CD58F6CFDA165AA21DF9 /* OWSDisappearingMessagesConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDisappearingMessagesConfiguration.m; sourceTree = "<group>"; };
 		056B6192E98A8F64952F27F78DFE8A95 /* zip.c */ = {isa = PBXFileReference; includeInIndex = 1; name = zip.c; path = SSZipArchive/minizip/zip.c; sourceTree = "<group>"; };
-		0590F2ECDF0D648DF868733D68529126 /* OWSSyncConfigurationMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSSyncConfigurationMessage.h; sourceTree = "<group>"; };
-		05D3581A8EB82D1E33590FCED5FDB25C /* OWSOutgoingSentMessageTranscript.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSOutgoingSentMessageTranscript.m; sourceTree = "<group>"; };
 		05F549501D9581470E7D6292A06E39C6 /* NSRunLoop+SRWebSocket.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSRunLoop+SRWebSocket.h"; path = "SocketRocket/NSRunLoop+SRWebSocket.h"; sourceTree = "<group>"; };
 		05FA9FBEB78F178D2BBE7A8456E8C11C /* Pods-SignalShareExtension.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-SignalShareExtension.modulemap"; sourceTree = "<group>"; };
 		06205F4D53CCBB10728547B2D6839845 /* SRHash.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SRHash.h; path = SocketRocket/Internal/Utilities/SRHash.h; sourceTree = "<group>"; };
 		0622C017D0958DABD71D39C573869F2B /* YapDatabaseFilteredView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseFilteredView.m; path = YapDatabase/Extensions/FilteredView/YapDatabaseFilteredView.m; sourceTree = "<group>"; };
-		0681BEB193DB2AA2AB110E8E458CC526 /* TSInvalidIdentityKeyErrorMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSInvalidIdentityKeyErrorMessage.m; sourceTree = "<group>"; };
+		0665528B8730D95E85F703E211410D0D /* OWSCallMessageHandler.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSCallMessageHandler.h; sourceTree = "<group>"; };
+		0669B00F60EECF0F0DB05ED59F927DF8 /* OWSAsserts.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSAsserts.h; sourceTree = "<group>"; };
 		06C0FEA740E2DCB8CEC3BA10A95ABC93 /* YapDatabaseActionManagerPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseActionManagerPrivate.h; path = YapDatabase/Extensions/ActionManager/Internal/YapDatabaseActionManagerPrivate.h; sourceTree = "<group>"; };
 		06D618ED6BD8CA085EA6AF807C898E5E /* PromiseKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = PromiseKit.framework; path = PromiseKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		06F18226492BB73BEE8FB462834FA1F1 /* MTLValueTransformer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MTLValueTransformer.h; path = Mantle/MTLValueTransformer.h; sourceTree = "<group>"; };
+		06FBFA32CA1E18016849C8C5029BFDE2 /* BadArgument.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = BadArgument.m; sourceTree = "<group>"; };
 		0718627C2BD2DB54432093D918CCE5AB /* AbstractMessageBuilder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AbstractMessageBuilder.h; path = src/runtime/Classes/AbstractMessageBuilder.h; sourceTree = "<group>"; };
-		071A24F786F3D0511D98EDC9DE7579BE /* OWSDevice.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDevice.m; sourceTree = "<group>"; };
 		0757BA5658BBFE1FD76625B5609821B6 /* Bootstrap.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Bootstrap.h; path = src/runtime/Classes/Bootstrap.h; sourceTree = "<group>"; };
+		075BCB0FBBEB977829D52154B3F814D4 /* OWSRecordTranscriptJob.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSRecordTranscriptJob.h; sourceTree = "<group>"; };
 		0779FE62A006175D800E00E80C20B87A /* NSDictionary+MTLManipulationAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+MTLManipulationAdditions.h"; path = "Mantle/NSDictionary+MTLManipulationAdditions.h"; sourceTree = "<group>"; };
 		07B744278D2AFA3F73A13D9C70FC4314 /* YapDatabaseCloudCoreGraph.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCloudCoreGraph.h; path = YapDatabase/Extensions/CloudCore/Utilities/Execution/YapDatabaseCloudCoreGraph.h; sourceTree = "<group>"; };
+		07C5DD4B2C9FEF3772A5E20E55F3E8C3 /* GTSR4.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = GTSR4.crt; path = SignalServiceKit/Resources/Certificates/GTSR4.crt; sourceTree = "<group>"; };
 		08385FDC553C15ECE85BAD14EF3B69BF /* sqlite3.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = sqlite3.h; sourceTree = "<group>"; };
-		0851EB2881FFFB02C4F2CCA6EDFCF93A /* YapDatabaseConnection+OWS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "YapDatabaseConnection+OWS.m"; sourceTree = "<group>"; };
+		08575BC5C7EE825352C80CCA3F5EA9CF /* OWSIdentityManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSIdentityManager.h; sourceTree = "<group>"; };
 		08735BC2C6E81DD84E1C777B8E4EF096 /* RingBuffer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RingBuffer.m; path = src/runtime/Classes/RingBuffer.m; sourceTree = "<group>"; };
 		08904FD5421EA2DEB6CA929CEF6914E8 /* aes_ni.c */ = {isa = PBXFileReference; includeInIndex = 1; name = aes_ni.c; path = SSZipArchive/minizip/aes/aes_ni.c; sourceTree = "<group>"; };
-		0893BE6D85C604B0A2D7FAC56FDFB5DF /* OWSDispatch.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDispatch.h; sourceTree = "<group>"; };
 		09869935AB3B5AAE19E51DC51E22FE3D /* NBPhoneNumberDesc.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NBPhoneNumberDesc.h; path = libPhoneNumber/NBPhoneNumberDesc.h; sourceTree = "<group>"; };
+		09C019F39B6EBBD012F28E2DA16AD9D4 /* OWSDynamicOutgoingMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDynamicOutgoingMessage.m; sourceTree = "<group>"; };
 		09C54BB1A7D65F27CD4B11A8DC8C3FAD /* BinaryEncodingVisitor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BinaryEncodingVisitor.swift; path = Sources/SwiftProtobuf/BinaryEncodingVisitor.swift; sourceTree = "<group>"; };
 		09EEACD323C49CACC333FE60E5CC52D4 /* Curve25519Kit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Curve25519Kit-umbrella.h"; sourceTree = "<group>"; };
 		0A5FA49AA01FAC290BF2C2ED2511CDBD /* SignedPrekeyRecord.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SignedPrekeyRecord.h; path = AxolotlKit/Classes/Prekeys/SignedPrekeyRecord.h; sourceTree = "<group>"; };
 		0A6053D48ED082AE69EA00FE1F48F595 /* Pods-SignalShareExtension.app store release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SignalShareExtension.app store release.xcconfig"; sourceTree = "<group>"; };
 		0A8791558503E86B3BB2B1B9C83B94F0 /* minishared.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = minishared.h; path = SSZipArchive/minizip/minishared.h; sourceTree = "<group>"; };
+		0AE6D5721DEBDB68FC360AD29ADB46D4 /* OWSMessageUtils.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSMessageUtils.h; sourceTree = "<group>"; };
 		0B50160334B5BA0049F0AFE5B86548A4 /* YapDatabaseCloudCorePipeline.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseCloudCorePipeline.m; path = YapDatabase/Extensions/CloudCore/Utilities/Execution/YapDatabaseCloudCorePipeline.m; sourceTree = "<group>"; };
 		0B5E0E5F8CBB89F342BDC9BAB68A1E7C /* ProtobufMap.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ProtobufMap.swift; path = Sources/SwiftProtobuf/ProtobufMap.swift; sourceTree = "<group>"; };
 		0B70FA309CEE6E88952737B18EF6636A /* NSValueTransformer+MTLPredefinedTransformerAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSValueTransformer+MTLPredefinedTransformerAdditions.h"; path = "Mantle/NSValueTransformer+MTLPredefinedTransformerAdditions.h"; sourceTree = "<group>"; };
 		0BBB0152E65F3B5A3803D0C4842F1F3E /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		0BE38BDC17ED98BCF0D82349C5B85DDC /* CocoaLumberjack.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = CocoaLumberjack.framework; path = CocoaLumberjack.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		0BEF5B7DABDB72BA36AA54768D47DB05 /* OWSOutgoingSentMessageTranscript.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSOutgoingSentMessageTranscript.m; sourceTree = "<group>"; };
+		0C1100D1C77081B6A87D71D7074C08AE /* OWSContactsOutputStream.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSContactsOutputStream.h; sourceTree = "<group>"; };
+		0C1DAF4114664C34F6CD9A0504353175 /* iOSVersions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = iOSVersions.h; sourceTree = "<group>"; };
 		0C4971C75C78EC61B29BF0A34C1AC157 /* Mantle-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Mantle-prefix.pch"; sourceTree = "<group>"; };
 		0CF3F47C1B4D2D5138E7D6DE891F0B36 /* YapReachability.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapReachability.m; path = YapDatabase/Extensions/ActionManager/Utilities/YapReachability.m; sourceTree = "<group>"; };
-		0D274AC50EDA43AB16EB9E0C02B6EA74 /* OWSUploadOperation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSUploadOperation.h; sourceTree = "<group>"; };
 		0D35FCA2E54DA17AA370F2F9D54275B4 /* hang.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = hang.m; path = Sources/hang.m; sourceTree = "<group>"; };
 		0D474123FEA0A80E2984A7271188636B /* RatchetingSession.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RatchetingSession.h; path = AxolotlKit/Classes/Ratchet/RatchetingSession.h; sourceTree = "<group>"; };
-		0D5A902A15173DC16F0108AC9153D5BE /* OWSMessageDecrypter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSMessageDecrypter.h; sourceTree = "<group>"; };
 		0DB36171A4E4135DBDDAC7B88AAFBA6A /* AFNetworkActivityIndicatorManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFNetworkActivityIndicatorManager.m; path = "UIKit+AFNetworking/AFNetworkActivityIndicatorManager.m"; sourceTree = "<group>"; };
 		0DCC55DDDB3F5350DFB353D28EE1603B /* CocoaLumberjack.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = CocoaLumberjack.modulemap; sourceTree = "<group>"; };
 		0DEBA539C61B88ADCF0907593A4546D2 /* YapDatabaseString.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseString.h; path = YapDatabase/Internal/YapDatabaseString.h; sourceTree = "<group>"; };
 		0E039FA6689180B8A9C2BA3763128DED /* PureLayout-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PureLayout-prefix.pch"; sourceTree = "<group>"; };
+		0E0EE7409103C1ED2F41E9A5B38FAC57 /* TSMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSMessage.h; sourceTree = "<group>"; };
+		0E3567A0248C1930F1CF875E793C0E84 /* PreKeyBundle+jsonDict.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PreKeyBundle+jsonDict.m"; sourceTree = "<group>"; };
+		0E4790A1194FF7CCBE21424D6A2CB910 /* OWSPrimaryStorage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSPrimaryStorage.h; sourceTree = "<group>"; };
+		0E612E08D8064A4A8D38D832EBCC2B45 /* NSData+OWS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSData+OWS.m"; sourceTree = "<group>"; };
+		0E62FC4F5F7B3442992FD334B4F63EAB /* SignalAccount.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = SignalAccount.h; sourceTree = "<group>"; };
 		0E6F64B4948B18ADF9A4EF0A5B72156E /* MTLValueTransformer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MTLValueTransformer.m; path = Mantle/MTLValueTransformer.m; sourceTree = "<group>"; };
 		0EB4B996948B325834BA500F624209E5 /* ge_precomp_0.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ge_precomp_0.c; path = Sources/ed25519/ge_precomp_0.c; sourceTree = "<group>"; };
-		0F02A6C1613BADC6AFFA81311DBE70BA /* OWSCensorshipConfiguration.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSCensorshipConfiguration.h; sourceTree = "<group>"; };
+		0EC5C462F0679A6B1DD6512A4E6DAB97 /* OWSBackgroundTask.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSBackgroundTask.h; sourceTree = "<group>"; };
+		0EE57475FFAB9AC9FB8E1F19E2EF016F /* AppVersion.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = AppVersion.h; sourceTree = "<group>"; };
 		0F4E87F59D8041A130C5AE289C426ECA /* MTLModel.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MTLModel.h; path = Mantle/MTLModel.h; sourceTree = "<group>"; };
 		0F6DBCA12803CD35D84217F3DD4CB257 /* WireFormat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = WireFormat.swift; path = Sources/SwiftProtobuf/WireFormat.swift; sourceTree = "<group>"; };
-		0F6F2CABBFA7D399CADE3773AA7965AF /* OWSOutgoingSentMessageTranscript.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSOutgoingSentMessageTranscript.h; sourceTree = "<group>"; };
 		0FB89C380723763CE6FF4A0CF96612E0 /* fileenc.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = fileenc.h; path = SSZipArchive/minizip/aes/fileenc.h; sourceTree = "<group>"; };
 		0FC6F13280425B38777FADD598745D80 /* YapDatabaseAutoView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseAutoView.m; path = YapDatabase/Extensions/AutoView/YapDatabaseAutoView.m; sourceTree = "<group>"; };
+		0FEC740C8B759C02D968CC7336DEE2B0 /* TSDatabaseView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSDatabaseView.h; sourceTree = "<group>"; };
 		101BB3F5D66EFFA08CD69AE9431914F7 /* YapDatabaseViewRangeOptions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseViewRangeOptions.m; path = YapDatabase/Extensions/View/Utilities/YapDatabaseViewRangeOptions.m; sourceTree = "<group>"; };
 		101DEF933F79A2A9B9F97FD131BF3B16 /* PBArray.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PBArray.h; path = src/runtime/Classes/PBArray.h; sourceTree = "<group>"; };
 		1064EB5BE91D9791050021204716B5ED /* AFNetworking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = AFNetworking.framework; path = AFNetworking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		108535065E178B57C9C38DD6D50E730F /* OWSReadReceiptManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSReadReceiptManager.h; sourceTree = "<group>"; };
 		10B897E466CFAFE50CC51770D7B2B04E /* ge_p2_dbl.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ge_p2_dbl.c; path = Sources/ed25519/ge_p2_dbl.c; sourceTree = "<group>"; };
 		10D1C8338AD5B9142B67DAE6F6859A9F /* struct.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = struct.pb.swift; path = Sources/SwiftProtobuf/struct.pb.swift; sourceTree = "<group>"; };
+		110E4D37ED1F1B528714027AD69F6B66 /* OWSContactDiscoveryOperation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OWSContactDiscoveryOperation.swift; sourceTree = "<group>"; };
+		11173F7510904C73FE5849F7ADE936DC /* SignalServiceKit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SignalServiceKit-umbrella.h"; sourceTree = "<group>"; };
+		1130089E2997880F8E70C17EE38EE08E /* OWSIncomingMessageFinder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSIncomingMessageFinder.m; sourceTree = "<group>"; };
 		11445833B2969B23F0F4AFBAB14B2EA1 /* Ed25519.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = Ed25519.m; path = Classes/Ed25519.m; sourceTree = "<group>"; };
 		115FDB916872EA8E3845AB126F28E469 /* Google_Protobuf_Struct+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Google_Protobuf_Struct+Extensions.swift"; path = "Sources/SwiftProtobuf/Google_Protobuf_Struct+Extensions.swift"; sourceTree = "<group>"; };
-		116DF0F36D875D67E7ACACD7E5FA0879 /* OWSDeviceProvisioner.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDeviceProvisioner.h; sourceTree = "<group>"; };
-		117A0660BD80E51E091800DE92CA3DD4 /* TSGroupThread.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSGroupThread.m; sourceTree = "<group>"; };
 		11C4ED7CE0CB4A35AAC7CB9A400D7396 /* PreKeyRecord.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PreKeyRecord.h; path = AxolotlKit/Classes/Prekeys/PreKeyRecord.h; sourceTree = "<group>"; };
+		11E2FEDC58CEB859369D62186C99DAE9 /* TSQuotedMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSQuotedMessage.h; sourceTree = "<group>"; };
 		1220A9BFED68FF6D516CC30A259A821C /* YapDatabaseViewMappingsPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseViewMappingsPrivate.h; path = YapDatabase/Extensions/View/Internal/YapDatabaseViewMappingsPrivate.h; sourceTree = "<group>"; };
 		1256FCCDF2676669926609C29F5BFCA2 /* YapDatabaseFilteredViewConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseFilteredViewConnection.h; path = YapDatabase/Extensions/FilteredView/YapDatabaseFilteredViewConnection.h; sourceTree = "<group>"; };
+		128D37053476000A49275D61A30894FE /* ByteParser.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = ByteParser.m; sourceTree = "<group>"; };
 		12BB6E86E48D4BA0A6133762093BD160 /* Field.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = Field.m; path = src/runtime/Classes/Field.m; sourceTree = "<group>"; };
+		13022CFE2DC6A6C22E5665E80419DFE0 /* Threading.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = Threading.m; sourceTree = "<group>"; };
 		1329D5C365D29F2CCFB78BA82878EBB7 /* CALayer+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "CALayer+AnyPromise.h"; path = "Extensions/QuartzCore/Sources/CALayer+AnyPromise.h"; sourceTree = "<group>"; };
 		13336FE46D7B41351722D9CF3A314386 /* Pods-SignalMessaging-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SignalMessaging-acknowledgements.markdown"; sourceTree = "<group>"; };
-		133F7E3CD8898265280F1EB58D25B8D6 /* OutageDetection.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OutageDetection.swift; sourceTree = "<group>"; };
-		1346FDE91DDA9B5B68E19C684816F4E7 /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.h; sourceTree = "<group>"; };
 		135B7963B5848FBD734F4A4A9E11099D /* MTLReflection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MTLReflection.m; path = Mantle/MTLReflection.m; sourceTree = "<group>"; };
 		139DDA9A9A55DA3D5A987EE5A3BE1424 /* YapDatabaseViewTransaction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseViewTransaction.m; path = YapDatabase/Extensions/View/YapDatabaseViewTransaction.m; sourceTree = "<group>"; };
 		13C99A640916FDDAECE1E4C64AE6397B /* PreKeyBundle.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = PreKeyBundle.m; path = AxolotlKit/Classes/Prekeys/PreKeyBundle.m; sourceTree = "<group>"; };
 		13CC0F63E2660D6CC2EC234D6EBD6E13 /* YDBCKRecordInfo.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YDBCKRecordInfo.h; path = YapDatabase/Extensions/CloudKit/Utilities/YDBCKRecordInfo.h; sourceTree = "<group>"; };
-		13D00E0CA2AFF30038986AEACE1897D4 /* OWSAddToProfileWhitelistOfferMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSAddToProfileWhitelistOfferMessage.m; sourceTree = "<group>"; };
 		13DCFAC6D827890816759184274A1223 /* NSValueTransformer+MTLPredefinedTransformerAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSValueTransformer+MTLPredefinedTransformerAdditions.m"; path = "Mantle/NSValueTransformer+MTLPredefinedTransformerAdditions.m"; sourceTree = "<group>"; };
 		13E45F9DEBEE66EB34BB57B96BC69B26 /* Reachability.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
-		13E47872A04C6E7720A1B9A0B4624B37 /* OWSMessageSender.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSMessageSender.m; sourceTree = "<group>"; };
 		13F19AD40D0A3F5A4536B6092AE94301 /* Message.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Message.swift; path = Sources/SwiftProtobuf/Message.swift; sourceTree = "<group>"; };
-		14041F632026C15678C02C297476122F /* BadState.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = BadState.m; sourceTree = "<group>"; };
 		1407A72B43C04A026BF22F2E178C228E /* fe_cmov.c */ = {isa = PBXFileReference; includeInIndex = 1; name = fe_cmov.c; path = Sources/ed25519/fe_cmov.c; sourceTree = "<group>"; };
-		143012388BF28FE5C2E878BC7FDBB8D5 /* Contact.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Contact.h; sourceTree = "<group>"; };
-		1454D71A7773D6D9B63A441A06FC4818 /* NSArray+OWS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSArray+OWS.m"; sourceTree = "<group>"; };
 		14610AB144400CC12EDCD3D23B1EB541 /* YapActionable.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapActionable.h; path = YapDatabase/Extensions/ActionManager/YapActionable.h; sourceTree = "<group>"; };
 		14758B8ABD6FC4BB75BD87F63F59D140 /* aestab.c */ = {isa = PBXFileReference; includeInIndex = 1; name = aestab.c; path = SSZipArchive/minizip/aes/aestab.c; sourceTree = "<group>"; };
 		148E16987208C25CE78C17C970F5588F /* SAMKeychain.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SAMKeychain.h; path = Sources/SAMKeychain.h; sourceTree = "<group>"; };
 		14F42572C4941BD247D1D77D5557EFA3 /* YapDatabaseCloudKitTransaction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCloudKitTransaction.h; path = YapDatabase/Extensions/CloudKit/YapDatabaseCloudKitTransaction.h; sourceTree = "<group>"; };
+		15094B59E422013114FA67DAA403E607 /* OWSSyncContactsMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSSyncContactsMessage.m; sourceTree = "<group>"; };
 		150F95CCFBBC0E039D3F235496CC59B9 /* hmac.c */ = {isa = PBXFileReference; includeInIndex = 1; name = hmac.c; path = SSZipArchive/minizip/aes/hmac.c; sourceTree = "<group>"; };
 		1533893D272E8FDBC9FD16578A95BE72 /* ge_p2_dbl.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ge_p2_dbl.h; path = Sources/ed25519/ge_p2_dbl.h; sourceTree = "<group>"; };
 		1553A0724C13E51BADDA99C911093B43 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		157F2CC030CA5BC8464D38A260CDCFCC /* NSDictionary+YapDatabase.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSDictionary+YapDatabase.m"; path = "YapDatabase/Internal/NSDictionary+YapDatabase.m"; sourceTree = "<group>"; };
+		15CCA882AC659567D9114760FEC3FB51 /* OWSProvisioningMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSProvisioningMessage.h; sourceTree = "<group>"; };
 		15D9D451879C866E5A60676534684EA7 /* YDBCKMappingTableInfo.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YDBCKMappingTableInfo.h; path = YapDatabase/Extensions/CloudKit/Internal/YDBCKMappingTableInfo.h; sourceTree = "<group>"; };
-		15F2DC51513BE6376A4ACC63D42267BF /* OWSIdentityManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSIdentityManager.m; sourceTree = "<group>"; };
-		16119562EDE8116A7042455A8EA8EA59 /* OWSChunkedOutputStream.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSChunkedOutputStream.m; sourceTree = "<group>"; };
 		167EBE01CA65A1EC8AE0ADF33FFF3387 /* ExtendableMessageBuilder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = ExtendableMessageBuilder.m; path = src/runtime/Classes/ExtendableMessageBuilder.m; sourceTree = "<group>"; };
 		16AB9FDEED2436D3F36837282BB75833 /* libPhoneNumber-iOS.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "libPhoneNumber-iOS.modulemap"; sourceTree = "<group>"; };
 		16B87BD1B27355C4FC42A482CD606EF6 /* BinaryEncoder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BinaryEncoder.swift; path = Sources/SwiftProtobuf/BinaryEncoder.swift; sourceTree = "<group>"; };
+		16C1D94BCB4011F6D9C0E98F070C29EB /* OWSRequestFactory.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSRequestFactory.h; sourceTree = "<group>"; };
 		16C8D4E6CC65B49E9184554091E54488 /* UIViewController+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "UIViewController+Promise.swift"; path = "Extensions/UIKit/Sources/UIViewController+Promise.swift"; sourceTree = "<group>"; };
 		16F493451C7FF35C5A3AE7230468FD78 /* SRSIMDHelpers.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SRSIMDHelpers.h; path = SocketRocket/Internal/Utilities/SRSIMDHelpers.h; sourceTree = "<group>"; };
-		1703DBEA9A0F5BF2E6FDDABB1606D23F /* AppContext.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = AppContext.h; sourceTree = "<group>"; };
+		16FF98FF19AC89DB42ED08B105BC6871 /* TSStorageHeaders.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSStorageHeaders.h; sourceTree = "<group>"; };
 		17276945622586E39A50D0EF45520FFB /* ExtensionField.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ExtensionField.h; path = src/runtime/Classes/ExtensionField.h; sourceTree = "<group>"; };
 		179A92A913345952078144CEEE63CDAF /* YDBCKAttachRequest.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YDBCKAttachRequest.h; path = YapDatabase/Extensions/CloudKit/Internal/YDBCKAttachRequest.h; sourceTree = "<group>"; };
-		17B12C9E83E87ABC85206B959FE49305 /* OWSStorage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSStorage.h; sourceTree = "<group>"; };
 		17CD25DFBE1C2392B4DE6F5FA52D9362 /* YapDatabaseExtensionTypes.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseExtensionTypes.h; path = YapDatabase/Extensions/Protocol/YapDatabaseExtensionTypes.h; sourceTree = "<group>"; };
+		18063A6F2C02DF18E3ED8EF5AAFC2938 /* NSNotificationCenter+OWS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSNotificationCenter+OWS.m"; sourceTree = "<group>"; };
 		187E5E91C3FAE2A5F331C03434AEFBC9 /* DDOSLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDOSLogger.h; path = Classes/DDOSLogger.h; sourceTree = "<group>"; };
 		188970BB1B37361607766C9E123442A0 /* YapDatabaseSecondaryIndexPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseSecondaryIndexPrivate.h; path = YapDatabase/Extensions/SecondaryIndex/Internal/YapDatabaseSecondaryIndexPrivate.h; sourceTree = "<group>"; };
 		189B633DBD8FE338F4C8B7B12BDC7A9D /* YapDatabaseRelationshipOptions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseRelationshipOptions.m; path = YapDatabase/Extensions/Relationships/YapDatabaseRelationshipOptions.m; sourceTree = "<group>"; };
-		18AAEA50A548D1F99A222B5181B3CC5D /* SignalServiceKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "SignalServiceKit-dummy.m"; sourceTree = "<group>"; };
-		18CAD5016000E54B88C26B672CFADFCF /* OWSBatchMessageProcessor.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSBatchMessageProcessor.m; sourceTree = "<group>"; };
+		189DE6D20F64C6815969E86A03790FD2 /* OWSFailedAttachmentDownloadsJob.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSFailedAttachmentDownloadsJob.h; sourceTree = "<group>"; };
 		18CC6775A952EF3A20F962CF860FA60E /* Promise+Properties.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Promise+Properties.swift"; path = "Sources/Promise+Properties.swift"; sourceTree = "<group>"; };
 		19034C02070B0913AEBC46ED89543439 /* WhisperMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = WhisperMessage.m; path = AxolotlKit/Classes/CipherMessage/WhisperMessage.m; sourceTree = "<group>"; };
 		190D9C4B6462ABFED569FE01F2A6D7FD /* Pods-Signal-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-Signal-dummy.m"; sourceTree = "<group>"; };
@@ -2104,350 +2120,341 @@
 		1945A89224B845BA076A6E2A6DA03920 /* YapDatabaseCrossProcessNotification.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseCrossProcessNotification.m; path = YapDatabase/Extensions/CrossProcessNotification/YapDatabaseCrossProcessNotification.m; sourceTree = "<group>"; };
 		195082D18F109F4C124B392F411200E5 /* ioapi_buf.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ioapi_buf.c; path = SSZipArchive/minizip/ioapi_buf.c; sourceTree = "<group>"; };
 		1974E8BEBDE1A599A4D575D7EF01E658 /* YapDatabaseRTreeIndexHandler.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseRTreeIndexHandler.m; path = YapDatabase/Extensions/RTreeIndex/YapDatabaseRTreeIndexHandler.m; sourceTree = "<group>"; };
-		1991891CE4CE82997AA070F377C6A60A /* TSPrefix.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TSPrefix.h; path = SignalServiceKit/src/TSPrefix.h; sourceTree = "<group>"; };
 		199426B7BDB976072ED924BE64FAAFC6 /* Pods-SignalMessaging-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SignalMessaging-dummy.m"; sourceTree = "<group>"; };
 		199811354482B93B59440B293A9C386A /* AFNetworking.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = AFNetworking.xcconfig; sourceTree = "<group>"; };
-		19D657432FF0DA968475B8EB757BDEFF /* OWSRecordTranscriptJob.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSRecordTranscriptJob.m; sourceTree = "<group>"; };
-		19FDE6AD20A254D140595A3A42BF9006 /* WebSocketResources.pb.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = WebSocketResources.pb.m; sourceTree = "<group>"; };
+		1A2679778C5BE6AE902DA386273F6124 /* OWSMessageSender.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSMessageSender.m; sourceTree = "<group>"; };
+		1A478C0101962F7CA5F8C9FE3698B7B5 /* OperationFailed.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OperationFailed.h; sourceTree = "<group>"; };
 		1A7B0A678A2A102B3E26BBD582D2FBDE /* NSURLSession+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSURLSession+AnyPromise.h"; path = "Extensions/Foundation/Sources/NSURLSession+AnyPromise.h"; sourceTree = "<group>"; };
 		1AA0A50D95B03B471B394658B3032148 /* YapDatabaseRTreeIndexConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseRTreeIndexConnection.h; path = YapDatabase/Extensions/RTreeIndex/YapDatabaseRTreeIndexConnection.h; sourceTree = "<group>"; };
 		1AA716E06CB43EF96A258607BDDFF9B5 /* CodedOutputStream.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CodedOutputStream.m; path = src/runtime/Classes/CodedOutputStream.m; sourceTree = "<group>"; };
 		1AEB5FF0732F07E5645370670FD94DBD /* Pods-Signal-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-Signal-umbrella.h"; sourceTree = "<group>"; };
 		1AF6C1939A52219C2C90678404EA1D81 /* AFURLResponseSerialization.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFURLResponseSerialization.m; path = AFNetworking/AFURLResponseSerialization.m; sourceTree = "<group>"; };
+		1B180AAF39ED2C9E2A4D1E10B4800069 /* OWSFingerprintBuilder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSFingerprintBuilder.m; sourceTree = "<group>"; };
 		1B574762CCD954F179F50682FB6B73A9 /* YapDatabaseAutoViewConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseAutoViewConnection.m; path = YapDatabase/Extensions/AutoView/YapDatabaseAutoViewConnection.m; sourceTree = "<group>"; };
 		1BA3D8F76C16D039BB6804825B004B50 /* YapDatabaseManualViewTransaction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseManualViewTransaction.m; path = YapDatabase/Extensions/ManualView/YapDatabaseManualViewTransaction.m; sourceTree = "<group>"; };
+		1BA90CAF907A0DD4E4B6A4723083B9AE /* OWSError.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSError.h; sourceTree = "<group>"; };
 		1C36C54097672B5BC2023ADF4290210A /* Pods-SignalMessaging.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-SignalMessaging.modulemap"; sourceTree = "<group>"; };
-		1C5D240EEF5FEED6CAE55979325F401B /* TSRequest.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSRequest.h; sourceTree = "<group>"; };
+		1C4140E0CBA44E20AC58F7158C0851FE /* WebSocketResources.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = WebSocketResources.pb.swift; sourceTree = "<group>"; };
 		1C9578E0EC0A6DF4F91E650754375480 /* YapMutationStack.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapMutationStack.h; path = YapDatabase/Utilities/YapMutationStack.h; sourceTree = "<group>"; };
 		1CEA94C132DD4BA62CBB7116DEBE3DD9 /* NSArray+NBAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSArray+NBAdditions.h"; path = "libPhoneNumber/NSArray+NBAdditions.h"; sourceTree = "<group>"; };
 		1CEDFB2928C57CCB422DE4A14FC483E5 /* TextFormat.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = TextFormat.m; path = src/runtime/Classes/TextFormat.m; sourceTree = "<group>"; };
 		1CEF3A173AD8E93F7AC961E26AD94B4E /* Mantle.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Mantle.xcconfig; sourceTree = "<group>"; };
 		1CF60CD57C6442D55B0C0BEF049E91E2 /* SessionState.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SessionState.m; path = AxolotlKit/Classes/Sessions/SessionState.m; sourceTree = "<group>"; };
+		1D05B6121CE66B51D2F095419730910F /* TSGroupModel.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSGroupModel.m; sourceTree = "<group>"; };
 		1D203A269409BAD7A36F10DC7D1DF053 /* YapDatabaseViewTypes.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseViewTypes.h; path = YapDatabase/Extensions/AutoView/YapDatabaseViewTypes.h; sourceTree = "<group>"; };
-		1DAC82DCD23177935F515A7707FC2D0F /* OWSFingerprintProtos.pb.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSFingerprintProtos.pb.h; sourceTree = "<group>"; };
 		1DE9B587B39F63668B90E2CDCFCB2197 /* blocks.c */ = {isa = PBXFileReference; includeInIndex = 1; name = blocks.c; path = Sources/ed25519/nacl_sha512/blocks.c; sourceTree = "<group>"; };
 		1DFDBA5682B8CFC01B195403A75CD262 /* YYImage-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "YYImage-prefix.pch"; sourceTree = "<group>"; };
-		1E0E6E614604F551953E4C389576D32D /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; path = README.md; sourceTree = "<group>"; };
+		1E02E665D7C7027636B3BE8101A8B0E1 /* ContactsUpdater.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = ContactsUpdater.h; sourceTree = "<group>"; };
+		1E046CB740EAF9BDB893F46140765E4B /* DigiCertGlobalRootG2.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = DigiCertGlobalRootG2.crt; path = SignalServiceKit/Resources/Certificates/DigiCertGlobalRootG2.crt; sourceTree = "<group>"; };
+		1E0887D1B87E05582FBE4CA4CA00972C /* OWSAttachmentsProcessor.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSAttachmentsProcessor.m; sourceTree = "<group>"; };
+		1E32D54FF306AF2DC89825CFD58AD92D /* TSStorageKeys.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSStorageKeys.h; sourceTree = "<group>"; };
 		1E4F4FEA6DC0B83C260C5B0EDCDFDB87 /* Curve25519Kit.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Curve25519Kit.xcconfig; sourceTree = "<group>"; };
+		1E5DE337300507BB63838B25F13B3D29 /* Threading.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Threading.h; sourceTree = "<group>"; };
 		1E63E906E61C4555318B212D0777024F /* ge_madd.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ge_madd.h; path = Sources/ed25519/ge_madd.h; sourceTree = "<group>"; };
 		1E7113A484A7C32606859B64A1FF9F8F /* Google_Protobuf_ListValue+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Google_Protobuf_ListValue+Extensions.swift"; path = "Sources/SwiftProtobuf/Google_Protobuf_ListValue+Extensions.swift"; sourceTree = "<group>"; };
+		1EB4E8B77B94E69E1B181446EC8D2A20 /* AppContext.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = AppContext.m; sourceTree = "<group>"; };
 		1EE27D4720465A48AA5E7F7D6A292101 /* libPhoneNumber-iOS-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "libPhoneNumber-iOS-umbrella.h"; sourceTree = "<group>"; };
-		1F1B862DB505A4ADF14454CDF4831E39 /* WebSocketProto.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = WebSocketProto.swift; sourceTree = "<group>"; };
 		1F38C07AE81A6AD6E183AEB01CDA9F84 /* empty.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = empty.pb.swift; path = Sources/SwiftProtobuf/empty.pb.swift; sourceTree = "<group>"; };
 		1F3DEEC079E1FF62635068E14A490B6A /* UnknownFieldSet.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = UnknownFieldSet.h; path = src/runtime/Classes/UnknownFieldSet.h; sourceTree = "<group>"; };
+		1FD1B6FB2C340B761F4A4BB4BF303500 /* OWSPrimaryStorage+keyFromIntLong.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OWSPrimaryStorage+keyFromIntLong.m"; sourceTree = "<group>"; };
+		1FE49B49ACB2C1DCEBC101D4D34FF0BF /* OWSGroupsOutputStream.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSGroupsOutputStream.h; sourceTree = "<group>"; };
 		1FF1B06D24EB3BDACDDF1072E552F811 /* source_context.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = source_context.pb.swift; path = Sources/SwiftProtobuf/source_context.pb.swift; sourceTree = "<group>"; };
 		200BCCBF5673B88251A228268BAD4BC1 /* Chain.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Chain.h; path = AxolotlKit/Classes/Ratchet/Chain.h; sourceTree = "<group>"; };
 		202ECC02319E862D3B9411303CFE9FA2 /* fe_mul.c */ = {isa = PBXFileReference; includeInIndex = 1; name = fe_mul.c; path = Sources/ed25519/fe_mul.c; sourceTree = "<group>"; };
 		20326FDD7B7912A23FE46036408439BA /* AFURLSessionManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFURLSessionManager.h; path = AFNetworking/AFURLSessionManager.h; sourceTree = "<group>"; };
 		203AA3912DA26B03346DBE17AF96ADBF /* SessionRecord.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SessionRecord.h; path = AxolotlKit/Classes/Sessions/SessionRecord.h; sourceTree = "<group>"; };
 		208A708FE5C454CF4C21F861DF286CD9 /* MathUtils.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MathUtils.swift; path = Sources/SwiftProtobuf/MathUtils.swift; sourceTree = "<group>"; };
+		209AF5EE9DA1C70A1F7EC6441373A8C7 /* NSObject+OWS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSObject+OWS.m"; sourceTree = "<group>"; };
 		210F1ED7D9FA40F85C171BAD6D9F3B3F /* UIImage+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImage+AFNetworking.h"; path = "UIKit+AFNetworking/UIImage+AFNetworking.h"; sourceTree = "<group>"; };
-		2112A472BBE6AAE99A0E4D7333BABD3D /* OWSError.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSError.m; sourceTree = "<group>"; };
+		211039AE24332F4F5941D5AC23BA97E3 /* TSVerifyCodeRequest.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSVerifyCodeRequest.h; sourceTree = "<group>"; };
+		212AC1E81BCDD6EE825B47928CDEA1A0 /* OWSPrimaryStorage+messageIDs.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OWSPrimaryStorage+messageIDs.m"; sourceTree = "<group>"; };
 		212FD0CBB73A5BFD230DBD5D285A8859 /* fe_isnegative.c */ = {isa = PBXFileReference; includeInIndex = 1; name = fe_isnegative.c; path = Sources/ed25519/fe_isnegative.c; sourceTree = "<group>"; };
-		21BCEE340F37BE33F7E2B4D26C3AE9AC /* YapDatabaseConnection+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "YapDatabaseConnection+OWS.h"; sourceTree = "<group>"; };
+		21C69349E95262BD57B6DB987E62E49C /* TSAttributes.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSAttributes.h; sourceTree = "<group>"; };
 		21C89A6FA9B7EA71CE1A5F1C974CDC2F /* YapDatabaseViewLocator.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseViewLocator.m; path = YapDatabase/Extensions/View/Internal/YapDatabaseViewLocator.m; sourceTree = "<group>"; };
+		220F55C8952F2D743BCCB5BF0147BC98 /* TSDatabaseSecondaryIndexes.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSDatabaseSecondaryIndexes.h; sourceTree = "<group>"; };
 		22385D2DE60EB33291FA173C6DDC3847 /* TSDerivedSecrets.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = TSDerivedSecrets.m; path = AxolotlKit/Classes/Ratchet/TSDerivedSecrets.m; sourceTree = "<group>"; };
 		225B29321380AF82AD5B52167E58E9FD /* NSNotificationCenter+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSNotificationCenter+AnyPromise.m"; path = "Extensions/Foundation/Sources/NSNotificationCenter+AnyPromise.m"; sourceTree = "<group>"; };
 		22761305586B0DB97894B782DD672A37 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 		22BB422059744A32EFCC9061576A8C10 /* WhisperMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = WhisperMessage.h; path = AxolotlKit/Classes/CipherMessage/WhisperMessage.h; sourceTree = "<group>"; };
+		22C14B755CB9F693EAE950700239D783 /* OWSMessageManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSMessageManager.m; sourceTree = "<group>"; };
 		22E44A816D1C9A23EB683C84468772A9 /* SAMKeychain.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SAMKeychain.m; path = Sources/SAMKeychain.m; sourceTree = "<group>"; };
 		22E9D5931B1A4A1889692C3075859504 /* UIButton+AFNetworking.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIButton+AFNetworking.m"; path = "UIKit+AFNetworking/UIButton+AFNetworking.m"; sourceTree = "<group>"; };
 		22F646797C3302D252C9492A41CD62A6 /* PMKQuartzCore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PMKQuartzCore.h; path = Extensions/QuartzCore/Sources/PMKQuartzCore.h; sourceTree = "<group>"; };
-		2303CA6990F1E28279E472A356BDA152 /* OWSIncomingSentMessageTranscript.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSIncomingSentMessageTranscript.m; sourceTree = "<group>"; };
+		22FD0DBAF9E5385DBDE7E9EA0E9F52FB /* NSData+Image.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSData+Image.h"; sourceTree = "<group>"; };
 		23147DF9432EBF9B82E83527229C5D0E /* ioapi.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ioapi.c; path = SSZipArchive/minizip/ioapi.c; sourceTree = "<group>"; };
+		2314AFF0182C4B396F6231B2EA5D451D /* OWSProfileKeyMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSProfileKeyMessage.m; sourceTree = "<group>"; };
 		234B223B0E0FE23DC251FB4F9994259F /* ge.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ge.h; path = Sources/ed25519/ge.h; sourceTree = "<group>"; };
 		235395A5BF418477B057E4BD4AD0527C /* SocketRocket.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SocketRocket.xcconfig; sourceTree = "<group>"; };
 		23944BCCDEB33D506B63E5F80A8517E2 /* curve_sigs.c */ = {isa = PBXFileReference; includeInIndex = 1; name = curve_sigs.c; path = Sources/ed25519/additions/curve_sigs.c; sourceTree = "<group>"; };
 		23F1BF71F00DB0D45047D81516A3B4BF /* Randomness.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = Randomness.m; path = Classes/Randomness.m; sourceTree = "<group>"; };
-		23F85498867F332662D14F6D7C5827EB /* TSContactThread.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSContactThread.m; sourceTree = "<group>"; };
-		24CADA6D839FDEF156EB1035E3EC4E6E /* TSGroupThread.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSGroupThread.h; sourceTree = "<group>"; };
+		241FE9D8086B95D1CA2E43FB695F91B7 /* OWSFileSystem.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSFileSystem.m; sourceTree = "<group>"; };
+		24820FEAEC1BA8EB9D17C25A3BD9DCFA /* OWSCallAnswerMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSCallAnswerMessage.m; sourceTree = "<group>"; };
 		250CBD745089C66C6AB485D0FE5FC077 /* NSArray+NBAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSArray+NBAdditions.m"; path = "libPhoneNumber/NSArray+NBAdditions.m"; sourceTree = "<group>"; };
-		253DDFBCDD9A370C005E357AFBB0CE0D /* TSAttributes.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSAttributes.m; sourceTree = "<group>"; };
-		25443B9D114F96B12799F36BAA459580 /* TextSecureKitEnv.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TextSecureKitEnv.h; path = SignalServiceKit/src/TextSecureKitEnv.h; sourceTree = "<group>"; };
-		254E906D11E7714E9CB9DA8E818B64FB /* FunctionalUtil.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = FunctionalUtil.m; sourceTree = "<group>"; };
-		25574B943397B4E28609CB86C4AD2945 /* OWSSyncGroupsMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSSyncGroupsMessage.h; sourceTree = "<group>"; };
-		2581EEA096AB2BC76E01B2F4582A338C /* OWSDevicesService.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDevicesService.h; sourceTree = "<group>"; };
-		25B437DF8B726AF9B65CEA2BB1046C7F /* OWSAttachmentsProcessor.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSAttachmentsProcessor.m; sourceTree = "<group>"; };
+		256789598406ADCC06FF53FB980E6264 /* OWSSyncGroupsMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSSyncGroupsMessage.h; sourceTree = "<group>"; };
+		25C84FBCAED4F3C8AFEE046BCDD82B51 /* YapDatabaseTransaction+OWS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "YapDatabaseTransaction+OWS.m"; sourceTree = "<group>"; };
 		26183B2DB5853FB301E6AC2102E4869E /* NBMetadataHelper.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NBMetadataHelper.m; path = libPhoneNumber/NBMetadataHelper.m; sourceTree = "<group>"; };
-		2692E535E5CA9C710B86AF032F218C07 /* SignalIOSProto.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SignalIOSProto.swift; sourceTree = "<group>"; };
+		26336F0FFAF2C7AD027373753BEE9E2F /* OWSMessageManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSMessageManager.h; sourceTree = "<group>"; };
 		26A7217BB0BA27CA6C8EECEE160D8957 /* CALayer+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "CALayer+AnyPromise.m"; path = "Extensions/QuartzCore/Sources/CALayer+AnyPromise.m"; sourceTree = "<group>"; };
 		26AE6FF3EA9ACC22CAC16D1A79E5B571 /* YapDatabase.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = YapDatabase.framework; path = YapDatabase.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		26E26B199815DD1C6CD074D9F622A0E5 /* JSONEncodingError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONEncodingError.swift; path = Sources/SwiftProtobuf/JSONEncodingError.swift; sourceTree = "<group>"; };
 		26ECE48ABD23BF0CCDCCDF7A76B171AE /* SRURLUtilities.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SRURLUtilities.m; path = SocketRocket/Internal/Utilities/SRURLUtilities.m; sourceTree = "<group>"; };
-		273D6EEE91733F02C6213AE3C54D010D /* OWSCountryMetadata.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSCountryMetadata.h; sourceTree = "<group>"; };
+		26F44995B18E1A0CC8374021C2391F06 /* textsecure.cer */ = {isa = PBXFileReference; includeInIndex = 1; name = textsecure.cer; path = SignalServiceKit/Resources/Certificates/textsecure.cer; sourceTree = "<group>"; };
 		2741F03BD1A72B365666088322A17BE8 /* unzip.c */ = {isa = PBXFileReference; includeInIndex = 1; name = unzip.c; path = SSZipArchive/minizip/unzip.c; sourceTree = "<group>"; };
+		27465E08E4AFFC03931ACBADC61C277D /* OWSReadTracking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSReadTracking.h; sourceTree = "<group>"; };
 		274F9A885EC24DF12DD299A1EFF8E6BC /* YapDatabaseViewPage.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = YapDatabaseViewPage.mm; path = YapDatabase/Extensions/View/Internal/YapDatabaseViewPage.mm; sourceTree = "<group>"; };
+		275758C11772E395A44B710876719E1B /* TSPrefix.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TSPrefix.h; path = SignalServiceKit/src/TSPrefix.h; sourceTree = "<group>"; };
 		27766D58272636F321ACBC9EA95CE5FF /* NSArray+PureLayout.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSArray+PureLayout.h"; path = "PureLayout/PureLayout/NSArray+PureLayout.h"; sourceTree = "<group>"; };
 		27AB4003F11B7A2C36CF8499C6C20431 /* SSZipArchive.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SSZipArchive.m; path = SSZipArchive/SSZipArchive.m; sourceTree = "<group>"; };
 		27B849F86E58F7911D4D4C5245101283 /* AxolotlKit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "AxolotlKit-umbrella.h"; sourceTree = "<group>"; };
 		27FE9AE04A8B4D9CE0D75CB29C358A15 /* AFNetworkReachabilityManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFNetworkReachabilityManager.m; path = AFNetworking/AFNetworkReachabilityManager.m; sourceTree = "<group>"; };
-		28697770DC11938B05080C4DA4A7AA8A /* OWSAddToProfileWhitelistOfferMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSAddToProfileWhitelistOfferMessage.h; sourceTree = "<group>"; };
+		28D0078EFA22A52F53BD480A86BCA2AA /* OWSMessageHandler.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSMessageHandler.m; sourceTree = "<group>"; };
+		28DFCE33E3FF5E367C031ACA9F896B0F /* OWSOutgoingSyncMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSOutgoingSyncMessage.h; sourceTree = "<group>"; };
+		28FB771656DD9B1F0EA3A857C341F41D /* Promise+retainUntilComplete.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "Promise+retainUntilComplete.swift"; sourceTree = "<group>"; };
 		290046260CA3504F8DAA84D3FBCAC238 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		2941F73C7187C240ABAEEFC9E525BE75 /* OWSPrimaryStorage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSPrimaryStorage.m; sourceTree = "<group>"; };
 		297031EB51D00BE28020EA886EDE3892 /* fe_invert.c */ = {isa = PBXFileReference; includeInIndex = 1; name = fe_invert.c; path = Sources/ed25519/fe_invert.c; sourceTree = "<group>"; };
-		298381EB8EAC1709104D74910D55D413 /* NSError+MessageSending.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSError+MessageSending.m"; sourceTree = "<group>"; };
+		29A16A57E1907EEB80D30E1259D5A851 /* OWSAddToContactsOfferMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSAddToContactsOfferMessage.m; sourceTree = "<group>"; };
 		29BC4DCCBCA302121346850AD8671E28 /* YapDatabaseCloudCoreConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseCloudCoreConnection.m; path = YapDatabase/Extensions/CloudCore/YapDatabaseCloudCoreConnection.m; sourceTree = "<group>"; };
 		29F1FCAD5B2BEBD7B30C5A317FE48FB5 /* DDTTYLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDTTYLogger.h; path = Classes/DDTTYLogger.h; sourceTree = "<group>"; };
 		29F4C39B1169A5E7378239D9C44ADBEB /* YapDatabaseCloudKitConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseCloudKitConnection.m; path = YapDatabase/Extensions/CloudKit/YapDatabaseCloudKitConnection.m; sourceTree = "<group>"; };
 		2A4E30D1FDAB30466FC1B2893CA3FBCA /* YapMurmurHash.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapMurmurHash.h; path = YapDatabase/Utilities/YapMurmurHash.h; sourceTree = "<group>"; };
 		2A50A100E3C20C142D9D2C70CDD12F08 /* fe_sq2.c */ = {isa = PBXFileReference; includeInIndex = 1; name = fe_sq2.c; path = Sources/ed25519/fe_sq2.c; sourceTree = "<group>"; };
 		2A71B2A5D3279EC58F474DF7C0DA65BF /* ge_p3_to_cached.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ge_p3_to_cached.c; path = Sources/ed25519/ge_p3_to_cached.c; sourceTree = "<group>"; };
-		2AB3DAC052A77B5856D71095FDDC2466 /* OWSProvisioningMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSProvisioningMessage.m; sourceTree = "<group>"; };
 		2ABA1DFFB506F50D05CC51777BC5BAF4 /* Mantle.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Mantle.h; path = Mantle/Mantle.h; sourceTree = "<group>"; };
 		2AC4D561FB329CD88023E61109FE92FB /* fe_frombytes.c */ = {isa = PBXFileReference; includeInIndex = 1; name = fe_frombytes.c; path = Sources/ed25519/fe_frombytes.c; sourceTree = "<group>"; };
 		2AC5704BA5EB751B24BEB37C8DDD8967 /* YapReachability.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapReachability.h; path = YapDatabase/Extensions/ActionManager/Utilities/YapReachability.h; sourceTree = "<group>"; };
-		2AEE7E66C149200F15EC690C1C9404ED /* TSInvalidIdentityKeyReceivingErrorMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSInvalidIdentityKeyReceivingErrorMessage.m; sourceTree = "<group>"; };
+		2AF21CE2B7841024D1A43E87A2BE745B /* TSVerifyCodeRequest.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSVerifyCodeRequest.m; sourceTree = "<group>"; };
 		2AF582A6A7E4ACB2A60A13867BC9DB68 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		2B091BCB7BB5DF5BCA58794A48177E7C /* SocketRocket-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SocketRocket-umbrella.h"; sourceTree = "<group>"; };
-		2B638BDECF5D316EF7F431DE67D84E85 /* TSInvalidIdentityKeyErrorMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSInvalidIdentityKeyErrorMessage.h; sourceTree = "<group>"; };
-		2BC1545E958169B2E23925FEB6365EE2 /* Cryptography.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Cryptography.h; sourceTree = "<group>"; };
-		2BD06D084BDB6216F368FC5E6891321A /* OWSLinkedDeviceReadReceipt.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSLinkedDeviceReadReceipt.h; sourceTree = "<group>"; };
+		2B9204B8BBA3BBCE755C41306CD2FA7B /* SignalServiceKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SignalServiceKit-prefix.pch"; sourceTree = "<group>"; };
 		2BD94A43FBC3E0E71D563A3D3E9374EC /* sign.c */ = {isa = PBXFileReference; includeInIndex = 1; name = sign.c; path = Sources/ed25519/sign.c; sourceTree = "<group>"; };
 		2BE8AC5BB7E8D5CCA165A28D6E0B3D5F /* YapDatabase.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = YapDatabase.xcconfig; sourceTree = "<group>"; };
+		2C33A516659A62D5D21FED3187BD834C /* OWSProvisioningCipher.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSProvisioningCipher.m; sourceTree = "<group>"; };
 		2CDC6876A24A93F492C0D0E23833CE23 /* YapDatabaseHooksTransaction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseHooksTransaction.h; path = YapDatabase/Extensions/Hooks/YapDatabaseHooksTransaction.h; sourceTree = "<group>"; };
-		2CED919651EFE0027B1950434246D9C0 /* ByteParser.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = ByteParser.h; sourceTree = "<group>"; };
 		2D0091C68894BF3E2A98469260DA4FED /* sign_modified.c */ = {isa = PBXFileReference; includeInIndex = 1; name = sign_modified.c; path = Sources/ed25519/additions/sign_modified.c; sourceTree = "<group>"; };
 		2D17C01B118B12B4AF2F9D34F52084DB /* AbstractMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AbstractMessage.h; path = src/runtime/Classes/AbstractMessage.h; sourceTree = "<group>"; };
 		2D23DCE90667B14CBC8A37CE1262DDF3 /* DDContextFilterLogFormatter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDContextFilterLogFormatter.h; path = Classes/Extensions/DDContextFilterLogFormatter.h; sourceTree = "<group>"; };
+		2D4A607733EEFABC0BBE85CB65AFBEE8 /* OWSMessageServiceParams.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSMessageServiceParams.h; sourceTree = "<group>"; };
 		2D7A3EEAC0ACF6C75CDAEBA2B27C2BA7 /* MTLJSONAdapter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MTLJSONAdapter.m; path = Mantle/MTLJSONAdapter.m; sourceTree = "<group>"; };
 		2D90EFC4C7D2AE4043B7F5217D2DA5C0 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		2D997537547ACBACC57E031715EAACF0 /* NSData+keyVersionByte.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSData+keyVersionByte.m"; path = "AxolotlKit/Classes/Utility/NSData+keyVersionByte.m"; sourceTree = "<group>"; };
-		2DDFB51C2F07FCC5B553270036D45A95 /* NSURLSessionDataTask+StatusCode.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSURLSessionDataTask+StatusCode.m"; sourceTree = "<group>"; };
 		2DF39DF0839A2B44E7F8C0BC17CCFD70 /* YapTouch.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapTouch.h; path = YapDatabase/Internal/YapTouch.h; sourceTree = "<group>"; };
 		2E131A266E18D944140B1EBE685EFBFF /* AxolotlStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AxolotlStore.h; path = AxolotlKit/Classes/State/AxolotlStore.h; sourceTree = "<group>"; };
 		2E16D34A951EB1B3583440DAD06F8AC6 /* State.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = State.swift; path = Sources/State.swift; sourceTree = "<group>"; };
 		2E375D51C109043BDDF9A3E51777E112 /* aescrypt.c */ = {isa = PBXFileReference; includeInIndex = 1; name = aescrypt.c; path = SSZipArchive/minizip/aes/aescrypt.c; sourceTree = "<group>"; };
-		2E39AC9A5A23D49F8811A91E9CA4BE16 /* OWSMessageHandler.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSMessageHandler.m; sourceTree = "<group>"; };
 		2E3C5B8367E681ACD82AC4D52B46ADEC /* YYImage.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = YYImage.xcconfig; sourceTree = "<group>"; };
 		2E43F360DF807282D630D1330CDACA5E /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		2E5EEC04E0850DF3DE9F802944314107 /* NSData+Base64.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSData+Base64.m"; sourceTree = "<group>"; };
+		2E60FD9C63C3DD8D13835DAC24A9B4B6 /* OWSPrimaryStorage+SessionStore.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OWSPrimaryStorage+SessionStore.m"; sourceTree = "<group>"; };
 		2E7DB0738340147EE4A7D8B8397BCC16 /* YapDatabaseCloudCorePipelinePrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCloudCorePipelinePrivate.h; path = YapDatabase/Extensions/CloudCore/Internal/YapDatabaseCloudCorePipelinePrivate.h; sourceTree = "<group>"; };
 		2E8A7A11AAF3D2D53871B34C223EE3C6 /* Reachability-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Reachability-umbrella.h"; sourceTree = "<group>"; };
+		2E8D8AAF5EF97D9ECA0C1F1A12ABF338 /* TSAccountManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSAccountManager.h; sourceTree = "<group>"; };
+		2EC9AC61F184C5919DED4173C580AE29 /* OWSReadReceiptsForSenderMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSReadReceiptsForSenderMessage.h; sourceTree = "<group>"; };
 		2F08D2E82A2ACBB90DD5963F264EB363 /* Reachability.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Reachability.xcconfig; sourceTree = "<group>"; };
-		2F58D37D4BDF2486C3BF0B7676855A93 /* TSContactThread.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSContactThread.h; sourceTree = "<group>"; };
-		2FFE7C173700FAC6BF5A82E93F7BF4DE /* DigiCertGlobalRootG2.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = DigiCertGlobalRootG2.crt; path = SignalServiceKit/Resources/Certificates/DigiCertGlobalRootG2.crt; sourceTree = "<group>"; };
 		3001C9A686CC8DD7BE36E4CD0DDE9AF1 /* NSObject+MTLComparisonAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSObject+MTLComparisonAdditions.m"; path = "Mantle/NSObject+MTLComparisonAdditions.m"; sourceTree = "<group>"; };
+		305C16C8A5DA904F952EF4E1D302B0B5 /* OWSSyncContactsMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSSyncContactsMessage.h; sourceTree = "<group>"; };
+		307E4232F3401FFBDFB804FB90C8498E /* OWSCountryMetadata.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSCountryMetadata.m; sourceTree = "<group>"; };
 		3080BEBC6EE9935D0EE27A6E829D93B1 /* fe_neg.c */ = {isa = PBXFileReference; includeInIndex = 1; name = fe_neg.c; path = Sources/ed25519/fe_neg.c; sourceTree = "<group>"; };
 		3086857ADC4785296A9A428003AB65B5 /* YapDatabaseActionManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseActionManager.h; path = YapDatabase/Extensions/ActionManager/YapDatabaseActionManager.h; sourceTree = "<group>"; };
-		30CC1556309A95CCAE5FE9383F6FF7D0 /* NSNotificationCenter+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSNotificationCenter+OWS.h"; sourceTree = "<group>"; };
-		30E2E7E8D6EFE651F74FE88E9C1019AA /* OWSEndSessionMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSEndSessionMessage.m; sourceTree = "<group>"; };
+		30C0065E9D22C04882D5F769C4EC99B7 /* TSInvalidIdentityKeySendingErrorMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSInvalidIdentityKeySendingErrorMessage.h; sourceTree = "<group>"; };
 		30ED92062CAB203AF6FDC7290C232D8A /* YYFrameImage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YYFrameImage.m; path = YYImage/YYFrameImage.m; sourceTree = "<group>"; };
 		3101A9297141955D3815C4CD2911BA6B /* ge_sub.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ge_sub.h; path = Sources/ed25519/ge_sub.h; sourceTree = "<group>"; };
 		31205D218CAD6B5852CFC7A4E6AF6CB4 /* BinaryDecoder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BinaryDecoder.swift; path = Sources/SwiftProtobuf/BinaryDecoder.swift; sourceTree = "<group>"; };
 		31242F589772CC3ED0D8F20EA7FFE8F4 /* YapDatabaseOptions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseOptions.m; path = YapDatabase/YapDatabaseOptions.m; sourceTree = "<group>"; };
 		314D9C3213EBF05D35415C52000272C1 /* AnyUnpackError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnyUnpackError.swift; path = Sources/SwiftProtobuf/AnyUnpackError.swift; sourceTree = "<group>"; };
-		31D43F990CC92E2B9030CA2DC76D5B96 /* OWSContactsOutputStream.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSContactsOutputStream.h; sourceTree = "<group>"; };
-		322267C8FAE8A3E23CF77D75611B933C /* OWSOperation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSOperation.h; sourceTree = "<group>"; };
+		31C2C72487AC3C95637445C0E9D1C720 /* PreKeyBundle+jsonDict.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PreKeyBundle+jsonDict.h"; sourceTree = "<group>"; };
+		321B0046904E5ECC79D317F3484187E9 /* OWSCallIceUpdateMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSCallIceUpdateMessage.m; sourceTree = "<group>"; };
 		323468450CA77F780ECA085FEC57D9E9 /* YapActionItem.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapActionItem.h; path = YapDatabase/Extensions/ActionManager/YapActionItem.h; sourceTree = "<group>"; };
-		326CFF270B63021CF220CE534ABA46A6 /* iOSVersions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = iOSVersions.h; sourceTree = "<group>"; };
 		32E9B5E8035BB2DF1B72CF74112D2365 /* NSError+MTLModelException.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSError+MTLModelException.m"; path = "Mantle/NSError+MTLModelException.m"; sourceTree = "<group>"; };
 		330F2BB6097F23B472D1A0D05862961D /* ge_p1p1_to_p3.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ge_p1p1_to_p3.c; path = Sources/ed25519/ge_p1p1_to_p3.c; sourceTree = "<group>"; };
+		3313B915D87FEF48D617EA911E54C68C /* OWSDevice.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDevice.m; sourceTree = "<group>"; };
 		3347848C2D72BDCC3D647E31C65735E9 /* SSZipArchive.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = SSZipArchive.framework; path = SSZipArchive.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		335AAF1CDA77115DB97F4DDA497D125E /* AFAutoPurgingImageCache.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFAutoPurgingImageCache.m; path = "UIKit+AFNetworking/AFAutoPurgingImageCache.m"; sourceTree = "<group>"; };
-		3370C5DE00549F1EA220B5DAF6E4B239 /* TSVerifyCodeRequest.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSVerifyCodeRequest.m; sourceTree = "<group>"; };
 		3396639BA2F239D7CA63505ADCF7BDCD /* YapDatabaseRelationshipEdge.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseRelationshipEdge.m; path = YapDatabase/Extensions/Relationships/YapDatabaseRelationshipEdge.m; sourceTree = "<group>"; };
 		33A5DF65825C403BF352E5C403775B32 /* when.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = when.m; path = Sources/when.m; sourceTree = "<group>"; };
-		340643BD1BFC9A5A6E6CF39344EEC514 /* NSData+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSData+OWS.h"; sourceTree = "<group>"; };
+		33EE1D9EFC506BD11D92D311B7A17605 /* OWSDisappearingConfigurationUpdateInfoMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDisappearingConfigurationUpdateInfoMessage.h; sourceTree = "<group>"; };
+		341D6C26F8B718F82D62436807A19672 /* OWSMediaGalleryFinder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSMediaGalleryFinder.h; sourceTree = "<group>"; };
 		3421BF8033F320692054CCCB9B82B531 /* SwiftProtobuf.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SwiftProtobuf.xcconfig; sourceTree = "<group>"; };
+		34320BDBD45225021843DAE8BBBF69F1 /* NSURLSessionDataTask+StatusCode.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSURLSessionDataTask+StatusCode.m"; sourceTree = "<group>"; };
 		343880126497C8A3623D25CE1B040CB5 /* YapDatabase.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = YapDatabase.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		343B93F86FDDA869FDA6BAE5DECEDA3B /* OWSLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSLogger.m; sourceTree = "<group>"; };
 		3442B442F8438095CB208397440B6C58 /* YYAnimatedImageView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YYAnimatedImageView.m; path = YYImage/YYAnimatedImageView.m; sourceTree = "<group>"; };
 		345538D6031118578A05A9AEA15C2A29 /* crypto_verify_32.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = crypto_verify_32.h; path = Sources/ed25519/nacl_includes/crypto_verify_32.h; sourceTree = "<group>"; };
 		34580B0E83B7B0660A4B2AE6B6BC586C /* Pods-Signal.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Signal.debug.xcconfig"; sourceTree = "<group>"; };
+		346781ED13B1A983297FC6C504C8E48D /* PhoneNumber.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = PhoneNumber.h; sourceTree = "<group>"; };
 		348A128F76E93987E7B1CF0EED44E998 /* NSDate+YapDatabase.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSDate+YapDatabase.m"; path = "YapDatabase/Internal/NSDate+YapDatabase.m"; sourceTree = "<group>"; };
 		34A3D3FE994C49C7F9C42A52022727AC /* NSDictionary+MTLJSONKeyPath.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSDictionary+MTLJSONKeyPath.m"; path = "Mantle/NSDictionary+MTLJSONKeyPath.m"; sourceTree = "<group>"; };
-		35375BF7DB9184D6A3BE0DE8E555CF91 /* SignalAccount.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = SignalAccount.h; sourceTree = "<group>"; };
-		356D8727507334DCA8E7D6BAC1398D86 /* OWSDispatch.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDispatch.m; sourceTree = "<group>"; };
+		34CEC047500668E56EF60397E90122D1 /* OWSOutgoingNullMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSOutgoingNullMessage.m; sourceTree = "<group>"; };
 		35789035A5591EE8805BAB0CFAC89568 /* SAMKeychainQuery.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SAMKeychainQuery.h; path = Sources/SAMKeychainQuery.h; sourceTree = "<group>"; };
 		35827913A72C08B08960011B9C37EBA6 /* Pods_SignalShareExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SignalShareExtension.framework; path = "Pods-SignalShareExtension.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
 		35AE3A8CEC25B35E85D4135F7162F459 /* Version.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Version.swift; path = Sources/SwiftProtobuf/Version.swift; sourceTree = "<group>"; };
+		35CE2F9AA16964EE6FADAF5537299D32 /* NSError+MessageSending.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSError+MessageSending.m"; sourceTree = "<group>"; };
 		35DF221334AA010A7163228B7BEFD21E /* Mantle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Mantle.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		35EF1FB0275CB42853819E92CE0DD0C2 /* DDMultiFormatter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDMultiFormatter.h; path = Classes/Extensions/DDMultiFormatter.h; sourceTree = "<group>"; };
-		3601F8693B8A4E0649F983E40AD10D0C /* TSIncomingMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSIncomingMessage.h; sourceTree = "<group>"; };
 		363041FB31F689A3FC4892E5CDFF018B /* Message.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Message.h; path = src/runtime/Classes/Message.h; sourceTree = "<group>"; };
+		363F37E250119A0541255418CB9F4FF4 /* OWSFailedMessagesJob.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSFailedMessagesJob.m; sourceTree = "<group>"; };
 		36573B789E1BE66D753A00CAE1BBB21D /* YapDatabaseAutoViewConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseAutoViewConnection.h; path = YapDatabase/Extensions/AutoView/YapDatabaseAutoViewConnection.h; sourceTree = "<group>"; };
-		369A29176C6B3D4FFA8D54739DE7CC0F /* OWSIdentityManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSIdentityManager.h; sourceTree = "<group>"; };
-		36C4BBE27A42C3AD53C4EA5D52EA827C /* GTSR2.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = GTSR2.crt; path = SignalServiceKit/Resources/Certificates/GTSR2.crt; sourceTree = "<group>"; };
+		36B153DC65DDD85B5C92A24D684258E1 /* OutageDetection.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OutageDetection.swift; sourceTree = "<group>"; };
 		36C6AC58D433111910EB4E4179A3AC65 /* sqrtm1.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = sqrtm1.h; path = Sources/ed25519/sqrtm1.h; sourceTree = "<group>"; };
 		374E808541C2F78C98AB88BB77BD510D /* NSURLRequest+SRWebSocket.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSURLRequest+SRWebSocket.m"; path = "SocketRocket/NSURLRequest+SRWebSocket.m"; sourceTree = "<group>"; };
-		37686D25E62539FAE9D225B5D4FB739B /* TSInfoMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSInfoMessage.h; sourceTree = "<group>"; };
 		37955ED1EA44B1F3BCDA56CE36A90A1C /* TextFormatScanner.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TextFormatScanner.swift; path = Sources/SwiftProtobuf/TextFormatScanner.swift; sourceTree = "<group>"; };
-		37977B5CA3E96822F5727D53C13B4C57 /* AppReadiness.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = AppReadiness.m; sourceTree = "<group>"; };
 		37E752BDCBA3E6CCA17D4E2C33C6E1B8 /* hmac.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = hmac.h; path = SSZipArchive/minizip/aes/hmac.h; sourceTree = "<group>"; };
 		38678F561C51251975E86DBDE22010BB /* DDContextFilterLogFormatter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDContextFilterLogFormatter.m; path = Classes/Extensions/DDContextFilterLogFormatter.m; sourceTree = "<group>"; };
 		388721C6A4240F24E1EC506C03B0EC5F /* YapDatabaseRTreeIndex.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseRTreeIndex.h; path = YapDatabase/Extensions/RTreeIndex/YapDatabaseRTreeIndex.h; sourceTree = "<group>"; };
 		38D3A15857D207F173B7ADD80C292A07 /* YYFrameImage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YYFrameImage.h; path = YYImage/YYFrameImage.h; sourceTree = "<group>"; };
 		38F2F8D0FC280D31F5D8D67550AE7CE6 /* NSObject+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSObject+Promise.swift"; path = "Extensions/Foundation/Sources/NSObject+Promise.swift"; sourceTree = "<group>"; };
-		39746EDEB77B7BD826D6C93C9AEF4B42 /* OWSMessageUtils.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSMessageUtils.m; sourceTree = "<group>"; };
+		38FD00281DCF6EC49D11D6B4CEE7CFC2 /* SignalIOSProto.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SignalIOSProto.swift; sourceTree = "<group>"; };
 		3994C093DEF4750BC8FCB7C920191BFB /* YDBCKRecordInfo.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YDBCKRecordInfo.m; path = YapDatabase/Extensions/CloudKit/Utilities/YDBCKRecordInfo.m; sourceTree = "<group>"; };
-		39D272162B10D1D246C891716C301050 /* TSInfoMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSInfoMessage.m; sourceTree = "<group>"; };
+		399C2B6FA2154176F51ACD8D9F977ED4 /* TSAttachmentStream.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSAttachmentStream.m; sourceTree = "<group>"; };
 		3A05176BBFA273E9D2118604F8F4CC2D /* SwiftProtobuf-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SwiftProtobuf-prefix.pch"; sourceTree = "<group>"; };
-		3A159DCD42E4205B519C7EDB6DEDE44F /* OWSSyncContactsMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSSyncContactsMessage.h; sourceTree = "<group>"; };
-		3A353239A2F5DB1F69EA1B8F137345E1 /* TSMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSMessage.m; sourceTree = "<group>"; };
 		3A35CF45C44310BCA779D4F153080BDF /* YapDatabaseRTreeIndexOptions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseRTreeIndexOptions.m; path = YapDatabase/Extensions/RTreeIndex/YapDatabaseRTreeIndexOptions.m; sourceTree = "<group>"; };
 		3A6A54399A11DA20B442184CD47540F5 /* YapDatabaseFullTextSearchPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseFullTextSearchPrivate.h; path = YapDatabase/Extensions/FullTextSearch/Internal/YapDatabaseFullTextSearchPrivate.h; sourceTree = "<group>"; };
-		3A7FA2DAC71D1A8FCBE62535A68090D2 /* NotificationsProtocol.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = NotificationsProtocol.h; sourceTree = "<group>"; };
 		3B048488257169323DC2FA2A17CB15EA /* WhisperTextProtocol.pb.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = WhisperTextProtocol.pb.m; path = AxolotlKit/Classes/Protobuffs/WhisperTextProtocol.pb.m; sourceTree = "<group>"; };
-		3B34CEBE4B5FBDAD2F52C8732D82FE05 /* TSAttachmentStream.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSAttachmentStream.h; sourceTree = "<group>"; };
+		3B2D8ABED50562D5C1617DFFA248E3DE /* OWSPrimaryStorage+Calling.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OWSPrimaryStorage+Calling.m"; sourceTree = "<group>"; };
+		3B4051483AA77EF00D608277AADBA40D /* OWSSignalService.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSSignalService.h; sourceTree = "<group>"; };
+		3B4699F3EE3FDAFA50EAD5283FD586F4 /* NSData+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSData+OWS.h"; sourceTree = "<group>"; };
+		3BECC8E964198B02DB57C987F58A17C4 /* OWSDeviceProvisioner.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDeviceProvisioner.m; sourceTree = "<group>"; };
 		3C716E82378DF78B07503F1197C4F9F7 /* AnyMessageStorage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnyMessageStorage.swift; path = Sources/SwiftProtobuf/AnyMessageStorage.swift; sourceTree = "<group>"; };
-		3CB6173B704474AA5B9F76ECFD145ECE /* OWSRequestBuilder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSRequestBuilder.m; sourceTree = "<group>"; };
+		3CAB9F597D0F505B7092B1BA97A3BBFC /* OWSCallBusyMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSCallBusyMessage.h; sourceTree = "<group>"; };
 		3CCEEEE47EED3E228749182F2AA6BF0F /* YapDatabaseSearchResultsView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseSearchResultsView.m; path = YapDatabase/Extensions/SearchResultsView/YapDatabaseSearchResultsView.m; sourceTree = "<group>"; };
 		3CE6F4E4AE8678501398F43C200F23EF /* MessageBuilder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MessageBuilder.h; path = src/runtime/Classes/MessageBuilder.h; sourceTree = "<group>"; };
 		3D3915BADEB5CAB2DEC0B8DE0D34F98F /* YapDatabaseSearchResultsViewConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseSearchResultsViewConnection.h; path = YapDatabase/Extensions/SearchResultsView/YapDatabaseSearchResultsViewConnection.h; sourceTree = "<group>"; };
 		3D4C969FFCD139458395C34E24A2E7C5 /* Curve25519.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = Curve25519.m; path = Classes/Curve25519.m; sourceTree = "<group>"; };
+		3D75DFE0828B6F9097CDE2160F09558B /* SignalRecipient.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = SignalRecipient.h; sourceTree = "<group>"; };
 		3D7A51B515035A6910F168FFDD60FA14 /* YapDatabaseFilteredViewTransaction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseFilteredViewTransaction.h; path = YapDatabase/Extensions/FilteredView/YapDatabaseFilteredViewTransaction.h; sourceTree = "<group>"; };
 		3D8E80AA5A8A8A273EB49D81D5FBE510 /* Mantle-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Mantle-dummy.m"; sourceTree = "<group>"; };
 		3DB6FA50ADE943AE0E682BA5BB45A1A5 /* PreKeyStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PreKeyStore.h; path = AxolotlKit/Classes/State/PreKeyStore.h; sourceTree = "<group>"; };
+		3DB86DF799664A75985F7EFD5C21CB1F /* OWSReadReceiptsForSenderMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSReadReceiptsForSenderMessage.m; sourceTree = "<group>"; };
+		3DCF0BAB5C770833C718276E246B2CAB /* NSArray+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSArray+OWS.h"; sourceTree = "<group>"; };
 		3DDFDFF03A5B55033B593A47A890B049 /* Decoder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Decoder.swift; path = Sources/SwiftProtobuf/Decoder.swift; sourceTree = "<group>"; };
 		3DF4D4A35EB25D48E87671F1B3BCE0D8 /* Reachability-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Reachability-prefix.pch"; sourceTree = "<group>"; };
+		3E33A7A815DB08E7B205A4293550EFEF /* TSGroupModel.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSGroupModel.h; sourceTree = "<group>"; };
+		3E4C2A558E1E7336049D2FB36D3F5E02 /* CDSQuote.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = CDSQuote.m; sourceTree = "<group>"; };
+		3E52850FB6B2F6F284145096D525CA36 /* OWSOutgoingSentMessageTranscript.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSOutgoingSentMessageTranscript.h; sourceTree = "<group>"; };
+		3E878EFC29205FA4982A6F25F1F0A281 /* OWSProfileKeyMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSProfileKeyMessage.h; sourceTree = "<group>"; };
+		3E992D4725D49631CE910EFB9CC5F178 /* DataSource.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = DataSource.m; sourceTree = "<group>"; };
+		3EA2FE71CD3C1908CF22DE3D4B53688A /* SignalAccount.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = SignalAccount.m; sourceTree = "<group>"; };
 		3ED98C45B5438F6EC89FE20115028C02 /* YapDatabaseRelationshipConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseRelationshipConnection.h; path = YapDatabase/Extensions/Relationships/YapDatabaseRelationshipConnection.h; sourceTree = "<group>"; };
 		3EF39FC543CCE87A9BBF3DEBEDEB5745 /* pwd2key.c */ = {isa = PBXFileReference; includeInIndex = 1; name = pwd2key.c; path = SSZipArchive/minizip/aes/pwd2key.c; sourceTree = "<group>"; };
 		3EF9EC939137F8342C044FCC2FB6D517 /* Pods-Signal.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-Signal.modulemap"; sourceTree = "<group>"; };
+		3F1101D6A8E30AA339C6EF1FFBD639F9 /* OWSBlockingManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSBlockingManager.m; sourceTree = "<group>"; };
 		3F19F53EE1A2C6D56E32AD111C68E3A7 /* Field.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Field.h; path = src/runtime/Classes/Field.h; sourceTree = "<group>"; };
 		3F55B712EBCBEEB50E20A4CFA654774F /* SAMKeychain.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SAMKeychain.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		3F58622245F60AD7ABC5E616F55EF5CE /* OWSStorage+Subclass.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OWSStorage+Subclass.h"; sourceTree = "<group>"; };
+		3F62878B4141B3CD6FDD578031E2D4CB /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE; sourceTree = "<group>"; };
 		3FB045CC53E8806EAD12EBC0B01C95C0 /* aes_ni.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = aes_ni.h; path = SSZipArchive/minizip/aes/aes_ni.h; sourceTree = "<group>"; };
-		3FB3D34FE02E9B8E97721AB15E3D7A92 /* OWSAnalytics.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSAnalytics.m; sourceTree = "<group>"; };
-		3FB8EB8BEC8798551CC5172E602A27A3 /* SignalService.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SignalService.pb.swift; sourceTree = "<group>"; };
-		3FC67C430811D1CD33EE910999097A05 /* OWSProvisioningCipher.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSProvisioningCipher.h; sourceTree = "<group>"; };
 		3FEBB1592DB39D73CC3AB7040AB5E34C /* SignedPrekeyRecord.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SignedPrekeyRecord.m; path = AxolotlKit/Classes/Prekeys/SignedPrekeyRecord.m; sourceTree = "<group>"; };
 		3FF64AF71A304BD7C684843D3C2D206F /* AFNetworking.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = AFNetworking.modulemap; sourceTree = "<group>"; };
-		401172D3CF99F0A1377F7F00B3353537 /* OWSChunkedOutputStream.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSChunkedOutputStream.h; sourceTree = "<group>"; };
+		404DCC447395895E59573656CDD3DF66 /* GSR2.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = GSR2.crt; path = SignalServiceKit/Resources/Certificates/GSR2.crt; sourceTree = "<group>"; };
 		40609413CD20975C8F021B5549372A7E /* curve_sigs.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = curve_sigs.h; path = Sources/ed25519/additions/curve_sigs.h; sourceTree = "<group>"; };
 		4066A414F8BEBB60843E49661CC54E8D /* PureLayout-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PureLayout-dummy.m"; sourceTree = "<group>"; };
 		4076D4BFC97912D05390446D3CF004AB /* NBPhoneMetaData.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NBPhoneMetaData.m; path = libPhoneNumber/NBPhoneMetaData.m; sourceTree = "<group>"; };
-		41028999D598531A11F32FBD6AC8F717 /* OWSCountryMetadata.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSCountryMetadata.m; sourceTree = "<group>"; };
-		410487ABA793C297696A3589A5C3B1CE /* OWSDisappearingMessagesConfiguration.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDisappearingMessagesConfiguration.h; sourceTree = "<group>"; };
+		40FD9A7F6B8D6AF6CDEA1642D31E2DCB /* OWSProvisioningProtos.pb.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSProvisioningProtos.pb.m; sourceTree = "<group>"; };
 		4116FB9430093204F3CD96A0204A4BB6 /* Pods_SignalTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SignalTests.framework; path = "Pods-SignalTests.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
 		4118CBBEE000CF35A17E7630CE4BBB08 /* YapDatabaseCloudKitTransaction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseCloudKitTransaction.m; path = YapDatabase/Extensions/CloudKit/YapDatabaseCloudKitTransaction.m; sourceTree = "<group>"; };
 		411EB0583F6F44C324289FFE9CD5E93C /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		41813CA5501EE010F5715AB7EC83FFA1 /* AxolotlKit.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = AxolotlKit.xcconfig; sourceTree = "<group>"; };
 		424CBC7F247759D30EA9243DD9AFA83F /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		4252D3CF9DA7EC13987AF44E5FFAA081 /* AxolotlKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "AxolotlKit-prefix.pch"; sourceTree = "<group>"; };
+		428E0B790047699ECA52FC1B8B2D504C /* OWSBackupFragment.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSBackupFragment.m; sourceTree = "<group>"; };
 		42BC945F7EF5993780CA266319978F81 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		42D768F59E01262E53D84035AA52BC6A /* OWSMessageDecrypter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSMessageDecrypter.m; sourceTree = "<group>"; };
-		42DF8E20B9CE4D5AD0A024BC70CC4171 /* OWSDisappearingConfigurationUpdateInfoMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDisappearingConfigurationUpdateInfoMessage.h; sourceTree = "<group>"; };
 		42EEFD0ADB3332165A54BC57DE11497D /* Pods-SignalTests.app store release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SignalTests.app store release.xcconfig"; sourceTree = "<group>"; };
 		43098D09FEEC73CB216B17D84C5EA6FB /* YapDatabaseSecondaryIndexConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseSecondaryIndexConnection.m; path = YapDatabase/Extensions/SecondaryIndex/YapDatabaseSecondaryIndexConnection.m; sourceTree = "<group>"; };
-		436D11384E6EDA27D0C37F8E5F8425A6 /* PhoneNumber.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = PhoneNumber.m; sourceTree = "<group>"; };
 		437210273E3EE8899A5CF840E498DA84 /* YapDatabaseExtension.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseExtension.h; path = YapDatabase/Extensions/Protocol/YapDatabaseExtension.h; sourceTree = "<group>"; };
-		438A2EAE9B8A3C839DA31EB88C7B27EA /* TSAttachment.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSAttachment.h; sourceTree = "<group>"; };
-		439E21C375E6B238C1CD62A80ECD3FDF /* TextSecureKitEnv.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = TextSecureKitEnv.m; path = SignalServiceKit/src/TextSecureKitEnv.m; sourceTree = "<group>"; };
 		43AA0E3EBC14B9633FE50ADC7BAF8DB8 /* YDBCKChangeSet.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YDBCKChangeSet.h; path = YapDatabase/Extensions/CloudKit/Utilities/YDBCKChangeSet.h; sourceTree = "<group>"; };
 		43BBF08C458FF89CC9DC7D2AE37ACE42 /* URLDataPromise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = URLDataPromise.swift; path = Extensions/Foundation/Sources/URLDataPromise.swift; sourceTree = "<group>"; };
-		43CF70AFBF22B0BAC9826C6C756BF35E /* OWSDevice.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDevice.h; sourceTree = "<group>"; };
 		43FBD28F320D1B90D031FB78B8037C8F /* SRIOConsumerPool.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SRIOConsumerPool.h; path = SocketRocket/Internal/IOConsumer/SRIOConsumerPool.h; sourceTree = "<group>"; };
 		44260A4954413EBE2D5564F65AFA3372 /* SwiftProtobuf-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SwiftProtobuf-umbrella.h"; sourceTree = "<group>"; };
+		446170C5A737E474E75D597E48D67CCD /* NSTimer+OWS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSTimer+OWS.m"; sourceTree = "<group>"; };
 		44B67D3DAB41B302755D41EFD42F727A /* Curve25519Kit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Curve25519Kit-dummy.m"; sourceTree = "<group>"; };
-		44CCF7AB7638EA1E4483DDFAB53DF077 /* Cryptography.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = Cryptography.m; sourceTree = "<group>"; };
-		44D4F8F189065B5F92D8B2A7F49C7D44 /* OWSProfileKeyMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSProfileKeyMessage.m; sourceTree = "<group>"; };
-		4512F9816C9763DC21FA4D90D48C17D9 /* Promise+retainUntilComplete.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "Promise+retainUntilComplete.swift"; sourceTree = "<group>"; };
-		451D4CBD6551E643DAE8CD949A2941C6 /* NSData+OWS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSData+OWS.m"; sourceTree = "<group>"; };
-		454E1F5A6285CF7E2947C0D0F679DD30 /* OWSSyncGroupsMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSSyncGroupsMessage.m; sourceTree = "<group>"; };
 		454FD81AE477658BC27B9AAC3C61F9CB /* YapDatabaseCloudCore.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseCloudCore.m; path = YapDatabase/Extensions/CloudCore/YapDatabaseCloudCore.m; sourceTree = "<group>"; };
 		4569DFF1843F987D542EA3E35BB67D67 /* YapDatabaseFilteredViewPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseFilteredViewPrivate.h; path = YapDatabase/Extensions/FilteredView/Internal/YapDatabaseFilteredViewPrivate.h; sourceTree = "<group>"; };
-		45D5924C45AB7A0036D734A888A181AA /* OWSReadReceiptManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSReadReceiptManager.m; sourceTree = "<group>"; };
+		45961EB04D858EF9E9FA00D322CFFFEF /* OWSSignaliOSProtos.pb.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSSignaliOSProtos.pb.h; sourceTree = "<group>"; };
 		4617C414FDA7572894FB3847C3DDBA43 /* field_mask.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = field_mask.pb.swift; path = Sources/SwiftProtobuf/field_mask.pb.swift; sourceTree = "<group>"; };
 		462C7C2FA0C7C114D0E70A68AAD13AA4 /* ExtensionMap.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExtensionMap.swift; path = Sources/SwiftProtobuf/ExtensionMap.swift; sourceTree = "<group>"; };
+		463CEA6154BD03513017B94855150988 /* OWSBatchMessageProcessor.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSBatchMessageProcessor.h; sourceTree = "<group>"; };
+		4647B51C5238D60EE7150931EF1F819A /* OWSIdentityManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSIdentityManager.m; sourceTree = "<group>"; };
 		46579B59D8F61FC1B96EE2B16C67E0C7 /* SRSIMDHelpers.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SRSIMDHelpers.m; path = SocketRocket/Internal/Utilities/SRSIMDHelpers.m; sourceTree = "<group>"; };
-		465843CEA74E01979F5BE46BD49650E7 /* PhoneNumberUtil.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = PhoneNumberUtil.h; sourceTree = "<group>"; };
 		46642729F15661E076FD8569C6A5B901 /* ProtocolBuffers.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = ProtocolBuffers.framework; path = ProtocolBuffers.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4665485FBE656FE77E3B294F592E6D51 /* YapDatabaseSearchResultsViewOptions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseSearchResultsViewOptions.m; path = YapDatabase/Extensions/SearchResultsView/YapDatabaseSearchResultsViewOptions.m; sourceTree = "<group>"; };
-		466DD73B6EF54D1E3A297D1982CD568A /* TSAttachmentStream.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSAttachmentStream.m; sourceTree = "<group>"; };
 		468D0371D974A5874D1ADDE873D6A1F4 /* SessionCipher.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SessionCipher.h; path = AxolotlKit/Classes/SessionCipher.h; sourceTree = "<group>"; };
-		46A50534032487C63B8D57D9360748B1 /* PreKeyBundle+jsonDict.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PreKeyBundle+jsonDict.m"; sourceTree = "<group>"; };
 		46AF86DF4285D5E9220FB7763516BB06 /* ChainAndIndex.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = ChainAndIndex.m; path = AxolotlKit/Classes/Ratchet/ChainAndIndex.m; sourceTree = "<group>"; };
 		46B729DED2D61C7A7B250A6B270B82B3 /* CodedInputStream.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CodedInputStream.h; path = src/runtime/Classes/CodedInputStream.h; sourceTree = "<group>"; };
 		46D8A3AA400CD0DE070F2160A0CAB123 /* YapDatabaseSecondaryIndexSetup.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseSecondaryIndexSetup.m; path = YapDatabase/Extensions/SecondaryIndex/YapDatabaseSecondaryIndexSetup.m; sourceTree = "<group>"; };
-		474139684597BDDE56CC1172E80506CE /* OWSOrphanedDataCleaner.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSOrphanedDataCleaner.h; sourceTree = "<group>"; };
+		4741C03ECE1076FF3C74BF73143B5AD5 /* TSAttachmentPointer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSAttachmentPointer.m; sourceTree = "<group>"; };
 		474350D56A46DE6307F5A093E7EEE27E /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		47511E6B0D8A484D5D2CC7F8D487A443 /* ioapi_mem.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ioapi_mem.h; path = SSZipArchive/minizip/ioapi_mem.h; sourceTree = "<group>"; };
+		479F36C9AE0FA0880B9E5EC24FD19E7E /* OWSCallHangupMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSCallHangupMessage.m; sourceTree = "<group>"; };
 		480C096C57053946E57643DDDDD49F1D /* NBGeneratedPhoneNumberMetaData.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NBGeneratedPhoneNumberMetaData.h; path = libPhoneNumber/NBGeneratedPhoneNumberMetaData.h; sourceTree = "<group>"; };
-		480C82E67D45E2721A7B4F25C877AE5A /* WebSocketResources.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = WebSocketResources.pb.swift; sourceTree = "<group>"; };
-		485F3AA27F05542213B759678894DD65 /* OWSContact.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSContact.m; sourceTree = "<group>"; };
 		48606DFC17D4410FEE949D848D1BFDE7 /* NBPhoneNumberUtil.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NBPhoneNumberUtil.m; path = libPhoneNumber/NBPhoneNumberUtil.m; sourceTree = "<group>"; };
+		48631D16A587B7EFFBFF67CBB3629408 /* OWSFingerprintProtos.pb.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSFingerprintProtos.pb.m; sourceTree = "<group>"; };
 		486C3954D0124106ED2D7A4F07A8E6D4 /* AxolotlKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AxolotlKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		486E2B19A6ACC98E16CDDFBEF2756C6B /* NSDictionary+YapDatabase.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+YapDatabase.h"; path = "YapDatabase/Internal/NSDictionary+YapDatabase.h"; sourceTree = "<group>"; };
 		492F5FB034D1C3817404736D8C91D82C /* SSZipCommon.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SSZipCommon.h; path = SSZipArchive/SSZipCommon.h; sourceTree = "<group>"; };
-		497B1EF9135C160BCDC8DB53AB5B66B1 /* UIImage+OWS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "UIImage+OWS.m"; sourceTree = "<group>"; };
-		49DF6BC24395FC978B59E20CA45AD8A1 /* NSDate+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSDate+OWS.h"; sourceTree = "<group>"; };
 		49E87D264617D23922B3F499DFB03ECD /* YDBCKAttachRequest.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YDBCKAttachRequest.m; path = YapDatabase/Extensions/CloudKit/Internal/YDBCKAttachRequest.m; sourceTree = "<group>"; };
+		4A31B6E0D741B89D59D34FEA442BD104 /* OWSCallOfferMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSCallOfferMessage.m; sourceTree = "<group>"; };
 		4A39BB51BBE5D5393ACA4B1268E6F3B2 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		4A3DF493D1DDAB23EE48766EAE295327 /* TextFormat.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TextFormat.h; path = src/runtime/Classes/TextFormat.h; sourceTree = "<group>"; };
 		4A58B07B2A35EDE7D180DD9328FDE9FC /* NSObject+MTLComparisonAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSObject+MTLComparisonAdditions.h"; path = "Mantle/NSObject+MTLComparisonAdditions.h"; sourceTree = "<group>"; };
-		4A7F67482256F97E420138E046B95CC5 /* OWSSignalService.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSSignalService.m; sourceTree = "<group>"; };
 		4B5E1D9BAF4C36A347F6AF09D77D07C4 /* SerializationUtilities.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SerializationUtilities.m; path = AxolotlKit/Classes/Utility/SerializationUtilities.m; sourceTree = "<group>"; };
-		4BD4FDDCD380EE461D15EE8D91C5FA18 /* Contact.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = Contact.m; sourceTree = "<group>"; };
+		4BCC1A80A46B04B2CB6232972B4A0678 /* NSUserDefaults+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSUserDefaults+OWS.h"; sourceTree = "<group>"; };
 		4BF02E5487ED98D33D0F78DC4BF674EF /* Pods_Signal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_Signal.framework; path = "Pods-Signal.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
-		4C0F37DBB8A316131C822ED9E95FEAFB /* TSYapDatabaseObject.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSYapDatabaseObject.h; sourceTree = "<group>"; };
-		4C17CB70C354F25AC18C50F1AFB44196 /* OperationFailed.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OperationFailed.m; sourceTree = "<group>"; };
 		4C4353BD25492E4FFB0D21584FD1AEFA /* ge_msub.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ge_msub.h; path = Sources/ed25519/ge_msub.h; sourceTree = "<group>"; };
-		4CAEA36AEEF712AD191C55AFF26527A2 /* OWSStorage+Subclass.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OWSStorage+Subclass.h"; sourceTree = "<group>"; };
-		4CD7BE7CB8812EA8ED02ABD3AFFFB8E2 /* Threading.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Threading.h; sourceTree = "<group>"; };
+		4C4DE8F9E1F66FC5E7696463BF0E09B2 /* OWSDisappearingMessagesConfiguration.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDisappearingMessagesConfiguration.h; sourceTree = "<group>"; };
+		4CBE7B611AC88ECF0F2EC970F8BF4E6B /* ContactsUpdater.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = ContactsUpdater.m; sourceTree = "<group>"; };
 		4CE44464D62D322BB68651ABCBEB2CBE /* YapDatabaseRTreeIndexSetup.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseRTreeIndexSetup.h; path = YapDatabase/Extensions/RTreeIndex/YapDatabaseRTreeIndexSetup.h; sourceTree = "<group>"; };
-		4D037E019256FF34FD57C8BDB1B5A936 /* PhoneNumber.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = PhoneNumber.h; sourceTree = "<group>"; };
-		4D7161078EA205A9DFC583892B89A496 /* OWSReadReceiptsForSenderMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSReadReceiptsForSenderMessage.h; sourceTree = "<group>"; };
 		4D85FEB2E73BDBE220159DCB0C3A028A /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		4DA225D8E741072BE8C1E0FEE0F767B3 /* HKDFKit.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = HKDFKit.h; path = HKDFKit/HKDFKit/HKDFKit.h; sourceTree = "<group>"; };
-		4DA2F10FFA8315F84DA5F1C048262D7B /* TSPreKeyManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSPreKeyManager.h; sourceTree = "<group>"; };
-		4DADCA8A9439E946682C0A7A4F7BE8B9 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		4DEA9A213F89A980259A9040616C857D /* OWSMessageServiceParams.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSMessageServiceParams.m; sourceTree = "<group>"; };
+		4E0A93AD18C590C809854A1B3B673A15 /* CDSQuote.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = CDSQuote.h; sourceTree = "<group>"; };
 		4E102F3A656CA7AB56B2AA5AF09ED828 /* ge_tobytes.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ge_tobytes.c; path = Sources/ed25519/ge_tobytes.c; sourceTree = "<group>"; };
 		4E1DB5DF168CC030BEF0C2F2CFAE9971 /* SocketRocket-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "SocketRocket-dummy.m"; sourceTree = "<group>"; };
-		4E604A0F1CEA90BA2047FA996437D191 /* SignalServiceKit.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SignalServiceKit.xcconfig; sourceTree = "<group>"; };
 		4E642DF6C513C54B8D25BE19DF6FDBEE /* YapDatabaseCloudCorePipeline.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCloudCorePipeline.h; path = YapDatabase/Extensions/CloudCore/Utilities/Execution/YapDatabaseCloudCorePipeline.h; sourceTree = "<group>"; };
 		4E86897B421B23F433A48BEB267493A7 /* YapDatabaseFullTextSearch.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseFullTextSearch.m; path = YapDatabase/Extensions/FullTextSearch/YapDatabaseFullTextSearch.m; sourceTree = "<group>"; };
 		4E869B251DB17126CCADDAE1E7B2091A /* PreKeyRecord.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = PreKeyRecord.m; path = AxolotlKit/Classes/Prekeys/PreKeyRecord.m; sourceTree = "<group>"; };
+		4ED3FD155B5F224FABF6E0AAD19563DF /* OWSRecipientIdentity.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSRecipientIdentity.m; sourceTree = "<group>"; };
+		4F50577B42C115B0D097EA2B44915659 /* Provisioning.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Provisioning.pb.swift; sourceTree = "<group>"; };
 		4F78E3BE9A9AD95EB9D8EB58BAB52736 /* pow225521.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = pow225521.h; path = Sources/ed25519/pow225521.h; sourceTree = "<group>"; };
 		4FB7873517DE1FE25E8DF88667D0FCE8 /* YDBCKMergeInfo.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YDBCKMergeInfo.h; path = YapDatabase/Extensions/CloudKit/Utilities/YDBCKMergeInfo.h; sourceTree = "<group>"; };
-		4FB7B89FEBC47E2B880EAE57CED8CE47 /* NSData+Base64.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSData+Base64.h"; sourceTree = "<group>"; };
+		4FBB76A2E328893494AB8E86040BAAB8 /* ProtoUtils.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = ProtoUtils.m; sourceTree = "<group>"; };
+		4FC6240CDA2B7E8CCBF9ECD4AFE09E7D /* OWSSyncGroupsMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSSyncGroupsMessage.m; sourceTree = "<group>"; };
 		4FE8AA0C4FF0FA6195430F00232820F8 /* YapDatabaseViewPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseViewPrivate.h; path = YapDatabase/Extensions/View/Internal/YapDatabaseViewPrivate.h; sourceTree = "<group>"; };
 		500381321FD2D1292DFBF05EE0CC2B34 /* NSValueTransformer+MTLInversionAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSValueTransformer+MTLInversionAdditions.m"; path = "Mantle/NSValueTransformer+MTLInversionAdditions.m"; sourceTree = "<group>"; };
 		500B469C3B81D6B4CD0E994B3A319D61 /* YapDatabaseCloudKit.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseCloudKit.m; path = YapDatabase/Extensions/CloudKit/YapDatabaseCloudKit.m; sourceTree = "<group>"; };
 		50386EA1FC6F9C10ED459F753F630C94 /* SRHTTPConnectMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SRHTTPConnectMessage.h; path = SocketRocket/Internal/Utilities/SRHTTPConnectMessage.h; sourceTree = "<group>"; };
-		50806551F77ED533C85531F6EB834F68 /* OWSWebsocketSecurityPolicy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSWebsocketSecurityPolicy.m; sourceTree = "<group>"; };
 		508C4A1B3213BA484404538C7EC030DC /* ProtocolBuffers-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "ProtocolBuffers-dummy.m"; sourceTree = "<group>"; };
 		50EC86727001F94393807DC0AC225CFE /* SRSecurityPolicy.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SRSecurityPolicy.h; path = SocketRocket/SRSecurityPolicy.h; sourceTree = "<group>"; };
 		50FA0AD1CC78017F8603ADCCB6231911 /* YYImageCoder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YYImageCoder.h; path = YYImage/YYImageCoder.h; sourceTree = "<group>"; };
 		51142EE834E47753995A8C6BEFBDB708 /* SAMKeychain.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = SAMKeychain.modulemap; sourceTree = "<group>"; };
-		5133EAB0DCEF514E3C478D6EB5F054E2 /* NSTimer+OWS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSTimer+OWS.m"; sourceTree = "<group>"; };
-		518BCD1FD6BCC27CBB30F777A972D70F /* OWS2FAManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWS2FAManager.m; sourceTree = "<group>"; };
+		518AD2F9804CAB60B809061ABAB3F3B8 /* NSData+Base64.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSData+Base64.m"; sourceTree = "<group>"; };
 		51A61A9F683820997520253884261F2E /* minishared.c */ = {isa = PBXFileReference; includeInIndex = 1; name = minishared.c; path = SSZipArchive/minizip/minishared.c; sourceTree = "<group>"; };
+		51AF55B7C39EAB3AC22B43681B8609B4 /* SecurityUtils.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = SecurityUtils.h; sourceTree = "<group>"; };
 		51D9BE4556D2A4FF5459EC22DFAFC705 /* NSDictionary+MTLMappingAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+MTLMappingAdditions.h"; path = "Mantle/NSDictionary+MTLMappingAdditions.h"; sourceTree = "<group>"; };
-		526B756DDB3CA96A92B7EC85367B0A1B /* OWSMessageUtils.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSMessageUtils.h; sourceTree = "<group>"; };
+		52984339A6E4D693C28000B638BE0D62 /* OWSProvisioningCipher.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSProvisioningCipher.h; sourceTree = "<group>"; };
 		52A5BE37253F41C97886B9AC80A874A2 /* YapDatabaseManualView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseManualView.m; path = YapDatabase/Extensions/ManualView/YapDatabaseManualView.m; sourceTree = "<group>"; };
 		52B72DC1D8D38B84AD96AA07A432778B /* YapDatabaseActionManagerTransaction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseActionManagerTransaction.m; path = YapDatabase/Extensions/ActionManager/YapDatabaseActionManagerTransaction.m; sourceTree = "<group>"; };
+		52BC0A97AB00A64FAA0D8F589561EC9B /* OWSDeviceProvisioner.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDeviceProvisioner.h; sourceTree = "<group>"; };
 		52E95367947E3DF807B82F33C1DD82C5 /* after.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = after.swift; path = Sources/after.swift; sourceTree = "<group>"; };
 		5341973AFA9FF69DD59CD0440BB047E1 /* fe_isnonzero.c */ = {isa = PBXFileReference; includeInIndex = 1; name = fe_isnonzero.c; path = Sources/ed25519/fe_isnonzero.c; sourceTree = "<group>"; };
-		53537CC518F87545C5569BC6D967597A /* OWSSyncConfigurationMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSSyncConfigurationMessage.m; sourceTree = "<group>"; };
+		53ACBFDD2057FEE90EB48C548F3D241A /* TSYapDatabaseObject.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSYapDatabaseObject.h; sourceTree = "<group>"; };
 		53B20DD656C27FD676C895B65A156C45 /* MutableExtensionRegistry.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MutableExtensionRegistry.m; path = src/runtime/Classes/MutableExtensionRegistry.m; sourceTree = "<group>"; };
-		53D4E79C0C87D89EE12710431F26CA80 /* OWSProvisioningProtos.pb.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSProvisioningProtos.pb.m; sourceTree = "<group>"; };
 		541C621525EFD0C321DE78092D72F9FA /* Pods-SignalShareExtension-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SignalShareExtension-dummy.m"; sourceTree = "<group>"; };
-		5438334DD5215BAAEECE8AF15B34E4CC /* OWSOutgoingNullMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSOutgoingNullMessage.h; sourceTree = "<group>"; };
 		543C5455E6DC208CCAF5CA238D847F2F /* Pods-SignalShareExtension-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SignalShareExtension-acknowledgements.plist"; sourceTree = "<group>"; };
 		5495A5CE6AAA96F828C9F7AEC4476046 /* JSONIntegerConverting.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONIntegerConverting.swift; path = Sources/SwiftProtobuf/JSONIntegerConverting.swift; sourceTree = "<group>"; };
 		54F97D5EDE8FD0BC325B496AE0D5A30B /* YDBCKRecordTableInfo.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YDBCKRecordTableInfo.h; path = YapDatabase/Extensions/CloudKit/Internal/YDBCKRecordTableInfo.h; sourceTree = "<group>"; };
 		5510AF788FE9FAA4611ACB33168AF9CF /* YapDatabaseSecondaryIndexTransaction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseSecondaryIndexTransaction.h; path = YapDatabase/Extensions/SecondaryIndex/YapDatabaseSecondaryIndexTransaction.h; sourceTree = "<group>"; };
 		5529109E123F992E0206638D9B88A216 /* SRLog.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SRLog.h; path = SocketRocket/Internal/Utilities/SRLog.h; sourceTree = "<group>"; };
-		555451B2AB55080B3997746AA4D1749A /* OWSAddToContactsOfferMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSAddToContactsOfferMessage.m; sourceTree = "<group>"; };
-		5573F9308BEB1B394E4ED42441475DDA /* OWSPrimaryStorage+keyFromIntLong.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OWSPrimaryStorage+keyFromIntLong.m"; sourceTree = "<group>"; };
-		558A800007BDBB3F5A2B48C8469F7337 /* TSGroupModel.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSGroupModel.h; sourceTree = "<group>"; };
 		55B7AF2AE331AA62288220A388B9EE06 /* NBMetadataHelper.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NBMetadataHelper.h; path = libPhoneNumber/NBMetadataHelper.h; sourceTree = "<group>"; };
 		55DB6DF6438069F90AFB3BCBDFE380DF /* HKDFKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = HKDFKit.framework; path = HKDFKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		55EC669F573AFAA552EE349C11000ECC /* TSRequest.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSRequest.m; sourceTree = "<group>"; };
-		56086BB87093FE7D3B0D6DE9ECA898C6 /* OWSFileSystem.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSFileSystem.m; sourceTree = "<group>"; };
 		562EDA1D6445343E5DFE227EFD573059 /* AFSecurityPolicy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFSecurityPolicy.m; path = AFNetworking/AFSecurityPolicy.m; sourceTree = "<group>"; };
+		5636307CB3BD384DD6F7153CAE75583D /* OWSPrimaryStorage+Calling.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OWSPrimaryStorage+Calling.h"; sourceTree = "<group>"; };
 		56CA89147397B958FD55F564DA3BBF33 /* libPhoneNumber-iOS-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "libPhoneNumber-iOS-dummy.m"; sourceTree = "<group>"; };
-		56FD0E58C8D3D380E38FE87BF818E9AD /* TSInteraction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSInteraction.h; sourceTree = "<group>"; };
 		5728EBD0C4AAFAF6F1AFAE0F0E8BE379 /* SessionState.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SessionState.h; path = AxolotlKit/Classes/Sessions/SessionState.h; sourceTree = "<group>"; };
-		5747E92F0E0958A10A4E0B1301079A3E /* GIAG2.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = GIAG2.crt; path = SignalServiceKit/Resources/Certificates/GIAG2.crt; sourceTree = "<group>"; };
-		5778C30A7602E812BA5237405C742332 /* OWSPrimaryStorage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSPrimaryStorage.h; sourceTree = "<group>"; };
-		5782C8AD593C2A5FFFB1F0A0C6009F12 /* Provisioning.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Provisioning.pb.swift; sourceTree = "<group>"; };
+		578265E19CDCB21B90963B66A3FE2014 /* GIAG2.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = GIAG2.crt; path = SignalServiceKit/Resources/Certificates/GIAG2.crt; sourceTree = "<group>"; };
 		57DA9C913AB65F451FA36EDE7788DAC7 /* YapDatabaseCrossProcessNotificationTransaction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCrossProcessNotificationTransaction.h; path = YapDatabase/Extensions/CrossProcessNotification/YapDatabaseCrossProcessNotificationTransaction.h; sourceTree = "<group>"; };
 		57DBC16588310E958CDD7C4D8D345C73 /* when.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = when.swift; path = Sources/when.swift; sourceTree = "<group>"; };
-		5809310D98297861F6E8BE541F165338 /* SecurityUtils.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = SecurityUtils.h; sourceTree = "<group>"; };
 		580AEC4742A3860A1B12F93B9BA9CBB4 /* YapManyToManyCache.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapManyToManyCache.h; path = YapDatabase/Extensions/CloudCore/Utilities/YapManyToManyCache.h; sourceTree = "<group>"; };
 		5812028427528E5A1F8C46C84E36D832 /* YapDatabaseFilteredViewTypes.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseFilteredViewTypes.h; path = YapDatabase/Extensions/FilteredView/YapDatabaseFilteredViewTypes.h; sourceTree = "<group>"; };
-		582B779C6C34FE371EF9D8E8E01A4BBB /* OWSAddToContactsOfferMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSAddToContactsOfferMessage.h; sourceTree = "<group>"; };
+		584A8DAD5F48D106520353FC13391C40 /* NSNotificationCenter+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSNotificationCenter+OWS.h"; sourceTree = "<group>"; };
 		5856C3C25DBAAB2FCD6D134E8F73B1BE /* YapDatabaseConnectionPool.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseConnectionPool.m; path = YapDatabase/Extensions/ConnectionPool/YapDatabaseConnectionPool.m; sourceTree = "<group>"; };
-		5861C72E1A3086FC33DA6AE4D33A672D /* NSString+SSK.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSString+SSK.m"; sourceTree = "<group>"; };
 		58636F3B92F9340025DE3CE5880C2C90 /* UIProgressView+AFNetworking.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIProgressView+AFNetworking.m"; path = "UIKit+AFNetworking/UIProgressView+AFNetworking.m"; sourceTree = "<group>"; };
 		5865C6DEECD42C6A78666672DA2B1F36 /* libPhoneNumber_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = libPhoneNumber_iOS.framework; path = "libPhoneNumber-iOS.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
 		588B81157C418226AA621768359C88E8 /* SRLog.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SRLog.m; path = SocketRocket/Internal/Utilities/SRLog.m; sourceTree = "<group>"; };
@@ -2456,42 +2463,50 @@
 		58BA0DF2CE6725DEEDD5D8BFC357A4A9 /* YYSpriteSheetImage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YYSpriteSheetImage.h; path = YYImage/YYSpriteSheetImage.h; sourceTree = "<group>"; };
 		58CAA021F58340D37942BBEF4AE362D9 /* Process+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Process+Promise.swift"; path = "Extensions/Foundation/Sources/Process+Promise.swift"; sourceTree = "<group>"; };
 		58E416BF9082EF0E8E2B6844CDFE447B /* sha1.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = sha1.h; path = SSZipArchive/minizip/aes/sha1.h; sourceTree = "<group>"; };
-		590142FDA1A26D9743A642A36DF3DB83 /* TSStorageHeaders.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSStorageHeaders.h; sourceTree = "<group>"; };
 		594A4E4C3BBB0DFAA85086536AAC2F24 /* YapDatabaseSecondaryIndex.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseSecondaryIndex.h; path = YapDatabase/Extensions/SecondaryIndex/YapDatabaseSecondaryIndex.h; sourceTree = "<group>"; };
-		596BA942A04863C384A205870D94A458 /* OWSDeviceProvisioningCodeService.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDeviceProvisioningCodeService.m; sourceTree = "<group>"; };
 		597541EEB8B994DB4C68B5A4DC8CF33E /* Message+JSONArrayAdditions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Message+JSONArrayAdditions.swift"; path = "Sources/SwiftProtobuf/Message+JSONArrayAdditions.swift"; sourceTree = "<group>"; };
 		597DED59FFE308998A410D451F4F1B5C /* DDASLLogCapture.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDASLLogCapture.h; path = Classes/DDASLLogCapture.h; sourceTree = "<group>"; };
+		59A8C2B91F7A27A7351A00B64F929426 /* OWSContact+Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OWSContact+Private.h"; sourceTree = "<group>"; };
 		59BDFF8B4726D6EDE4EB30E8317FF444 /* YapDatabaseCloudKitPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCloudKitPrivate.h; path = YapDatabase/Extensions/CloudKit/Internal/YapDatabaseCloudKitPrivate.h; sourceTree = "<group>"; };
+		59BE0B79DD2BDF47E562F4400ECEA78E /* TSAttachment.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSAttachment.h; sourceTree = "<group>"; };
 		5A0EEAD31CCF786F54B69920126095F9 /* api.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = api.pb.swift; path = Sources/SwiftProtobuf/api.pb.swift; sourceTree = "<group>"; };
 		5A39B0F9DEDC9CF418B284561E2240AB /* YapBidirectionalCache.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapBidirectionalCache.h; path = YapDatabase/Utilities/YapBidirectionalCache.h; sourceTree = "<group>"; };
 		5A472BF59F3FC645999EF270CDEC6790 /* ProtocolBuffers-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "ProtocolBuffers-prefix.pch"; sourceTree = "<group>"; };
 		5A65350442CCFC81A43E88442B495ACB /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		5AA63CEE97DA5A2386A9674852F28F14 /* YapRowidSet.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapRowidSet.h; path = YapDatabase/Internal/YapRowidSet.h; sourceTree = "<group>"; };
+		5AC2895E920313C18311659E3A45B1A1 /* Fingerprint.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Fingerprint.pb.swift; sourceTree = "<group>"; };
 		5ADD2534904C9852FDB55E05541B362F /* YapDatabaseRTreeIndexTransaction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseRTreeIndexTransaction.m; path = YapDatabase/Extensions/RTreeIndex/YapDatabaseRTreeIndexTransaction.m; sourceTree = "<group>"; };
-		5AEF39334EBE6F2564F416834C985882 /* TSNetworkManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSNetworkManager.h; sourceTree = "<group>"; };
 		5AF7FE4D4D84F1E85ACD9CAE57568931 /* Google_Protobuf_Any+Registry.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Google_Protobuf_Any+Registry.swift"; path = "Sources/SwiftProtobuf/Google_Protobuf_Any+Registry.swift"; sourceTree = "<group>"; };
+		5B09227097DDAECE2A8B1AA2E0ACBE29 /* OWSEndSessionMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSEndSessionMessage.m; sourceTree = "<group>"; };
 		5B51CFD6385EE914D014CB013A1CDD28 /* YapDirtyDictionary.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDirtyDictionary.h; path = YapDatabase/Utilities/YapDirtyDictionary.h; sourceTree = "<group>"; };
 		5B95BA1886F4679F054DF2977465CA8C /* RingBuffer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RingBuffer.h; path = src/runtime/Classes/RingBuffer.h; sourceTree = "<group>"; };
+		5BC374CC89C11921D965544CC3EBD925 /* OWSFingerprint.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSFingerprint.m; sourceTree = "<group>"; };
+		5BC84436AE84D186EAE7AC43D61F12BF /* Constraints.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Constraints.h; sourceTree = "<group>"; };
+		5BE61ACAA0FF24C273C6E099BF1583F0 /* SFSRootCAG2.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = SFSRootCAG2.crt; path = SignalServiceKit/Resources/Certificates/SFSRootCAG2.crt; sourceTree = "<group>"; };
 		5BF53C44F07FC9A9EF1001B915F243BF /* SSZipArchive-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SSZipArchive-prefix.pch"; sourceTree = "<group>"; };
 		5BF94CA7310F33FB62057F1D8C29581E /* SAMKeychain-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SAMKeychain-umbrella.h"; sourceTree = "<group>"; };
-		5C1D179CAEAA44BD8ED56FFEE2BA1DA7 /* TSDatabaseView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSDatabaseView.m; sourceTree = "<group>"; };
+		5C1B520DF4E722D5A3231CAF734C1B53 /* ProtoUtils.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = ProtoUtils.h; sourceTree = "<group>"; };
+		5C1FDB629802B17D436910F53EACEDAC /* OWSDynamicOutgoingMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDynamicOutgoingMessage.h; sourceTree = "<group>"; };
 		5C4105CCB63C74FAE1F2B0495C96B004 /* YapDatabaseFullTextSearchTransaction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseFullTextSearchTransaction.h; path = YapDatabase/Extensions/FullTextSearch/YapDatabaseFullTextSearchTransaction.h; sourceTree = "<group>"; };
-		5C48A257E1CA1568D911376470DD9F1E /* TSCall.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSCall.h; sourceTree = "<group>"; };
 		5C580A7C4E396B5EC854BD239D4D8FDF /* brg_endian.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = brg_endian.h; path = SSZipArchive/minizip/aes/brg_endian.h; sourceTree = "<group>"; };
 		5C9EEBE366A61188F34E05DFE069ED7A /* NSArray+PureLayout.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSArray+PureLayout.m"; path = "PureLayout/PureLayout/NSArray+PureLayout.m"; sourceTree = "<group>"; };
 		5CB0BF2AFB02B17CA135D79031CF7841 /* Pods-SignalMessaging.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SignalMessaging.release.xcconfig"; sourceTree = "<group>"; };
 		5D0B2A9EF93FBE543B544BB440AC810C /* SQLCipher.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = SQLCipher.modulemap; sourceTree = "<group>"; };
+		5D2F271352A41D918B5E48011C203A1F /* DataSource.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = DataSource.h; sourceTree = "<group>"; };
+		5D44F05E1707CC0EC9576D19A44F326D /* OWSAddToProfileWhitelistOfferMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSAddToProfileWhitelistOfferMessage.h; sourceTree = "<group>"; };
+		5D46F08A069A867125B21A80CF9FB6EF /* FunctionalUtil.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = FunctionalUtil.h; sourceTree = "<group>"; };
 		5D94B9FBF6A91DF9D4461314A821B7C9 /* PureLayout+Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "PureLayout+Internal.h"; path = "PureLayout/PureLayout/PureLayout+Internal.h"; sourceTree = "<group>"; };
-		5D9846201C785B61728B211C05628CEF /* FullTextSearchFinder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FullTextSearchFinder.swift; sourceTree = "<group>"; };
-		5DC5D34B67FE1683471267C45631E8D2 /* OWSDisappearingMessagesJob.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDisappearingMessagesJob.h; sourceTree = "<group>"; };
+		5DEFCEFB4647B8A978C734AD37F16E04 /* OWSFileSystem.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSFileSystem.h; sourceTree = "<group>"; };
 		5E689808E04C3BEED672C04E8A328826 /* YDBCKChangeRecord.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YDBCKChangeRecord.h; path = YapDatabase/Extensions/CloudKit/Internal/YDBCKChangeRecord.h; sourceTree = "<group>"; };
 		5E8EED89BF7B250193504011A02ED497 /* NSDictionary+MTLJSONKeyPath.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+MTLJSONKeyPath.h"; path = "Mantle/NSDictionary+MTLJSONKeyPath.h"; sourceTree = "<group>"; };
-		5E9206D889A80072F30B09C0BD4486AF /* OWSDeviceProvisioningCodeService.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDeviceProvisioningCodeService.h; sourceTree = "<group>"; };
 		5EA9C3141CCDFFA9DDF127A972425E97 /* YapManyToManyCache.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapManyToManyCache.m; path = YapDatabase/Extensions/CloudCore/Utilities/YapManyToManyCache.m; sourceTree = "<group>"; };
 		5EBACA78741E11B54F1E4ED758109055 /* HKDFKit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "HKDFKit-umbrella.h"; sourceTree = "<group>"; };
 		5EC14F9034C66D489EC3A6B581078F25 /* MessageKeys.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MessageKeys.h; path = AxolotlKit/Classes/Ratchet/MessageKeys.h; sourceTree = "<group>"; };
 		5ED0834F82F2FC88D48CBDA99F6CA257 /* YapDatabaseFilteredViewConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseFilteredViewConnection.m; path = YapDatabase/Extensions/FilteredView/YapDatabaseFilteredViewConnection.m; sourceTree = "<group>"; };
-		5F3BBAB32BF70C93B1520883E3FA90D6 /* OWSDevicesService.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDevicesService.m; sourceTree = "<group>"; };
+		5EE8EADAFE2AC26C8AABC875EBCC5FC7 /* OWSBackupFragment.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSBackupFragment.h; sourceTree = "<group>"; };
+		5EF96254992E503E99BBC7960DAD69F4 /* OWSSyncConfigurationMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSSyncConfigurationMessage.h; sourceTree = "<group>"; };
+		5F0036C3E76DAC19CBDD93B2DF72BE37 /* TSDatabaseSecondaryIndexes.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSDatabaseSecondaryIndexes.m; sourceTree = "<group>"; };
+		5F66366D88E53DBCC785272FE883F9DB /* TSErrorMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSErrorMessage.h; sourceTree = "<group>"; };
 		5F77B7C0EC802827BB4C31D15D0C9388 /* YapDatabaseConnectionConfig.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseConnectionConfig.m; path = YapDatabase/Utilities/YapDatabaseConnectionConfig.m; sourceTree = "<group>"; };
 		5FC5D4E3353044B094142BD488F94B03 /* YapDatabaseManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseManager.h; path = YapDatabase/Internal/YapDatabaseManager.h; sourceTree = "<group>"; };
 		5FD55AD4BD2EE4D6219E7EE42578C816 /* YapDatabaseViewRangeOptionsPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseViewRangeOptionsPrivate.h; path = YapDatabase/Extensions/View/Internal/YapDatabaseViewRangeOptionsPrivate.h; sourceTree = "<group>"; };
@@ -2502,65 +2517,59 @@
 		60D66445A4F9A809F679ACE4144CA493 /* compare.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = compare.h; path = Sources/ed25519/additions/compare.h; sourceTree = "<group>"; };
 		612B77893ABA03229323F41D2FC16BEC /* fe_sub.c */ = {isa = PBXFileReference; includeInIndex = 1; name = fe_sub.c; path = Sources/ed25519/fe_sub.c; sourceTree = "<group>"; };
 		619EB934182D0650C6DDD33EC697DBAE /* SRConstants.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SRConstants.m; path = SocketRocket/Internal/SRConstants.m; sourceTree = "<group>"; };
-		61B2A5170ED563DFF028C123435FD716 /* Fingerprint.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Fingerprint.pb.swift; sourceTree = "<group>"; };
 		61D8112DD18D271EAB791F15BECED56D /* ConcreteExtensionField.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = ConcreteExtensionField.m; path = src/runtime/Classes/ConcreteExtensionField.m; sourceTree = "<group>"; };
 		61DE4273BA68EC21F2DE84A27ED76538 /* JSONDecodingOptions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONDecodingOptions.swift; path = Sources/SwiftProtobuf/JSONDecodingOptions.swift; sourceTree = "<group>"; };
+		625F22A62AD1F4294CCBD4788D1E590E /* OWSCallAnswerMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSCallAnswerMessage.h; sourceTree = "<group>"; };
 		62F336C2E56ED84C89E75B90705CA8F5 /* ATAppUpdater-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "ATAppUpdater-prefix.pch"; sourceTree = "<group>"; };
-		62FF1FA43FCA2616C0E4938C25A19668 /* OWSProvisioningMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSProvisioningMessage.h; sourceTree = "<group>"; };
-		63219847586296EA9FF7EED0294D3895 /* NSError+MessageSending.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSError+MessageSending.h"; sourceTree = "<group>"; };
 		6338A3594430856F61F49A0B090516E7 /* ge_p3_tobytes.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ge_p3_tobytes.c; path = Sources/ed25519/ge_p3_tobytes.c; sourceTree = "<group>"; };
 		633E0DE1D4C5A48D2D7FDE79A93D9E36 /* AFURLResponseSerialization.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFURLResponseSerialization.h; path = AFNetworking/AFURLResponseSerialization.h; sourceTree = "<group>"; };
-		6347F3776BC9CDBCBFFE5613A3155CB5 /* OWSAnalyticsEvents.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSAnalyticsEvents.m; sourceTree = "<group>"; };
 		6348DD48DA9F3A2FE5B99BBC806DD1E8 /* AFNetworking-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "AFNetworking-dummy.m"; sourceTree = "<group>"; };
 		637E2FB1F01F40F74BD2FB1A01DE4431 /* ReceivingChain.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = ReceivingChain.m; path = AxolotlKit/Classes/Ratchet/ReceivingChain.m; sourceTree = "<group>"; };
 		63A2D02BD71F242A99CA9D0CD6F881E5 /* YapDatabaseConnectionProxy.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseConnectionProxy.h; path = YapDatabase/Extensions/ConnectionProxy/YapDatabaseConnectionProxy.h; sourceTree = "<group>"; };
 		63A645FF0BCBAE44F57484D315961918 /* type.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = type.pb.swift; path = Sources/SwiftProtobuf/type.pb.swift; sourceTree = "<group>"; };
 		63B04ECB80774DAB0498D9C57905BE13 /* Curve25519Kit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Curve25519Kit.framework; path = Curve25519Kit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		63B535F77C30C66D9E2B771E60307D36 /* UIProgressView+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIProgressView+AFNetworking.h"; path = "UIKit+AFNetworking/UIProgressView+AFNetworking.h"; sourceTree = "<group>"; };
-		63BE10587C16F8C2D95BF62FC2D3FAB4 /* TSAccountManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSAccountManager.m; sourceTree = "<group>"; };
-		63ECED1929426DE001DE0F179FCE4207 /* NSData+messagePadding.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSData+messagePadding.h"; sourceTree = "<group>"; };
-		6498259A8345D105C40A8D8B45830702 /* OWSProvisioningCipher.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSProvisioningCipher.m; sourceTree = "<group>"; };
-		64A86B40372887E6A178EB245CCCA3CF /* PhoneNumberUtil.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = PhoneNumberUtil.m; sourceTree = "<group>"; };
+		64E48DD9B041524A85C8676AF2579397 /* OWSDeviceProvisioningCodeService.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDeviceProvisioningCodeService.m; sourceTree = "<group>"; };
 		65043F53D716BDCBDD453C7C073D7887 /* YYImage-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "YYImage-dummy.m"; sourceTree = "<group>"; };
-		656399B286CBFE0BA7872590D3AA2120 /* TSInvalidIdentityKeySendingErrorMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSInvalidIdentityKeySendingErrorMessage.m; sourceTree = "<group>"; };
 		65BEF83AECD5D369E29954B62092C671 /* YapDatabaseLogging.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseLogging.m; path = YapDatabase/Internal/YapDatabaseLogging.m; sourceTree = "<group>"; };
 		65C6AF92CA3D5BAAB266E75737905E7F /* CodedOutputStream.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CodedOutputStream.h; path = src/runtime/Classes/CodedOutputStream.h; sourceTree = "<group>"; };
-		65CBFC6E442A781940EA11E91DD64945 /* TSInteraction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSInteraction.m; sourceTree = "<group>"; };
+		6614862981908D10969B74135DD1D40D /* NSData+messagePadding.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSData+messagePadding.m"; sourceTree = "<group>"; };
 		661D2EA7F1B68CD27D31C0958CA16AC6 /* CocoaLumberjack-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "CocoaLumberjack-dummy.m"; sourceTree = "<group>"; };
-		664812D70D6CA8EB7B221D694E153628 /* OWSCallBusyMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSCallBusyMessage.h; sourceTree = "<group>"; };
+		667BE2FFA46DDB79406BA7EA91CCBF14 /* OWSVerificationStateChangeMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSVerificationStateChangeMessage.h; sourceTree = "<group>"; };
+		668A8F1450DB61F6EA8B1218B4026518 /* OWSWebsocketSecurityPolicy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSWebsocketSecurityPolicy.m; sourceTree = "<group>"; };
+		668B495FE40701A1A357AE4442642BE4 /* OWSUnknownContactBlockOfferMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSUnknownContactBlockOfferMessage.m; sourceTree = "<group>"; };
+		66C94825C32FAFA2D19CB436143834D3 /* WeakTimer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = WeakTimer.swift; sourceTree = "<group>"; };
 		67078F0E33DCBA8C74EF28F944E5ED89 /* SAMKeychain.bundle */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "wrapper.plug-in"; name = SAMKeychain.bundle; path = Support/SAMKeychain.bundle; sourceTree = "<group>"; };
-		671636927A748208D988BC51C8EAAF19 /* OWSMessageHandler.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSMessageHandler.h; sourceTree = "<group>"; };
 		672202F9F58A8AACA98222C250AE9AF2 /* DDAssertMacros.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDAssertMacros.h; path = Classes/DDAssertMacros.h; sourceTree = "<group>"; };
 		672CEE510CD88CAA449178C85FF33DD1 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/MobileCoreServices.framework; sourceTree = DEVELOPER_DIR; };
-		67D3A2928796AC9C4BF3DC24173CF23E /* OWSPrimaryStorage+SignedPreKeyStore.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OWSPrimaryStorage+SignedPreKeyStore.m"; sourceTree = "<group>"; };
+		6740843C68EF6A758AD3BB898B43B642 /* OWSSignaliOSProtos.pb.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSSignaliOSProtos.pb.m; sourceTree = "<group>"; };
 		67FCBCEDE96DACC619128891CF3A417D /* SRDelegateController.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SRDelegateController.m; path = SocketRocket/Internal/Delegate/SRDelegateController.m; sourceTree = "<group>"; };
 		6841E312CA11E496DC636BB61650731C /* YapDatabaseAtomic.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseAtomic.h; path = YapDatabase/Internal/YapDatabaseAtomic.h; sourceTree = "<group>"; };
 		684597896F2D6D4B3ED9E154EE302385 /* YapDatabaseViewChange.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseViewChange.m; path = YapDatabase/Extensions/View/Utilities/YapDatabaseViewChange.m; sourceTree = "<group>"; };
-		6850373BFA4D42B88CD1977838174B12 /* ContactsManagerProtocol.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = ContactsManagerProtocol.h; sourceTree = "<group>"; };
+		68685C031AB882FE093199F555BDC393 /* NSData+Image.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSData+Image.m"; sourceTree = "<group>"; };
 		68CD4742AB9821036736B1A672552D18 /* ObjectivecDescriptor.pb.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ObjectivecDescriptor.pb.h; path = src/runtime/Classes/ObjectivecDescriptor.pb.h; sourceTree = "<group>"; };
 		68FBD263D4390E29DA6FE68E2439647E /* aeskey.c */ = {isa = PBXFileReference; includeInIndex = 1; name = aeskey.c; path = SSZipArchive/minizip/aes/aeskey.c; sourceTree = "<group>"; };
+		692956630524AF3CEBC88509A73E1496 /* SignalServiceKit.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SignalServiceKit.h; path = SignalServiceKit/src/SignalServiceKit.h; sourceTree = "<group>"; };
 		6952475F267C704BDA1C6119ABB13896 /* YapDatabaseViewState.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseViewState.m; path = YapDatabase/Extensions/View/Internal/YapDatabaseViewState.m; sourceTree = "<group>"; };
 		695D664FB3FD1FBFCFF6233C9883149B /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		69AA404A4E3440AB1C85B079BAB045CE /* OWSProvisioningProtos.pb.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSProvisioningProtos.pb.h; sourceTree = "<group>"; };
-		6A2B3D0C31B6C60E3B9B84830A638268 /* Threading.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = Threading.m; sourceTree = "<group>"; };
-		6A49CA58C91BE2291C745C9267111880 /* OWSLinkedDeviceReadReceipt.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSLinkedDeviceReadReceipt.m; sourceTree = "<group>"; };
+		69C2E2B87783B3041AE236F21A028814 /* OWSOperation.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSOperation.m; sourceTree = "<group>"; };
 		6A4CBE1B5C8DC70C97E4CAD99A87A3F4 /* YYImageCoder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YYImageCoder.m; path = YYImage/YYImageCoder.m; sourceTree = "<group>"; };
 		6A57F8C4E58F2568004AFEC159DFE602 /* dispatch_promise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = dispatch_promise.m; path = Sources/dispatch_promise.m; sourceTree = "<group>"; };
 		6A5D511944B1F8F9F48D98B01098D701 /* HKDFKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = HKDFKit.modulemap; sourceTree = "<group>"; };
 		6B0B14CECA13794DD2DCAB99188246A3 /* ge_p1p1_to_p2.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ge_p1p1_to_p2.c; path = Sources/ed25519/ge_p1p1_to_p2.c; sourceTree = "<group>"; };
+		6B302ED12C45E43DA9DBD0ADB5410A18 /* OWSOutgoingCallMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSOutgoingCallMessage.h; sourceTree = "<group>"; };
 		6B4E8DAB62EBE2CA52AE8D97F02890F6 /* SRHTTPConnectMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SRHTTPConnectMessage.m; path = SocketRocket/Internal/Utilities/SRHTTPConnectMessage.m; sourceTree = "<group>"; };
+		6B73ED546D055DC71A46F6A3D55BF70F /* ContactDiscoveryService.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = ContactDiscoveryService.m; sourceTree = "<group>"; };
 		6B814007A77B0A4265DDADA7FC37C9CC /* ge_double_scalarmult.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ge_double_scalarmult.c; path = Sources/ed25519/ge_double_scalarmult.c; sourceTree = "<group>"; };
-		6B89DD3853AE975BDE86D0DEA6C0EED0 /* OWSMessageServiceParams.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSMessageServiceParams.h; sourceTree = "<group>"; };
-		6B96A139B687FCCC4F3C3A1800CAAAA2 /* OWSIncompleteCallsJob.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSIncompleteCallsJob.m; sourceTree = "<group>"; };
 		6B9C54AE58987FDD19F230EC7EA6C243 /* crypto_uint32.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = crypto_uint32.h; path = Sources/ed25519/nacl_includes/crypto_uint32.h; sourceTree = "<group>"; };
 		6BBD31703D33EFF329523B31FE02801F /* join.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = join.m; path = Sources/join.m; sourceTree = "<group>"; };
 		6BCEBF6C87AD27A9910E9F22C5BBA8EC /* AFURLRequestSerialization.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFURLRequestSerialization.m; path = AFNetworking/AFURLRequestSerialization.m; sourceTree = "<group>"; };
 		6C2EF9C063144CB45DB4AB2AD2C37EEF /* GeneratedMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GeneratedMessage.h; path = src/runtime/Classes/GeneratedMessage.h; sourceTree = "<group>"; };
-		6C3297C3BDB694E5170CB86022B19C91 /* OWSVerificationStateChangeMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSVerificationStateChangeMessage.m; sourceTree = "<group>"; };
 		6C52A618357790355BFEFC36565AF073 /* YapTouch.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapTouch.m; path = YapDatabase/Internal/YapTouch.m; sourceTree = "<group>"; };
 		6CD4B466A4250F194288728EA9C59F3C /* fwd.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = fwd.h; path = Sources/fwd.h; sourceTree = "<group>"; };
-		6D2E29FE87F8717373345CE805D9E478 /* OWSPrimaryStorage+PreKeyStore.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OWSPrimaryStorage+PreKeyStore.m"; sourceTree = "<group>"; };
 		6D63B40A8DB04314DCD0862F15D8765E /* SSZipArchive.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SSZipArchive.h; path = SSZipArchive/SSZipArchive.h; sourceTree = "<group>"; };
+		6D7D3EBA67783088039E08A98B5ACF32 /* ParamParser.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ParamParser.swift; sourceTree = "<group>"; };
+		6D7EA1AFCC0D848328F57D5E37E83863 /* OWSAddToProfileWhitelistOfferMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSAddToProfileWhitelistOfferMessage.m; sourceTree = "<group>"; };
 		6DA34D389C0CAAC2344954112B60CFE9 /* AFHTTPSessionManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFHTTPSessionManager.m; path = AFNetworking/AFHTTPSessionManager.m; sourceTree = "<group>"; };
 		6E2B14AF3FAC9E5E7123949754C2858C /* SQLCipher.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLCipher.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		6E76DF330A28C0954032A750AB0FDF5F /* EXTKeyPathCoding.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = EXTKeyPathCoding.h; path = Mantle/extobjc/EXTKeyPathCoding.h; sourceTree = "<group>"; };
@@ -2568,14 +2577,8 @@
 		6EB4BB10ECBD477045173C0D78E95B5B /* UIView+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIView+AnyPromise.h"; path = "Extensions/UIKit/Sources/UIView+AnyPromise.h"; sourceTree = "<group>"; };
 		6EC723351F7AAA34F1CC4C23B8580BFA /* ge_add.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ge_add.h; path = Sources/ed25519/ge_add.h; sourceTree = "<group>"; };
 		6EFBF6B8751D834CB23D03DC6D0A67E1 /* YapDatabaseSecondaryIndex.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseSecondaryIndex.m; path = YapDatabase/Extensions/SecondaryIndex/YapDatabaseSecondaryIndex.m; sourceTree = "<group>"; };
-		6EFC0C12074D6D5CB634343717E1416C /* OWSStorage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSStorage.m; sourceTree = "<group>"; };
-		6F802507C7327CB2AD041164C4ED1181 /* OWS2FAManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWS2FAManager.h; sourceTree = "<group>"; };
-		6FAC6A25E6B4FBCEF95B56E03D65B3EF /* TSQuotedMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSQuotedMessage.h; sourceTree = "<group>"; };
-		7051BA719B3C071098AFD4F2AF41A4DC /* OWSLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSLogger.m; sourceTree = "<group>"; };
-		705809ADC5CBDF8B4A575D5D0EEDDF9E /* OWSMessageReceiver.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSMessageReceiver.m; sourceTree = "<group>"; };
-		707712E875C75BE61CF9ACF5AFED28D6 /* AppReadiness.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = AppReadiness.h; sourceTree = "<group>"; };
+		707B7FDFD627103E558D86393C73C78C /* OWSMessageDecrypter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSMessageDecrypter.m; sourceTree = "<group>"; };
 		7094B917D29C1AA65DA9882B772FE590 /* AFURLRequestSerialization.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFURLRequestSerialization.h; path = AFNetworking/AFURLRequestSerialization.h; sourceTree = "<group>"; };
-		70B23604CBB92E768E9DF3074DBBBBD4 /* OWSIncomingSentMessageTranscript.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSIncomingSentMessageTranscript.h; sourceTree = "<group>"; };
 		70C276D1E6B8137D08A0E72B16E213A5 /* YapDatabaseViewChange.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseViewChange.h; path = YapDatabase/Extensions/View/Utilities/YapDatabaseViewChange.h; sourceTree = "<group>"; };
 		7100C48D1727A4AC3EF85D529D006637 /* AFURLSessionManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFURLSessionManager.m; path = AFNetworking/AFURLSessionManager.m; sourceTree = "<group>"; };
 		712A63DF629EB8DD7DE2C4BD8807C9B4 /* UIImageView+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImageView+AFNetworking.h"; path = "UIKit+AFNetworking/UIImageView+AFNetworking.h"; sourceTree = "<group>"; };
@@ -2583,18 +2586,13 @@
 		714DA607045059A381980AD04B80CE24 /* YapDatabaseQuery.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseQuery.h; path = YapDatabase/Utilities/YapDatabaseQuery.h; sourceTree = "<group>"; };
 		71709A9C3B32EAEF0005F62885B15398 /* ForwardDeclarations.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ForwardDeclarations.h; path = src/runtime/Classes/ForwardDeclarations.h; sourceTree = "<group>"; };
 		719814488F704E22D12E470F1F41BF3C /* YapDatabaseExtensionConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseExtensionConnection.h; path = YapDatabase/Extensions/Protocol/YapDatabaseExtensionConnection.h; sourceTree = "<group>"; };
-		71AEB98EB20C0E652A2D3FB55DE3CED8 /* OWSRecordTranscriptJob.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSRecordTranscriptJob.h; sourceTree = "<group>"; };
-		71CA26BA65F1AD248A00BB73E72FD28D /* OWSCallMessageHandler.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSCallMessageHandler.h; sourceTree = "<group>"; };
 		71E80C4FC8E5C05C6020CE0264F16C41 /* ExtensionRegistry.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = ExtensionRegistry.m; path = src/runtime/Classes/ExtensionRegistry.m; sourceTree = "<group>"; };
 		721B638F9FA9DDA4BCE5E52F65D81EDD /* PromiseKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PromiseKit-dummy.m"; sourceTree = "<group>"; };
-		72A53CD530014009065DF21E9ED6B13A /* OWSEndSessionMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSEndSessionMessage.h; sourceTree = "<group>"; };
-		735A97CE7A9FD9E316C3F3165D7324B1 /* OWSDisappearingConfigurationUpdateInfoMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDisappearingConfigurationUpdateInfoMessage.m; sourceTree = "<group>"; };
-		73857E17FE2EEE9E85B1D6E51334F25A /* PreKeyBundle+jsonDict.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PreKeyBundle+jsonDict.h"; sourceTree = "<group>"; };
+		7355830E51ECC78EAE38388E1E9F3C11 /* OWSBackgroundTask.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSBackgroundTask.m; sourceTree = "<group>"; };
+		735FDD9EDC8E24E26A2D7EC10E9A386F /* TSInvalidIdentityKeyErrorMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSInvalidIdentityKeyErrorMessage.m; sourceTree = "<group>"; };
 		73A2CFFE29F01F1970B668D86A087899 /* YapDatabaseStatement.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseStatement.m; path = YapDatabase/Internal/YapDatabaseStatement.m; sourceTree = "<group>"; };
 		73CA0FA3617F0A21060018B28D94F257 /* YapDatabaseCryptoUtils.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCryptoUtils.h; path = YapDatabase/Utilities/YapDatabaseCryptoUtils.h; sourceTree = "<group>"; };
-		73DC0262C563D66828DF7EF33BAA922E /* NSURLSessionDataTask+StatusCode.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSURLSessionDataTask+StatusCode.h"; sourceTree = "<group>"; };
 		73DCB182D945DCFEB32A7F918C569802 /* PromiseKit.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PromiseKit.h; path = Sources/PromiseKit.h; sourceTree = "<group>"; };
-		73F665EF8D7A04269662295F3E8CB665 /* OWSFingerprint.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSFingerprint.m; sourceTree = "<group>"; };
 		73F9FD34E5B95AB4328C275E6A61D1BF /* MutableField.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MutableField.h; path = src/runtime/Classes/MutableField.h; sourceTree = "<group>"; };
 		7424D669E274EB577200D76E3FB6B20A /* AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFNetworking.h; path = AFNetworking/AFNetworking.h; sourceTree = "<group>"; };
 		745926C6E54FFF05299D4EB47CD7254C /* YapDatabaseAutoViewPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseAutoViewPrivate.h; path = YapDatabase/Extensions/AutoView/Internal/YapDatabaseAutoViewPrivate.h; sourceTree = "<group>"; };
@@ -2604,20 +2602,23 @@
 		74D88C47A1AFBD9BB2B561EC393FADB5 /* SRRunLoopThread.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SRRunLoopThread.m; path = SocketRocket/Internal/RunLoop/SRRunLoopThread.m; sourceTree = "<group>"; };
 		74E2A6DD9A85D99CA0FABC0C11FB1C4D /* UIViewController+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIViewController+AnyPromise.h"; path = "Extensions/UIKit/Sources/UIViewController+AnyPromise.h"; sourceTree = "<group>"; };
 		755E7CB9088D3418CDC05297B19E977F /* YapDatabaseCryptoUtils.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseCryptoUtils.m; path = YapDatabase/Utilities/YapDatabaseCryptoUtils.m; sourceTree = "<group>"; };
+		755F4D66318447D2529B9977B94AFA13 /* OWSIncompleteCallsJob.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSIncompleteCallsJob.h; sourceTree = "<group>"; };
+		75615607A30B7B3FD6494C042AB4A514 /* OWSDisappearingConfigurationUpdateInfoMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDisappearingConfigurationUpdateInfoMessage.m; sourceTree = "<group>"; };
 		7571353C5B751FA6A54B799EC3A40621 /* AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AnyPromise.m; path = Sources/AnyPromise.m; sourceTree = "<group>"; };
 		7596A6FC23CE052191FD40EE94EA2C85 /* MTLModel+NSCoding.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "MTLModel+NSCoding.m"; path = "Mantle/MTLModel+NSCoding.m"; sourceTree = "<group>"; };
 		75CCC2C0879DF2A946A73357EEE710C7 /* SRRandom.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SRRandom.h; path = SocketRocket/Internal/Utilities/SRRandom.h; sourceTree = "<group>"; };
-		761670D100BC70DA0A556FA4ED0C8DAB /* TSSocketManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSSocketManager.m; sourceTree = "<group>"; };
 		768FDF9AE8AA4307CB2D74982F8486B9 /* YapDatabaseRTreeIndexTransaction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseRTreeIndexTransaction.h; path = YapDatabase/Extensions/RTreeIndex/YapDatabaseRTreeIndexTransaction.h; sourceTree = "<group>"; };
-		77A6474B2713E1851F707240DD972CC4 /* OWSAsserts.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSAsserts.h; sourceTree = "<group>"; };
-		77E7BC5893B697095E9E6F30B35B057C /* OWSAnalyticsEvents.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSAnalyticsEvents.h; sourceTree = "<group>"; };
-		78445B986114E16E196E63B08A0BFEF7 /* NSTimer+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSTimer+OWS.h"; sourceTree = "<group>"; };
-		785701B05281DC2C7CCAF1D39BD2275B /* OWSVerificationStateSyncMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSVerificationStateSyncMessage.h; sourceTree = "<group>"; };
+		76C2BDDBAD98DF988B4A0D15803DDB81 /* TSInfoMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSInfoMessage.h; sourceTree = "<group>"; };
+		774C8CAFBAFBAD82D94101A57B5777C6 /* OWSLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSLogger.h; sourceTree = "<group>"; };
+		781B270B44609A9A881A527DE6DC46A0 /* OWSMessageDecrypter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSMessageDecrypter.h; sourceTree = "<group>"; };
 		788428129CF63CB8793BDF886C52D9E5 /* YapDatabaseView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseView.m; path = YapDatabase/Extensions/View/YapDatabaseView.m; sourceTree = "<group>"; };
 		78CAB4A866A171DB034C43663BBCDDFD /* YapDatabaseRelationshipNode.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseRelationshipNode.h; path = YapDatabase/Extensions/Relationships/YapDatabaseRelationshipNode.h; sourceTree = "<group>"; };
-		78EF4F2362E4AAB604616FC4DB2ABFBF /* OWSFailedMessagesJob.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSFailedMessagesJob.h; sourceTree = "<group>"; };
-		7910FDC5329DE47AD5C2115EE6A6EF25 /* TSAttachment.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSAttachment.m; sourceTree = "<group>"; };
+		79070E01325F5103A367E1BFA31F45EE /* YapDatabaseTransaction+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "YapDatabaseTransaction+OWS.h"; sourceTree = "<group>"; };
+		794136C6F2F8DD4DBA9F087AA98C64C3 /* TSPreKeyManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSPreKeyManager.m; sourceTree = "<group>"; };
 		7957C2614EA7B8E83317263EF4D139B3 /* ge_frombytes.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ge_frombytes.c; path = Sources/ed25519/ge_frombytes.c; sourceTree = "<group>"; };
+		7968CD81F6A34A2DC0191AACE786180C /* OWSAttachmentsProcessor.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSAttachmentsProcessor.h; sourceTree = "<group>"; };
+		7A1FCCF9AC11B5E83A3D5900BCB7C928 /* OWSAnalytics.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSAnalytics.m; sourceTree = "<group>"; };
+		7A32C0BE5E1782FE67C2496B688571C3 /* PhoneNumber.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = PhoneNumber.m; sourceTree = "<group>"; };
 		7A387A8A92BCBB201B39BA066F8AECC3 /* SRIOConsumer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SRIOConsumer.h; path = SocketRocket/Internal/IOConsumer/SRIOConsumer.h; sourceTree = "<group>"; };
 		7A5DBAA5DB83691C7E78FCE27CA6485A /* PureLayoutDefines.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PureLayoutDefines.h; path = PureLayout/PureLayout/PureLayoutDefines.h; sourceTree = "<group>"; };
 		7A9C0D7494B90FCE5D9FD40C705792CB /* WireFormat.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = WireFormat.h; path = src/runtime/Classes/WireFormat.h; sourceTree = "<group>"; };
@@ -2627,29 +2628,32 @@
 		7B0EE5F5C56FB1230563FC0349A96C4D /* GlobalState.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GlobalState.m; path = Sources/GlobalState.m; sourceTree = "<group>"; };
 		7B1264C27E99A494C963FC954C9BF966 /* ProtocolBuffers.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = ProtocolBuffers.xcconfig; sourceTree = "<group>"; };
 		7B3A872D3CCE4DF92AB79F6ADF3322E6 /* TSDerivedSecrets.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TSDerivedSecrets.h; path = AxolotlKit/Classes/Ratchet/TSDerivedSecrets.h; sourceTree = "<group>"; };
-		7B42151CB1C32FAD2027C773B0AF2EAA /* OWSReadReceiptsForSenderMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSReadReceiptsForSenderMessage.m; sourceTree = "<group>"; };
 		7B7D19DE829C7C042833D0F31FBAB612 /* Pods-SignalShareExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SignalShareExtension.release.xcconfig"; sourceTree = "<group>"; };
-		7B92FF1BE766287BE51D12075DDD5A85 /* OWSSignalService.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSSignalService.h; sourceTree = "<group>"; };
 		7BA15519B799E71C8DB6FDA7C02BB6B3 /* Pods-SignalMessaging-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SignalMessaging-resources.sh"; sourceTree = "<group>"; };
 		7BA5D952C77F748CD5BA698C91406551 /* IdentityKeyStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = IdentityKeyStore.h; path = AxolotlKit/Classes/State/IdentityKeyStore.h; sourceTree = "<group>"; };
+		7BB37D56F94E93AEE1AEC8F2151B8FDC /* OWSDisappearingMessagesJob.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDisappearingMessagesJob.h; sourceTree = "<group>"; };
 		7BF6578BACE21009E23D8C239E2BA3D8 /* metamacros.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = metamacros.h; path = Mantle/extobjc/metamacros.h; sourceTree = "<group>"; };
-		7C77D42EFF7BC38E8AEEEA77EC8FB4B6 /* OWSCallAnswerMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSCallAnswerMessage.h; sourceTree = "<group>"; };
+		7C3B30752D5B5C64D30AFD11E30C778B /* GTSR1.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = GTSR1.crt; path = SignalServiceKit/Resources/Certificates/GTSR1.crt; sourceTree = "<group>"; };
 		7C870A5FD839F4FB190CD0D14BAD8A5F /* PreKeyWhisperMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = PreKeyWhisperMessage.m; path = AxolotlKit/Classes/CipherMessage/PreKeyWhisperMessage.m; sourceTree = "<group>"; };
+		7C9C1D812BF9553D5D1AD34CB2CDA776 /* PhoneNumberUtil.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = PhoneNumberUtil.m; sourceTree = "<group>"; };
 		7CBED5E2D0FCC65F285262CAB15A988D /* SRConstants.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SRConstants.h; path = SocketRocket/Internal/SRConstants.h; sourceTree = "<group>"; };
-		7CC87D5880B9AC57FA1D1269A3EEFF50 /* BadState.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = BadState.h; sourceTree = "<group>"; };
 		7CDF09C23B6CD24E5D24BE08AFA98705 /* DDTTYLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDTTYLogger.m; path = Classes/DDTTYLogger.m; sourceTree = "<group>"; };
 		7D01CD346165076046028264A80BA950 /* UIKit+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIKit+AFNetworking.h"; path = "UIKit+AFNetworking/UIKit+AFNetworking.h"; sourceTree = "<group>"; };
 		7D106D893071FBD3A4DB214A79884C5C /* AFSecurityPolicy.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFSecurityPolicy.h; path = AFNetworking/AFSecurityPolicy.h; sourceTree = "<group>"; };
-		7D2CB7969F38990667E34BAF41EBB5F8 /* OWSDisappearingMessagesConfigurationMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDisappearingMessagesConfigurationMessage.m; sourceTree = "<group>"; };
+		7D65FEF188CC38C681038CA1F82D0992 /* OWSChunkedOutputStream.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSChunkedOutputStream.h; sourceTree = "<group>"; };
+		7DF161EF1F5AF9F1B3C0EF7F66028DDA /* NSString+SSK.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSString+SSK.m"; sourceTree = "<group>"; };
 		7E033E8D2FF5A66526CBE30C84993924 /* SRMutex.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SRMutex.m; path = SocketRocket/Internal/Utilities/SRMutex.m; sourceTree = "<group>"; };
 		7E1435CF24035D6E6202BBDD5A487FB3 /* Pods-SignalTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SignalTests.release.xcconfig"; sourceTree = "<group>"; };
+		7E2D4510147555CF056136635AB6D26F /* DigiCertSHA2HighAssuranceServerCA.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = DigiCertSHA2HighAssuranceServerCA.crt; path = SignalServiceKit/Resources/Certificates/DigiCertSHA2HighAssuranceServerCA.crt; sourceTree = "<group>"; };
+		7E40448A477BBC81012377EABEEAD545 /* OWSRecordTranscriptJob.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSRecordTranscriptJob.m; sourceTree = "<group>"; };
 		7E61CD28B5D26159BC36BA5FAC5A5E2F /* MTLTransformerErrorHandling.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MTLTransformerErrorHandling.m; path = Mantle/MTLTransformerErrorHandling.m; sourceTree = "<group>"; };
-		7E784B0EF1C2895C277A9417E6D6A98D /* TSOutgoingMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSOutgoingMessage.h; sourceTree = "<group>"; };
+		7E81D71E6383CDC4AD5BF7BC218D2BF8 /* WebSocketResources.pb.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = WebSocketResources.pb.m; sourceTree = "<group>"; };
 		7EFACB3C584F0907AE240AFA85167023 /* Zalgo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Zalgo.swift; path = Sources/Zalgo.swift; sourceTree = "<group>"; };
 		7EFC77339E53656313E059ECCCA8DD48 /* NBAsYouTypeFormatter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NBAsYouTypeFormatter.h; path = libPhoneNumber/NBAsYouTypeFormatter.h; sourceTree = "<group>"; };
-		7EFE9E609E98AB145B88AF3EDB34D13A /* TSErrorMessage_privateConstructor.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSErrorMessage_privateConstructor.h; sourceTree = "<group>"; };
+		7F62F1643E0C1F4EBF830813DF26835C /* AppVersion.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = AppVersion.m; sourceTree = "<group>"; };
 		7F699B21B71C75616998D8843587ED1C /* NBPhoneMetaData.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NBPhoneMetaData.h; path = libPhoneNumber/NBPhoneMetaData.h; sourceTree = "<group>"; };
 		7F6EA0C521F62065118B390A8D3A11C8 /* compare.c */ = {isa = PBXFileReference; includeInIndex = 1; name = compare.c; path = Sources/ed25519/additions/compare.c; sourceTree = "<group>"; };
+		7F735985656EE5B82E9A59291A91532A /* UIImage+OWS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "UIImage+OWS.m"; sourceTree = "<group>"; };
 		7F9A83C2ECA017567F1F715307AECF3F /* YapDatabaseActionManagerTransaction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseActionManagerTransaction.h; path = YapDatabase/Extensions/ActionManager/YapDatabaseActionManagerTransaction.h; sourceTree = "<group>"; };
 		7FA3D1B0311FC329826A69630EBE3672 /* MessageKeys.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MessageKeys.m; path = AxolotlKit/Classes/Ratchet/MessageKeys.m; sourceTree = "<group>"; };
 		7FB29A97C5AE8F6E6148BBA36A0055BB /* PureLayout.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = PureLayout.modulemap; sourceTree = "<group>"; };
@@ -2659,13 +2663,14 @@
 		804C95E144665A47911F31C7CB4908FE /* TextFormatEncoder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TextFormatEncoder.swift; path = Sources/SwiftProtobuf/TextFormatEncoder.swift; sourceTree = "<group>"; };
 		806400F1D49935033C289B6526E840F2 /* NBAsYouTypeFormatter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NBAsYouTypeFormatter.m; path = libPhoneNumber/NBAsYouTypeFormatter.m; sourceTree = "<group>"; };
 		8067738489DF46A6A438ED2A869B5666 /* UnknownFieldSetBuilder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = UnknownFieldSetBuilder.m; path = src/runtime/Classes/UnknownFieldSetBuilder.m; sourceTree = "<group>"; };
+		809155732CEF30E37A57A4F2D001BD99 /* TSAccountManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSAccountManager.m; sourceTree = "<group>"; };
 		80C2B5360175615E5107DA5A91379EEE /* Constants.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Constants.h; path = AxolotlKit/Classes/Constants.h; sourceTree = "<group>"; };
 		81058831C192AE8C683BF75CF95F6C3E /* ge_p3_to_p2.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ge_p3_to_p2.c; path = Sources/ed25519/ge_p3_to_p2.c; sourceTree = "<group>"; };
-		8136E50AAB1B286EB6C43DDEF17C006C /* OWSDisappearingMessagesJob.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDisappearingMessagesJob.m; sourceTree = "<group>"; };
-		813C6D0BEC1DDEA3B1A5AEFDE59E478F /* NSObject+OWS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSObject+OWS.m"; sourceTree = "<group>"; };
+		813EC8F6346C15A6A9C8ACD65E5317E4 /* OWSAnalyticsEvents.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSAnalyticsEvents.m; sourceTree = "<group>"; };
 		816066FAF19A6D32DF9A452B0BD84528 /* prng.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = prng.h; path = SSZipArchive/minizip/aes/prng.h; sourceTree = "<group>"; };
 		8177D17DED31641749B10EBA14698505 /* sc.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = sc.h; path = Sources/ed25519/sc.h; sourceTree = "<group>"; };
-		8202F2DDE39977A6FD4A46DF772483E8 /* OWSLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSLogger.h; sourceTree = "<group>"; };
+		819FC807BADF319C386A31D0D94DC641 /* OWSRequestBuilder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSRequestBuilder.m; sourceTree = "<group>"; };
+		81AAD4A523194D142CAFBD3BD5D37A3A /* OWSMessageServiceParams.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSMessageServiceParams.m; sourceTree = "<group>"; };
 		823A841705FCAF6E4986C3D9F9727BA6 /* YapDatabase-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "YapDatabase-dummy.m"; sourceTree = "<group>"; };
 		826657A7BEDC384FB2541F8C611F89F7 /* Descriptor.pb.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Descriptor.pb.h; path = src/runtime/Classes/Descriptor.pb.h; sourceTree = "<group>"; };
 		827E2B5FD86894D625EF1C5594AC17B8 /* PMKUIKit.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PMKUIKit.h; path = Extensions/UIKit/Sources/PMKUIKit.h; sourceTree = "<group>"; };
@@ -2674,13 +2679,10 @@
 		8286F25917FC241FE265BD68FBE20418 /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AssetsLibrary.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/AssetsLibrary.framework; sourceTree = DEVELOPER_DIR; };
 		82C478827FA1031D0519A14869C06ECF /* aes.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = aes.h; path = SSZipArchive/minizip/aes/aes.h; sourceTree = "<group>"; };
 		82D92B7DE46AAC9BB71F26C18CDE375E /* pow22523.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = pow22523.h; path = Sources/ed25519/pow22523.h; sourceTree = "<group>"; };
-		82DF67E166EE8390B11DF63F8C9A1ED3 /* GSR4.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = GSR4.crt; path = SignalServiceKit/Resources/Certificates/GSR4.crt; sourceTree = "<group>"; };
-		83461F5F8585B3BF15202D01BE781E3D /* OWSCallIceUpdateMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSCallIceUpdateMessage.m; sourceTree = "<group>"; };
 		834952DCE37A944B1023BF83E0A8C579 /* YapDatabaseRelationshipTransaction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseRelationshipTransaction.m; path = YapDatabase/Extensions/Relationships/YapDatabaseRelationshipTransaction.m; sourceTree = "<group>"; };
 		839957548BA25AD63178D5F633520E41 /* Pods-SignalTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SignalTests.debug.xcconfig"; sourceTree = "<group>"; };
 		839D150397DA263D73B4ECFB18788C1E /* YapDatabaseSearchQueuePrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseSearchQueuePrivate.h; path = YapDatabase/Extensions/SearchResultsView/Internal/YapDatabaseSearchQueuePrivate.h; sourceTree = "<group>"; };
 		842DA7AEC0723BD905A503D5FB9DC6A4 /* SRRandom.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SRRandom.m; path = SocketRocket/Internal/Utilities/SRRandom.m; sourceTree = "<group>"; };
-		8497BB329BACD8AABA0212A2A134D91E /* OWSBlockingManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSBlockingManager.h; sourceTree = "<group>"; };
 		84A950C8DDF1EFB45632B06A97B7CB20 /* ZigZag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ZigZag.swift; path = Sources/SwiftProtobuf/ZigZag.swift; sourceTree = "<group>"; };
 		84AE59F2F0562C9F446647E5E8FAFCD7 /* Mantle-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Mantle-umbrella.h"; sourceTree = "<group>"; };
 		84B4CF6512D403D4AB501D3231CAB9E9 /* DDASLLogCapture.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDASLLogCapture.m; path = Classes/DDASLLogCapture.m; sourceTree = "<group>"; };
@@ -2688,45 +2690,46 @@
 		84DCCAE73FC7731526EAC8490A2F84E7 /* UIImageView+AFNetworking.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIImageView+AFNetworking.m"; path = "UIKit+AFNetworking/UIImageView+AFNetworking.m"; sourceTree = "<group>"; };
 		84E6BE0CA78F6A4E1B33D31D3F9C094E /* ProtocolBuffers.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ProtocolBuffers.h; path = src/runtime/Classes/ProtocolBuffers.h; sourceTree = "<group>"; };
 		850F631CAFFC5F6769D1A4AC1A2E76D6 /* NSArray+MTLManipulationAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSArray+MTLManipulationAdditions.m"; path = "Mantle/NSArray+MTLManipulationAdditions.m"; sourceTree = "<group>"; };
+		8510288CFF00F6C00D0034A3B1833EEB /* OWSDeviceProvisioningService.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDeviceProvisioningService.m; sourceTree = "<group>"; };
 		852029CE2499C0E1B7AC6E1E433C6C72 /* YapDatabaseFullTextSearchHandler.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseFullTextSearchHandler.h; path = YapDatabase/Extensions/FullTextSearch/YapDatabaseFullTextSearchHandler.h; sourceTree = "<group>"; };
 		85252C099402BB9D723F420D18426A1F /* YapDatabaseCloudCorePrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCloudCorePrivate.h; path = YapDatabase/Extensions/CloudCore/Internal/YapDatabaseCloudCorePrivate.h; sourceTree = "<group>"; };
-		852D31442A4E131E065F61228DA28B01 /* OWSCensorshipConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSCensorshipConfiguration.m; sourceTree = "<group>"; };
 		854F785D3FC75EDBEA395D12D403E420 /* SessionStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SessionStore.h; path = AxolotlKit/Classes/State/SessionStore.h; sourceTree = "<group>"; };
 		854F81F4E99585F9130C292BF5C473E3 /* SRProxyConnect.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SRProxyConnect.h; path = SocketRocket/Internal/Proxy/SRProxyConnect.h; sourceTree = "<group>"; };
 		8556B6C1C0DC49640525D71973A45803 /* Pods-SignalMessaging-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SignalMessaging-umbrella.h"; sourceTree = "<group>"; };
 		8564534AB27BDD85BF1A39C6FE95907D /* SerializationUtilities.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SerializationUtilities.h; path = AxolotlKit/Classes/Utility/SerializationUtilities.h; sourceTree = "<group>"; };
 		856ECA21405E9E5161D8561EF5389252 /* sqlite3.c */ = {isa = PBXFileReference; includeInIndex = 1; path = sqlite3.c; sourceTree = "<group>"; };
 		8591E9A012F119DD3B17CA0C6307B7D1 /* SRIOConsumerPool.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SRIOConsumerPool.m; path = SocketRocket/Internal/IOConsumer/SRIOConsumerPool.m; sourceTree = "<group>"; };
-		85A55A417805D3D06E3B2F3F85C3F717 /* NSArray+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSArray+OWS.h"; sourceTree = "<group>"; };
+		8596D56936F338EED57C695E71A744C7 /* TSPreKeyManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSPreKeyManager.h; sourceTree = "<group>"; };
 		85C0CA55B227612FE773DD06D6DE905B /* YapDatabaseSearchQueue.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseSearchQueue.h; path = YapDatabase/Extensions/SearchResultsView/YapDatabaseSearchQueue.h; sourceTree = "<group>"; };
 		86217DF5967723EC4C61F7979F334B5A /* Pods-SignalShareExtension-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SignalShareExtension-umbrella.h"; sourceTree = "<group>"; };
+		862376E2432440456445CE750F156E5B /* TSInfoMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSInfoMessage.m; sourceTree = "<group>"; };
+		86B1CF688CA9ACAB8D09FCA6B0F38457 /* OWSFingerprint.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSFingerprint.h; sourceTree = "<group>"; };
 		86CE7CBAA54CB972C359A1D7D9731A1C /* afterlife.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = afterlife.swift; path = Extensions/Foundation/Sources/afterlife.swift; sourceTree = "<group>"; };
 		86DA8AA690CF7871AEF0502DEB18A433 /* PMKFoundation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PMKFoundation.h; path = Extensions/Foundation/Sources/PMKFoundation.h; sourceTree = "<group>"; };
 		86FC8851397509BED9E0AE85640B9D6A /* PBArray.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = PBArray.m; path = src/runtime/Classes/PBArray.m; sourceTree = "<group>"; };
 		875DCC4CB3F63B31BECFA3F115370A6C /* aesopt.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = aesopt.h; path = SSZipArchive/minizip/aes/aesopt.h; sourceTree = "<group>"; };
 		877B2F2B5B3EE9BDF0C30EE5EB0FDD82 /* Google_Protobuf_Duration+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Google_Protobuf_Duration+Extensions.swift"; path = "Sources/SwiftProtobuf/Google_Protobuf_Duration+Extensions.swift"; sourceTree = "<group>"; };
+		877F2388D703248A79AA31A182A58DE3 /* OWSAddToContactsOfferMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSAddToContactsOfferMessage.h; sourceTree = "<group>"; };
 		87823688017D547E0AEF449C6A8F83A8 /* Pods-SignalTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SignalTests-frameworks.sh"; sourceTree = "<group>"; };
 		87BBF2381F9F29F9154010D3F7DC87FD /* YapDatabaseRelationship.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseRelationship.m; path = YapDatabase/Extensions/Relationships/YapDatabaseRelationship.m; sourceTree = "<group>"; };
+		87BF49C75D773E100EB1EC5CB9001B74 /* Cryptography.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Cryptography.h; sourceTree = "<group>"; };
 		88047B9D89AF5A59D2066766A8F720CA /* timestamp.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = timestamp.pb.swift; path = Sources/SwiftProtobuf/timestamp.pb.swift; sourceTree = "<group>"; };
 		884692D543E7DC5043C2A89083232FEA /* base.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = base.h; path = Sources/ed25519/base.h; sourceTree = "<group>"; };
+		885F8FAC1A5530851EDB8D8045D36AC4 /* GTSR3.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = GTSR3.crt; path = SignalServiceKit/Resources/Certificates/GTSR3.crt; sourceTree = "<group>"; };
 		889FCC9114107031E89A3D3A75ECBA07 /* YapDatabaseCloudKitOptions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCloudKitOptions.h; path = YapDatabase/Extensions/CloudKit/YapDatabaseCloudKitOptions.h; sourceTree = "<group>"; };
 		89031C82B9F656F8BB4B4D3DFE4643DF /* YapCache.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapCache.h; path = YapDatabase/Utilities/YapCache.h; sourceTree = "<group>"; };
-		89045AD5563770A8C168A08A0B4972E2 /* ByteParser.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = ByteParser.m; sourceTree = "<group>"; };
 		891FF444E0DCA26BCCB4F63FD88D9B1F /* d2.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = d2.h; path = Sources/ed25519/d2.h; sourceTree = "<group>"; };
-		89559634B6EA113D2F13062AA595E1E5 /* OWSDeviceProvisioningService.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDeviceProvisioningService.m; sourceTree = "<group>"; };
+		8983A9244E7A8958274B465B616A0E6A /* OWSCensorshipConfiguration.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSCensorshipConfiguration.h; sourceTree = "<group>"; };
 		8993BE232F607B5088398AD06E64235E /* ge_sub.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ge_sub.c; path = Sources/ed25519/ge_sub.c; sourceTree = "<group>"; };
 		89B6A98BA52489FE18234690E98D0A18 /* YapDatabaseSearchQueue.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseSearchQueue.m; path = YapDatabase/Extensions/SearchResultsView/YapDatabaseSearchQueue.m; sourceTree = "<group>"; };
-		89BA43D6F6C0C218BB790C138E8C20EC /* OWSBlockedPhoneNumbersMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSBlockedPhoneNumbersMessage.m; sourceTree = "<group>"; };
 		8A16F246B6B4DEB1821B6A2CB5C6E778 /* ATAppUpdater.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = ATAppUpdater.modulemap; sourceTree = "<group>"; };
 		8A26B11B2DCBCB49F075720905FCF0DA /* YapDatabaseExtensionPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseExtensionPrivate.h; path = YapDatabase/Extensions/Protocol/Internal/YapDatabaseExtensionPrivate.h; sourceTree = "<group>"; };
 		8A320CBAF72F083F1BC859D06DE58109 /* SessionBuilder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SessionBuilder.h; path = AxolotlKit/Classes/Sessions/SessionBuilder.h; sourceTree = "<group>"; };
 		8A44E7C123F62CD65842DC7231265F5C /* BinaryDelimited.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BinaryDelimited.swift; path = Sources/SwiftProtobuf/BinaryDelimited.swift; sourceTree = "<group>"; };
-		8A81425D524026D531372DA79BF8225C /* SignalServiceKit.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = SignalServiceKit.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
-		8AB4AE89FA16B4E41D43A85F3B41A0E0 /* OWSError.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSError.h; sourceTree = "<group>"; };
+		8A9DBB62FAACF4C06EA366B612644716 /* OWSReadReceiptManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSReadReceiptManager.m; sourceTree = "<group>"; };
 		8ADE7EE0735F4A4D5B1BED9026752E3F /* MutableField.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MutableField.m; path = src/runtime/Classes/MutableField.m; sourceTree = "<group>"; };
-		8B19412213EDD2F55EC4D9B70DD56520 /* CDSQuote.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = CDSQuote.m; sourceTree = "<group>"; };
 		8B91F60F07EB8718317AABFD23FC2D4B /* MTLTransformerErrorHandling.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MTLTransformerErrorHandling.h; path = Mantle/MTLTransformerErrorHandling.h; sourceTree = "<group>"; };
-		8BA7FCDDC664795F7CB4F2417AA62DC6 /* OWSVerificationStateSyncMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSVerificationStateSyncMessage.m; sourceTree = "<group>"; };
+		8BB1F13B725960979F8BB79ECE8DDFEC /* ByteParser.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = ByteParser.h; sourceTree = "<group>"; };
 		8BB53A4832AB0BC446C8829D292E06D5 /* SocketRocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SocketRocket.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		8BD368BDDB885B3B1BA842C7F924B53A /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/ImageIO.framework; sourceTree = DEVELOPER_DIR; };
 		8BF65EA0E8C29C2933EC16762048A553 /* YapDatabaseViewOptions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseViewOptions.m; path = YapDatabase/Extensions/View/YapDatabaseViewOptions.m; sourceTree = "<group>"; };
@@ -2740,16 +2743,18 @@
 		8E11FEAEB69E9AB31300CDDE5502B14D /* SwiftProtobuf-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "SwiftProtobuf-dummy.m"; sourceTree = "<group>"; };
 		8E336A3D6AA170275EF1033A11E8476E /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8E3E9F563E3145CE10FB60C39E2D0490 /* HKDFKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "HKDFKit-dummy.m"; sourceTree = "<group>"; };
+		8E6B399DDB41985E9A1EBD7C60FB0304 /* TSIncomingMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSIncomingMessage.m; sourceTree = "<group>"; };
 		8E9AC41A0576FEB88809CFFDAB084BC1 /* YapProxyObjectPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapProxyObjectPrivate.h; path = YapDatabase/Internal/YapProxyObjectPrivate.h; sourceTree = "<group>"; };
-		8EDEEB3EFA77F9B6CAD65DE7B437A136 /* OWSBlockedPhoneNumbersMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSBlockedPhoneNumbersMessage.h; sourceTree = "<group>"; };
 		8F26671CBC733B8BC737D199B44A2972 /* Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Promise.swift; path = Sources/Promise.swift; sourceTree = "<group>"; };
 		8F28D9FE9F67730285658675C1579F8C /* Curve25519Kit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Curve25519Kit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		8F57E26ABA0C6735FEF9BAFB2E3A65D7 /* YapDatabaseRTreeIndexSetup.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseRTreeIndexSetup.m; path = YapDatabase/Extensions/RTreeIndex/YapDatabaseRTreeIndexSetup.m; sourceTree = "<group>"; };
-		8F6AFA30514B9C30CE70C6D091EE7982 /* AppVersion.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = AppVersion.h; sourceTree = "<group>"; };
+		90083AF766FB0F3777FF574CF6170AA8 /* TSNetworkManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSNetworkManager.h; sourceTree = "<group>"; };
 		901E6793392FF873A45BBE84B57EFD05 /* YapDatabaseRelationshipPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseRelationshipPrivate.h; path = YapDatabase/Extensions/Relationships/Internal/YapDatabaseRelationshipPrivate.h; sourceTree = "<group>"; };
+		904CAE7574122FD8A57A7E9DEA6F822F /* ProfileManagerProtocol.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = ProfileManagerProtocol.h; sourceTree = "<group>"; };
 		9064B28AFC3E20939753EFB2B9A2C6AF /* RKCK.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RKCK.m; path = AxolotlKit/Classes/Ratchet/RKCK.m; sourceTree = "<group>"; };
 		90A0B3D92D65BA05EC997157E92D1D31 /* ALView+PureLayout.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "ALView+PureLayout.h"; path = "PureLayout/PureLayout/ALView+PureLayout.h"; sourceTree = "<group>"; };
 		90AAEB72A610D9114398EE7D89236539 /* YapWhitelistBlacklist.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapWhitelistBlacklist.h; path = YapDatabase/Utilities/YapWhitelistBlacklist.h; sourceTree = "<group>"; };
+		90B697318E4B747966BE4C4C7209EE59 /* OWSContact.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSContact.m; sourceTree = "<group>"; };
 		90E560F8D1834F8CEC67E0394C77F8B2 /* SRHash.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SRHash.m; path = SocketRocket/Internal/Utilities/SRHash.m; sourceTree = "<group>"; };
 		9139A177DE044232E7C891F1E1918B41 /* YapNull.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapNull.h; path = YapDatabase/Internal/YapNull.h; sourceTree = "<group>"; };
 		91483FE65368E337BADB624C1F1ADA76 /* YapDatabaseFilteredViewTypes.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseFilteredViewTypes.m; path = YapDatabase/Extensions/FilteredView/YapDatabaseFilteredViewTypes.m; sourceTree = "<group>"; };
@@ -2757,39 +2762,45 @@
 		91D09585AAFC4A384B5469C66E09D7B2 /* SRPinningSecurityPolicy.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SRPinningSecurityPolicy.h; path = SocketRocket/Internal/Security/SRPinningSecurityPolicy.h; sourceTree = "<group>"; };
 		91EFB9349097AA25EC9661AEDDEA334B /* YapDatabaseCloudCorePipelineDelegate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCloudCorePipelineDelegate.h; path = YapDatabase/Extensions/CloudCore/Utilities/Execution/YapDatabaseCloudCorePipelineDelegate.h; sourceTree = "<group>"; };
 		922312A36B2CF6F0CABB53F6E86CC4D9 /* EXTScope.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = EXTScope.h; path = Mantle/extobjc/EXTScope.h; sourceTree = "<group>"; };
+		9227BCDB8E9050F9F326EDD1009BF45E /* AppContext.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = AppContext.h; sourceTree = "<group>"; };
+		92334274784D5B1694F34230F94BDC54 /* OWSSyncConfigurationMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSSyncConfigurationMessage.m; sourceTree = "<group>"; };
 		92418DB916CB59E4D429B30D466E45BF /* fe_0.c */ = {isa = PBXFileReference; includeInIndex = 1; name = fe_0.c; path = Sources/ed25519/fe_0.c; sourceTree = "<group>"; };
 		92530B93986BA152C1B486D45746FA2A /* any.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = any.pb.swift; path = Sources/SwiftProtobuf/any.pb.swift; sourceTree = "<group>"; };
 		9257B83E69BA458EEDE140C191D8832E /* YYImage.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = YYImage.modulemap; sourceTree = "<group>"; };
+		92B7627F8AFB212AF3A25D78AE413159 /* OWSFingerprintProtos.pb.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSFingerprintProtos.pb.h; sourceTree = "<group>"; };
 		932F9191B664561E641CC6FEFD2D2722 /* join.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = join.swift; path = Sources/join.swift; sourceTree = "<group>"; };
 		9330DF0B1284C1EF2B02B25DB12AEF01 /* MTLModel+NSCoding.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "MTLModel+NSCoding.h"; path = "Mantle/MTLModel+NSCoding.h"; sourceTree = "<group>"; };
 		93593160C711CDC89B743C6CB0FFFB20 /* SSZipArchive.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SSZipArchive.xcconfig; sourceTree = "<group>"; };
+		935A6E93A1236B5472592FB4D0F44440 /* OWSOutgoingSyncMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSOutgoingSyncMessage.m; sourceTree = "<group>"; };
 		93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
-		93C5196F929F75446D886C9231827DC5 /* OWSSyncContactsMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSSyncContactsMessage.m; sourceTree = "<group>"; };
 		942FDFF630730BF36022DB8D2DF77C64 /* SwiftProtobuf.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftProtobuf.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		94318ACB0DBDD8B0DF438B44C8A188F7 /* OWSBlockedPhoneNumbersMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSBlockedPhoneNumbersMessage.m; sourceTree = "<group>"; };
 		9442C90BA23E6D5BF827E38DF7098F9D /* YapDatabaseSecondaryIndexConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseSecondaryIndexConnection.h; path = YapDatabase/Extensions/SecondaryIndex/YapDatabaseSecondaryIndexConnection.h; sourceTree = "<group>"; };
 		9463D6F468C98AAAF076F0CA04732F84 /* Curve25519Kit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Curve25519Kit.modulemap; sourceTree = "<group>"; };
-		948D91AF9838058941F0904F9F1DF8D9 /* OWSBatchMessageProcessor.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSBatchMessageProcessor.h; sourceTree = "<group>"; };
+		94BB41AB92AC6BE28C4528FA5679C04C /* TSInteraction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSInteraction.m; sourceTree = "<group>"; };
+		94D3FDD1A240DA373FD7448379474C8F /* BadState.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = BadState.h; sourceTree = "<group>"; };
 		94EE2C7BF76300AC94BD20E8456B8159 /* YapDatabaseSecondaryIndexHandler.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseSecondaryIndexHandler.m; path = YapDatabase/Extensions/SecondaryIndex/YapDatabaseSecondaryIndexHandler.m; sourceTree = "<group>"; };
 		94FD75002907C8C639C17878876E0DFA /* JSONEncoder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONEncoder.swift; path = Sources/SwiftProtobuf/JSONEncoder.swift; sourceTree = "<group>"; };
 		95827DE9B459EE407B3AEA1BAF0890FE /* ProtobufAPIVersionCheck.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ProtobufAPIVersionCheck.swift; path = Sources/SwiftProtobuf/ProtobufAPIVersionCheck.swift; sourceTree = "<group>"; };
 		9593EE82EDCB9089DF203EF2001E83CD /* YapActionItem.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapActionItem.m; path = YapDatabase/Extensions/ActionManager/YapActionItem.m; sourceTree = "<group>"; };
-		95968E175C0D1E96EDCF62BFEB525F81 /* OWSMediaGalleryFinder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSMediaGalleryFinder.m; sourceTree = "<group>"; };
-		95D6EB48C19F87617D31BB4D7A903EC1 /* SignalIOS.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SignalIOS.pb.swift; sourceTree = "<group>"; };
 		963DD191F8350FE2D986D5D51253A410 /* UIButton+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIButton+AFNetworking.h"; path = "UIKit+AFNetworking/UIButton+AFNetworking.h"; sourceTree = "<group>"; };
+		96A346553B74C1AEC888318DE5E225CD /* TSAttachment.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSAttachment.m; sourceTree = "<group>"; };
 		96D7E6AEA27952A2F3C772875BD9E144 /* YapDatabaseSearchResultsViewOptions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseSearchResultsViewOptions.h; path = YapDatabase/Extensions/SearchResultsView/YapDatabaseSearchResultsViewOptions.h; sourceTree = "<group>"; };
 		9702E75E1FE1D321D0848C11FF933341 /* ioapi.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ioapi.h; path = SSZipArchive/minizip/ioapi.h; sourceTree = "<group>"; };
+		970F486137849B5CC94D40DF254C0C82 /* OWSCallHangupMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSCallHangupMessage.h; sourceTree = "<group>"; };
 		971826CB06B3756BC89904DB0BA6599D /* YapDatabaseSearchResultsView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseSearchResultsView.h; path = YapDatabase/Extensions/SearchResultsView/YapDatabaseSearchResultsView.h; sourceTree = "<group>"; };
 		9720180424C5795A0504319CD332D53D /* ProtocolBuffers-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "ProtocolBuffers-umbrella.h"; sourceTree = "<group>"; };
 		976B6E746DDA331E4BC71BAB490E18B0 /* YapDatabaseLogging.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseLogging.h; path = YapDatabase/Internal/YapDatabaseLogging.h; sourceTree = "<group>"; };
+		97A0F57A8AB2F431DA78837377073BAA /* OWSDispatch.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDispatch.m; sourceTree = "<group>"; };
+		97BA9310FF66D97373376434D6AE1E8C /* OWSMessageSender.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSMessageSender.h; sourceTree = "<group>"; };
 		97BAE05D8250D16F4B8A30438B1CCDA4 /* fe_add.c */ = {isa = PBXFileReference; includeInIndex = 1; name = fe_add.c; path = Sources/ed25519/fe_add.c; sourceTree = "<group>"; };
 		97D9C27BD399353350D8079CD9E5C9B6 /* SRWebSocket.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SRWebSocket.h; path = SocketRocket/SRWebSocket.h; sourceTree = "<group>"; };
 		97ED1E3DF81E7B340DB195EAC2E05494 /* Reachability-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Reachability-dummy.m"; sourceTree = "<group>"; };
 		97FAA5DA7710FA14E29B2661EB35C86A /* SRRunLoopThread.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SRRunLoopThread.h; path = SocketRocket/Internal/RunLoop/SRRunLoopThread.h; sourceTree = "<group>"; };
-		9846585A727D27C7CD8156256A03DC68 /* OWSCallAnswerMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSCallAnswerMessage.m; sourceTree = "<group>"; };
+		985CA3F14126C98F6533E725992B5D76 /* SignalService.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SignalService.pb.swift; sourceTree = "<group>"; };
 		987C5D7FE7453D0AC409BC25A3D0C8C3 /* YapDatabaseAutoViewTransaction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseAutoViewTransaction.m; path = YapDatabase/Extensions/AutoView/YapDatabaseAutoViewTransaction.m; sourceTree = "<group>"; };
 		989539B4E7A0324A7DD2F107A63FBFCF /* SRProxyConnect.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SRProxyConnect.m; path = SocketRocket/Internal/Proxy/SRProxyConnect.m; sourceTree = "<group>"; };
 		98D749ED55BC7177567F06CC7ED0CB08 /* SPKAsserts.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SPKAsserts.h; path = AxolotlKit/Classes/SPKAsserts.h; sourceTree = "<group>"; };
-		98FDCB4A2CCB6F90470E8679CC6AA9CF /* OWSPrimaryStorage+Calling.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OWSPrimaryStorage+Calling.m"; sourceTree = "<group>"; };
 		99522D10EEBC665977D5719952177FFC /* sc_muladd.c */ = {isa = PBXFileReference; includeInIndex = 1; name = sc_muladd.c; path = Sources/ed25519/sc_muladd.c; sourceTree = "<group>"; };
 		99534606204A412EAE08039706D14AF4 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		995CB71C5DEAC377FC75F2006069FEFD /* YapDatabaseConnectionState.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseConnectionState.h; path = YapDatabase/Internal/YapDatabaseConnectionState.h; sourceTree = "<group>"; };
@@ -2797,43 +2808,43 @@
 		99A9387AF5FB26A99F0F4974A1FF19B4 /* Pods-SignalTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SignalTests-dummy.m"; sourceTree = "<group>"; };
 		9A0E4EB4380E43D870A5D05B2DFBF188 /* AxolotlExceptions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AxolotlExceptions.h; path = AxolotlKit/Classes/AxolotlExceptions.h; sourceTree = "<group>"; };
 		9AD560D653F069444FA0BE7B6DFD90FF /* Google_Protobuf_Timestamp+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Google_Protobuf_Timestamp+Extensions.swift"; path = "Sources/SwiftProtobuf/Google_Protobuf_Timestamp+Extensions.swift"; sourceTree = "<group>"; };
+		9B078DCC08E40583ACE23FEE36865E4F /* CDSSigningCertificate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = CDSSigningCertificate.h; sourceTree = "<group>"; };
 		9B089498E5C1C6C4DE9BCCA260B999B1 /* YYImage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YYImage.h; path = YYImage/YYImage.h; sourceTree = "<group>"; };
+		9BBB20B9098E2F91A52B0B89124B2928 /* OWSRequestFactory.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSRequestFactory.m; sourceTree = "<group>"; };
 		9BC90FF3581D9A2FB26E2EF4DC6619AE /* YapDatabaseViewChangePrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseViewChangePrivate.h; path = YapDatabase/Extensions/View/Internal/YapDatabaseViewChangePrivate.h; sourceTree = "<group>"; };
 		9BE1DE5E96390252534F838232175441 /* DDFileLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDFileLogger.h; path = Classes/DDFileLogger.h; sourceTree = "<group>"; };
-		9C1112D2596C69C76939456ED1C79E66 /* OWSMessageSender.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSMessageSender.h; sourceTree = "<group>"; };
-		9C4DE47C5240AD6AAF4C1FE1D0E4185A /* OWSPrimaryStorage+keyFromIntLong.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OWSPrimaryStorage+keyFromIntLong.h"; sourceTree = "<group>"; };
 		9C504F095060BAB97710FEC0714945D1 /* Reachability.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Reachability.framework; path = Reachability.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		9CAEFFAD5C051996FD4A2CDCA7284468 /* OWSDynamicOutgoingMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDynamicOutgoingMessage.m; sourceTree = "<group>"; };
+		9C5F696C3848D7A6FDD2E1C22961F701 /* MIMETypeUtil.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = MIMETypeUtil.h; sourceTree = "<group>"; };
+		9C8E6EA45C0F033AC766F4172BCB11C1 /* OWSAnalytics.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSAnalytics.h; sourceTree = "<group>"; };
 		9CB2DF1FD1E17E499F6AD15EA5CEC050 /* DDMultiFormatter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDMultiFormatter.m; path = Classes/Extensions/DDMultiFormatter.m; sourceTree = "<group>"; };
-		9CFCCE99DA01B65CAC0F59FECC94358C /* CDSSigningCertificate.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = CDSSigningCertificate.m; sourceTree = "<group>"; };
-		9D0E1FAFB33224B3CBF6C84C2F61D2F2 /* TSAttachmentPointer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSAttachmentPointer.m; sourceTree = "<group>"; };
-		9D35708074542E5B1B94EE8DB1F909F5 /* OWSFailedAttachmentDownloadsJob.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSFailedAttachmentDownloadsJob.m; sourceTree = "<group>"; };
+		9CD0833E0959E4EDE391EEAA903F0282 /* OWSGroupsOutputStream.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSGroupsOutputStream.m; sourceTree = "<group>"; };
+		9CE4158E0B5B8A498C3EB536733E9A5D /* OWSBlockingManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSBlockingManager.h; sourceTree = "<group>"; };
+		9CF8CA70AFCE1E20BB888202545113BD /* OWSDevice.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDevice.h; sourceTree = "<group>"; };
+		9D57CC4C5F182FA4F8BDC853AD3239D1 /* NSString+SSK.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSString+SSK.h"; sourceTree = "<group>"; };
 		9D8DE791F037FA39EFB8237C49C126FB /* YDBCKChangeQueue.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YDBCKChangeQueue.h; path = YapDatabase/Extensions/CloudKit/Internal/YDBCKChangeQueue.h; sourceTree = "<group>"; };
-		9D90302EB77FE7E507D376650D74EEE9 /* CDSQuote.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = CDSQuote.h; sourceTree = "<group>"; };
-		9D9C973951FD75AF4D4E70AF220A0352 /* OWSPrimaryStorage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSPrimaryStorage.m; sourceTree = "<group>"; };
 		9DBC2A075370DB1FD6EA27D75585B08B /* PureLayout.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = PureLayout.framework; path = PureLayout.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		9DBDD55E20879C384DD61CD631F718AC /* NSError+MessageSending.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSError+MessageSending.h"; sourceTree = "<group>"; };
 		9DDD5C426950C86DFE7B5263E7017E75 /* DDOSLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDOSLogger.m; path = Classes/DDOSLogger.m; sourceTree = "<group>"; };
-		9E24F9FE67F842E2E47876EAEF3C6E99 /* BadArgument.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = BadArgument.m; sourceTree = "<group>"; };
-		9E25B2851CF74C5DB51508E40EBAC96B /* NSNotificationCenter+OWS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSNotificationCenter+OWS.m"; sourceTree = "<group>"; };
 		9E3A30E37CAE562A5B44D27B36DC2E17 /* DDASLLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDASLLogger.m; path = Classes/DDASLLogger.m; sourceTree = "<group>"; };
 		9E833154D47A6408787689039B868E05 /* YapDatabaseCrossProcessNotificationConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCrossProcessNotificationConnection.h; path = YapDatabase/Extensions/CrossProcessNotification/YapDatabaseCrossProcessNotificationConnection.h; sourceTree = "<group>"; };
 		9EEF3735366A7DA86AA6B7970F4F0937 /* YapDatabaseSecondaryIndexHandler.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseSecondaryIndexHandler.h; path = YapDatabase/Extensions/SecondaryIndex/YapDatabaseSecondaryIndexHandler.h; sourceTree = "<group>"; };
 		9EF39B7320C44E724DE5989C82E8CEE8 /* UIWebView+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIWebView+AFNetworking.h"; path = "UIKit+AFNetworking/UIWebView+AFNetworking.h"; sourceTree = "<group>"; };
 		9F09BF06C57904608B0E4871291857DE /* YapCollectionKey.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapCollectionKey.h; path = YapDatabase/Utilities/YapCollectionKey.h; sourceTree = "<group>"; };
-		9F7860E43CBAF938C820D385D27B6235 /* ProtoUtils.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = ProtoUtils.m; sourceTree = "<group>"; };
-		9F8891ABD159FF4F06DE4F081519363E /* ContactDiscoveryService.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = ContactDiscoveryService.m; sourceTree = "<group>"; };
-		9F9E2E29CB6BA3D25A211F319AD08B35 /* OWSAnalytics.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSAnalytics.h; sourceTree = "<group>"; };
-		9FCFAADBBB3452010B8C2CF8BF482F2F /* OWSFileSystem.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSFileSystem.h; sourceTree = "<group>"; };
+		9F3E2BF7B01183DB55C1DA4D57440D3A /* OWSIncomingMessageFinder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSIncomingMessageFinder.h; sourceTree = "<group>"; };
+		9FD4AD52560AA074075BA847B65353E6 /* OWSCountryMetadata.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSCountryMetadata.h; sourceTree = "<group>"; };
 		A046DA4FA0B345CB82EAB10C9B87CBD4 /* d.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = d.h; path = Sources/ed25519/d.h; sourceTree = "<group>"; };
 		A049D10F307B209A851ACC844536EC19 /* SQLCipher-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SQLCipher-prefix.pch"; sourceTree = "<group>"; };
+		A04F52856FCC4437AA59675217FC6B59 /* TSAttributes.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSAttributes.m; sourceTree = "<group>"; };
 		A073B11F26E496ADA7F58FCFE025877B /* NSDictionary+MTLManipulationAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSDictionary+MTLManipulationAdditions.m"; path = "Mantle/NSDictionary+MTLManipulationAdditions.m"; sourceTree = "<group>"; };
-		A0EA4D65B523AE03FBDA66DDF8893A70 /* OWSAttachmentsProcessor.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSAttachmentsProcessor.h; sourceTree = "<group>"; };
 		A11D79F31B494DFFD1CEA600A1404A9C /* YapDatabase.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = YapDatabase.modulemap; sourceTree = "<group>"; };
-		A141AA872CB6BD74274E5F236FE8179C /* NSUserDefaults+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSUserDefaults+OWS.h"; sourceTree = "<group>"; };
+		A15D33811AE49388DE14D31D1387B71D /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		A1615AB834F4F871AF448283DDD24416 /* OWSVerificationStateSyncMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSVerificationStateSyncMessage.h; sourceTree = "<group>"; };
 		A18B7D64F33D8EA328696FA3D3FDF182 /* SRSecurityPolicy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SRSecurityPolicy.m; path = SocketRocket/SRSecurityPolicy.m; sourceTree = "<group>"; };
+		A1DA21EE699577A70136604E99C5561C /* MIMETypeUtil.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = MIMETypeUtil.m; sourceTree = "<group>"; };
 		A1E217BE80EAFCBE3D92F16687BD8B01 /* SRPinningSecurityPolicy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SRPinningSecurityPolicy.m; path = SocketRocket/Internal/Security/SRPinningSecurityPolicy.m; sourceTree = "<group>"; };
 		A2501D2AEE1DA8A3AD00235D6AD158C0 /* YapDatabaseFullTextSearchHandler.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseFullTextSearchHandler.m; path = YapDatabase/Extensions/FullTextSearch/YapDatabaseFullTextSearchHandler.m; sourceTree = "<group>"; };
 		A28010D6B6D1B7D0F42803490C05C1E3 /* SRError.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SRError.h; path = SocketRocket/Internal/Utilities/SRError.h; sourceTree = "<group>"; };
+		A28B0AC50D19FE9CDC7D27FD852E5546 /* FullTextSearchFinder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FullTextSearchFinder.swift; sourceTree = "<group>"; };
 		A2BC93658F4116CC6035A8B2A4A2F3ED /* CipherMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CipherMessage.h; path = AxolotlKit/Classes/CipherMessage/CipherMessage.h; sourceTree = "<group>"; };
 		A2D9FD9C023CAEAA5E72C772A20CD16A /* YapDatabaseCrossProcessNotificationConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseCrossProcessNotificationConnection.m; path = YapDatabase/Extensions/CrossProcessNotification/YapDatabaseCrossProcessNotificationConnection.m; sourceTree = "<group>"; };
 		A2E2B8F4A3CCC944F2D9EE03B87911FD /* ExtendableMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = ExtendableMessage.m; path = src/runtime/Classes/ExtendableMessage.m; sourceTree = "<group>"; };
@@ -2841,92 +2852,74 @@
 		A30EE01DF61206D70B035A04913E495E /* UIActivityIndicatorView+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIActivityIndicatorView+AFNetworking.h"; path = "UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.h"; sourceTree = "<group>"; };
 		A3136C3B4DBF40A26AE9A5DF529F4B6C /* NSArray+MTLManipulationAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSArray+MTLManipulationAdditions.h"; path = "Mantle/NSArray+MTLManipulationAdditions.h"; sourceTree = "<group>"; };
 		A345877F9C2AEB479A52476D1813AF20 /* SwiftProtobuf.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = SwiftProtobuf.framework; path = SwiftProtobuf.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		A35845F6C7205D135D658157E14E7823 /* OWSProfileKeyMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSProfileKeyMessage.h; sourceTree = "<group>"; };
 		A37E4D4D328A0F6579C75EA99649ACBD /* SRError.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SRError.m; path = SocketRocket/Internal/Utilities/SRError.m; sourceTree = "<group>"; };
+		A37F0B194D0E86E1BC2B5929244BB76A /* Contact.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Contact.h; sourceTree = "<group>"; };
 		A383510085E6A5CB9D91A2430C977169 /* SRIOConsumer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SRIOConsumer.m; path = SocketRocket/Internal/IOConsumer/SRIOConsumer.m; sourceTree = "<group>"; };
 		A38875B1EF586CDBD6C889CCE33AC8EF /* FieldTag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = FieldTag.swift; path = Sources/SwiftProtobuf/FieldTag.swift; sourceTree = "<group>"; };
 		A38B88AFA5A15E995E359B7E9AEC102B /* YapNull.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapNull.m; path = YapDatabase/Internal/YapNull.m; sourceTree = "<group>"; };
 		A39CEC2549B196B6B88A4955D17B1FB2 /* Utilities.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Utilities.h; path = src/runtime/Classes/Utilities.h; sourceTree = "<group>"; };
-		A3ADAD6AA4C431B46728C206AB0292B5 /* OWSCallBusyMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSCallBusyMessage.m; sourceTree = "<group>"; };
 		A3C93BEB10532E1FAD03B5B867AD9937 /* unzip.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = unzip.h; path = SSZipArchive/minizip/unzip.h; sourceTree = "<group>"; };
 		A40891E3E30794BAB4C9DA288B5B07EE /* crypto_int64.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = crypto_int64.h; path = Sources/ed25519/nacl_includes/crypto_int64.h; sourceTree = "<group>"; };
 		A41AB5D2132798395FFB3E0C4872BB0C /* YapDatabaseAutoView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseAutoView.h; path = YapDatabase/Extensions/AutoView/YapDatabaseAutoView.h; sourceTree = "<group>"; };
-		A453F23AFFFA251571C575247A9C8D1D /* Constraints.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Constraints.h; sourceTree = "<group>"; };
 		A4741FA75B1C7CF84F92B44AB3BA97B7 /* Curve25519.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Curve25519.h; path = Classes/Curve25519.h; sourceTree = "<group>"; };
 		A4816F5F14D8E16046B95EC8D86F15E2 /* NSError+MTLModelException.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSError+MTLModelException.h"; path = "Mantle/NSError+MTLModelException.h"; sourceTree = "<group>"; };
-		A487CF1EAF4EC94EBC80CE340CE7C534 /* OWSRequestFactory.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSRequestFactory.m; sourceTree = "<group>"; };
-		A496EBFA8C9973C409412FF9A40AF9DC /* TSInvalidIdentityKeyReceivingErrorMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSInvalidIdentityKeyReceivingErrorMessage.h; sourceTree = "<group>"; };
+		A4AD44D7FF393559747026068FBBF5F5 /* OWSReadReceiptsForLinkedDevicesMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSReadReceiptsForLinkedDevicesMessage.h; sourceTree = "<group>"; };
+		A4E10BBC87EB46F2B88426422F8AFED9 /* TSInvalidIdentityKeySendingErrorMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSInvalidIdentityKeySendingErrorMessage.m; sourceTree = "<group>"; };
 		A4E331B0E6739B366322608ACD48F7A1 /* Reachability.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; };
 		A4EBE5B44031A63DE66C70BFC0A6744F /* YDBCKMergeInfo.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YDBCKMergeInfo.m; path = YapDatabase/Extensions/CloudKit/Utilities/YDBCKMergeInfo.m; sourceTree = "<group>"; };
-		A4F02C901AD78CE66D2E47057CD07E4E /* OWSSignaliOSProtos.pb.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSSignaliOSProtos.pb.h; sourceTree = "<group>"; };
+		A52E14A402BB0FB86A2538D29D757A2B /* OperationFailed.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OperationFailed.m; sourceTree = "<group>"; };
 		A52E51AC27F33EF1029C9FE49678BB4D /* YapActionItemPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapActionItemPrivate.h; path = YapDatabase/Extensions/ActionManager/Internal/YapActionItemPrivate.h; sourceTree = "<group>"; };
-		A57F5765F3EDD6F5E9C81CA19317947B /* OWSReadReceiptManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSReadReceiptManager.h; sourceTree = "<group>"; };
 		A5B373AE7339BEB8A7EF85A0C1A57B03 /* zeroize.c */ = {isa = PBXFileReference; includeInIndex = 1; name = zeroize.c; path = Sources/ed25519/additions/zeroize.c; sourceTree = "<group>"; };
 		A5FDAF6BF8661FE5EDC22CDFD95AA7EB /* AnyPromise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnyPromise.swift; path = Sources/AnyPromise.swift; sourceTree = "<group>"; };
-		A611AD40294C79AB0BDA872EF21D6EC3 /* OWSUnknownContactBlockOfferMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSUnknownContactBlockOfferMessage.m; sourceTree = "<group>"; };
 		A61CCF6F3329F88E7099E383F957FC4E /* BinaryDecodingError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BinaryDecodingError.swift; path = Sources/SwiftProtobuf/BinaryDecodingError.swift; sourceTree = "<group>"; };
-		A64B6B5023C4F443BF4C27EF5071759C /* ECKeyPair+OWSPrivateKey.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "ECKeyPair+OWSPrivateKey.h"; sourceTree = "<group>"; };
 		A65C29BEBF370600E26149286885ABBF /* wrap.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = wrap.swift; path = Sources/wrap.swift; sourceTree = "<group>"; };
 		A6A218DCB73E7453C1F54EBAEAE97E4F /* Error.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Error.swift; path = Sources/Error.swift; sourceTree = "<group>"; };
 		A6C6C7ECC5D91B5B1A3CA63D4BD561D5 /* NBNumberFormat.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NBNumberFormat.m; path = libPhoneNumber/NBNumberFormat.m; sourceTree = "<group>"; };
-		A6EDF4B1B1A46EAF10365007E10BFD5B /* SignalServiceKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SignalServiceKit-prefix.pch"; sourceTree = "<group>"; };
-		A6F40EEFAAF8F62D0666354EB7049DBD /* OWSGroupsOutputStream.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSGroupsOutputStream.m; sourceTree = "<group>"; };
-		A707D5D3851554FCAC1FCDBFA851AC7C /* OWSMediaGalleryFinder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSMediaGalleryFinder.h; sourceTree = "<group>"; };
-		A709113FFDE1696939ADC6ED2F242CAB /* OWSIncomingMessageFinder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSIncomingMessageFinder.m; sourceTree = "<group>"; };
-		A77FC4E92E7ECB8CC3DAFA4A605E6EEB /* AppContext.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = AppContext.m; sourceTree = "<group>"; };
-		A7A12EDFEAED233351F9FD9867B59406 /* OWSPrimaryStorage+messageIDs.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OWSPrimaryStorage+messageIDs.m"; sourceTree = "<group>"; };
-		A7C17CFEA9DB29F2608A1E58DF19E93E /* OWSFingerprintBuilder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSFingerprintBuilder.m; sourceTree = "<group>"; };
-		A7C33853369DEEFAEA8587875B1862E2 /* OWSPrimaryStorage+SessionStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OWSPrimaryStorage+SessionStore.h"; sourceTree = "<group>"; };
+		A7D98573FB3580784DFD794FAEAFB37D /* BadState.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = BadState.m; sourceTree = "<group>"; };
 		A7FC4DE2D53FD0B0D85038974AC43310 /* Pods-SignalMessaging.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SignalMessaging.debug.xcconfig"; sourceTree = "<group>"; };
 		A828CE62357C3091DC78624DEF37795E /* ioapi_mem.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ioapi_mem.c; path = SSZipArchive/minizip/ioapi_mem.c; sourceTree = "<group>"; };
-		A87D16A250C07731609A188AA7837CAE /* OWSCallHangupMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSCallHangupMessage.h; sourceTree = "<group>"; };
 		A8A5E4B1BB42AEC3AAB973151E1C5C4B /* AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AnyPromise.h; path = Sources/AnyPromise.h; sourceTree = "<group>"; };
 		A8ADE3A69B451E7F7C11265AF3B2068A /* NBPhoneNumber.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NBPhoneNumber.h; path = libPhoneNumber/NBPhoneNumber.h; sourceTree = "<group>"; };
+		A8E59DF59A912A9235A4191A5A92AEED /* NSData+Base64.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSData+Base64.h"; sourceTree = "<group>"; };
 		A8F3C2945EFC93F3CF5F6363C9C826F9 /* YapDatabaseActionManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseActionManager.m; path = YapDatabase/Extensions/ActionManager/YapDatabaseActionManager.m; sourceTree = "<group>"; };
 		A958D7EE9104A7118BB672764DA4E422 /* ObjectivecDescriptor.pb.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = ObjectivecDescriptor.pb.m; path = src/runtime/Classes/ObjectivecDescriptor.pb.m; sourceTree = "<group>"; };
-		A95C83DEB57AB884D861C72F716672C4 /* OWSRequestBuilder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSRequestBuilder.h; sourceTree = "<group>"; };
-		A9653287DC20D7EA4577C7169551EFF8 /* ECKeyPair+OWSPrivateKey.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "ECKeyPair+OWSPrivateKey.m"; sourceTree = "<group>"; };
+		A95D32138D90C34FDC3F017D2A9773DD /* NSData+messagePadding.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSData+messagePadding.h"; sourceTree = "<group>"; };
 		A97F2C41124C519608CEC5DFAE67CA36 /* ChainAndIndex.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ChainAndIndex.h; path = AxolotlKit/Classes/Ratchet/ChainAndIndex.h; sourceTree = "<group>"; };
 		A9A1F81F69A6D236296DC02FDFFF8C8C /* SQLCipher-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SQLCipher-umbrella.h"; sourceTree = "<group>"; };
 		A9ABAD88FA0F5DCDC9F9EC83B1CA5D75 /* BinaryEncodingSizeVisitor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BinaryEncodingSizeVisitor.swift; path = Sources/SwiftProtobuf/BinaryEncodingSizeVisitor.swift; sourceTree = "<group>"; };
-		A9CF62217C10E39A43772424BF83F2C8 /* YapDatabaseTransaction+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "YapDatabaseTransaction+OWS.h"; sourceTree = "<group>"; };
 		A9F551CB87BB55C6633B43E05AF47924 /* YapDatabaseFullTextSearchConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseFullTextSearchConnection.h; path = YapDatabase/Extensions/FullTextSearch/YapDatabaseFullTextSearchConnection.h; sourceTree = "<group>"; };
-		AA2B07F87BCF71573F1ED93156CFCA4C /* OWSBlockingManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSBlockingManager.m; sourceTree = "<group>"; };
-		AA2DED23BB0CCDE2DE725F56D0EF2C45 /* TSErrorMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSErrorMessage.h; sourceTree = "<group>"; };
+		AA05AF9333FB9712B7FF4505C0A78AB9 /* SignalServiceKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = SignalServiceKit.modulemap; sourceTree = "<group>"; };
 		AA350871AFF95381B5A148201715117B /* DoubleFormatter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DoubleFormatter.swift; path = Sources/SwiftProtobuf/DoubleFormatter.swift; sourceTree = "<group>"; };
-		AA66A7D411F6CF3F10DCFFD51EB7BE49 /* OWSOutgoingNullMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSOutgoingNullMessage.m; sourceTree = "<group>"; };
 		AA978D7F7D91B1C8EA523B4442AF9166 /* UnknownStorage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = UnknownStorage.swift; path = Sources/SwiftProtobuf/UnknownStorage.swift; sourceTree = "<group>"; };
 		AAB35B83FB2BC5E601F7F16C15E5D611 /* aestab.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = aestab.h; path = SSZipArchive/minizip/aes/aestab.h; sourceTree = "<group>"; };
-		AB583B11EEFA4314CC7C2B58705B4C00 /* OWSDisappearingMessagesConfigurationMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDisappearingMessagesConfigurationMessage.h; sourceTree = "<group>"; };
 		AB59B817CAE3298436113243F344F68D /* YYAnimatedImageView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YYAnimatedImageView.h; path = YYImage/YYAnimatedImageView.h; sourceTree = "<group>"; };
 		ABF28BFF799CAC77AD24F8881A7D5315 /* Descriptor.pb.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = Descriptor.pb.m; path = src/runtime/Classes/Descriptor.pb.m; sourceTree = "<group>"; };
 		AC20F8EF40957CB3AD5A644D75DFC94E /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/Accelerate.framework; sourceTree = DEVELOPER_DIR; };
-		AC602C0278DCABEE68225B9C59961987 /* NSObject+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSObject+OWS.h"; sourceTree = "<group>"; };
-		AC6D9C363A20C0E37DC236C365AE7D03 /* DataSource.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = DataSource.h; sourceTree = "<group>"; };
-		AC812AF6B4EC91F9F83930F603B6B705 /* FingerprintProto.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FingerprintProto.swift; sourceTree = "<group>"; };
+		AC722862EA7AF7EACCD5042E9C902DEC /* CDSSigningCertificate.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = CDSSigningCertificate.m; sourceTree = "<group>"; };
 		ACA16AB8D475BBCF7AB76CDD102AA582 /* Message+JSONAdditions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Message+JSONAdditions.swift"; path = "Sources/SwiftProtobuf/Message+JSONAdditions.swift"; sourceTree = "<group>"; };
 		ACF58A3FE59D879F50FBE2AF83A73D06 /* CocoaLumberjack-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CocoaLumberjack-umbrella.h"; sourceTree = "<group>"; };
-		AD882D52995294914A2C716BA1147D18 /* OWSFingerprintBuilder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSFingerprintBuilder.h; sourceTree = "<group>"; };
+		ACF9C8E73A5EB01307AF2E96B74261A1 /* TSGroupThread.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSGroupThread.h; sourceTree = "<group>"; };
+		AD6EFC8A6835A1CC299DC723A188189A /* TSAttachmentPointer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSAttachmentPointer.h; sourceTree = "<group>"; };
 		ADD6DE4415A2F4AE688D0816E28C13D9 /* YapDatabaseFullTextSearch.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseFullTextSearch.h; path = YapDatabase/Extensions/FullTextSearch/YapDatabaseFullTextSearch.h; sourceTree = "<group>"; };
 		ADD901589E87590DB6071D9B73DEF450 /* sha1.c */ = {isa = PBXFileReference; includeInIndex = 1; name = sha1.c; path = SSZipArchive/minizip/aes/sha1.c; sourceTree = "<group>"; };
-		ADEFB780F5009781A090E569DB299286 /* WeakTimer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = WeakTimer.swift; sourceTree = "<group>"; };
+		ADEC441F01338CB4BA847F06A59FD1C5 /* TextSecureKitEnv.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = TextSecureKitEnv.m; path = SignalServiceKit/src/TextSecureKitEnv.m; sourceTree = "<group>"; };
+		AE1C049FE1FC8213362E219A5FCECB93 /* OWSMessageReceiver.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSMessageReceiver.m; sourceTree = "<group>"; };
 		AE1C78AA1CAD7A06B88ACB5FDB9D637D /* Mantle.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Mantle.modulemap; sourceTree = "<group>"; };
 		AE2112E6CEF11172AB1EA427CE9ADEED /* YDBCKMappingTableInfo.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YDBCKMappingTableInfo.m; path = YapDatabase/Extensions/CloudKit/Internal/YDBCKMappingTableInfo.m; sourceTree = "<group>"; };
 		AE7FEB1517C1F6482D09F86A6A0E2B11 /* YapDatabaseTransaction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseTransaction.m; path = YapDatabase/YapDatabaseTransaction.m; sourceTree = "<group>"; };
 		AE8DA7708745CD54B5E9352390C9F197 /* AFHTTPSessionManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFHTTPSessionManager.h; path = AFNetworking/AFHTTPSessionManager.h; sourceTree = "<group>"; };
 		AEE0A367D4F78E64DF896DFFE2997E30 /* YapCollectionKey.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapCollectionKey.m; path = YapDatabase/Utilities/YapCollectionKey.m; sourceTree = "<group>"; };
 		AEFB4CAD06BB60FD3B68D846D188985E /* YapDatabaseConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseConnection.h; path = YapDatabase/YapDatabaseConnection.h; sourceTree = "<group>"; };
-		AF1054BB0D5E9DF6B0DCD555B8A9EAC9 /* OWSGroupsOutputStream.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSGroupsOutputStream.h; sourceTree = "<group>"; };
 		AF3DA11CD9B47FE040AAB36EA62B5852 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/CoreTelephony.framework; sourceTree = DEVELOPER_DIR; };
 		AF55029E4C9991D6B841823015871A82 /* MTLReflection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MTLReflection.h; path = Mantle/MTLReflection.h; sourceTree = "<group>"; };
 		AF7E5D23BC30F25C161A7FFE492B653F /* NSRunLoop+SRWebSocketPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSRunLoop+SRWebSocketPrivate.h"; path = "SocketRocket/Internal/NSRunLoop+SRWebSocketPrivate.h"; sourceTree = "<group>"; };
 		AF7F82B27164AE466C3896E87FA8C4CF /* YapDatabaseCrossProcessNotification.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCrossProcessNotification.h; path = YapDatabase/Extensions/CrossProcessNotification/YapDatabaseCrossProcessNotification.h; sourceTree = "<group>"; };
 		AF828BA13C947D6A33C7FAF31A5FBDD6 /* YapProxyObject.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapProxyObject.h; path = YapDatabase/Utilities/YapProxyObject.h; sourceTree = "<group>"; };
 		AFB4BA852DF5BDC042BB91EE757B751B /* WhisperTextProtocol.pb.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = WhisperTextProtocol.pb.h; path = AxolotlKit/Classes/Protobuffs/WhisperTextProtocol.pb.h; sourceTree = "<group>"; };
-		AFC86810E9AA895404160BAE2FACA1BD /* OWSContactsOutputStream.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSContactsOutputStream.m; sourceTree = "<group>"; };
 		AFF9FF71AB35D899172D06C2C4A65F79 /* YapDatabaseConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseConnection.m; path = YapDatabase/YapDatabaseConnection.m; sourceTree = "<group>"; };
 		AFFB3E575BAFC3C0F697BED25AA918B2 /* ProtoNameProviding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ProtoNameProviding.swift; path = Sources/SwiftProtobuf/ProtoNameProviding.swift; sourceTree = "<group>"; };
 		B041650EE5DB19143E573E13C98192DA /* ioapi_buf.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ioapi_buf.h; path = SSZipArchive/minizip/ioapi_buf.h; sourceTree = "<group>"; };
+		B06E0C4A729577AF4B6715808B7506CA /* OWSSwiftUtils.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OWSSwiftUtils.swift; sourceTree = "<group>"; };
 		B083A571AF322BB8548B42D677F85C1E /* YapDatabaseCloudCoreOperation.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseCloudCoreOperation.m; path = YapDatabase/Extensions/CloudCore/Utilities/Operations/YapDatabaseCloudCoreOperation.m; sourceTree = "<group>"; };
 		B0B61C2A53FF0D4C7EFF5A456DB92AFD /* Pods_SignalMessaging.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SignalMessaging.framework; path = "Pods-SignalMessaging.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
 		B0BC0A740D0F439ED9A9D064E2622F54 /* HashVisitor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HashVisitor.swift; path = Sources/SwiftProtobuf/HashVisitor.swift; sourceTree = "<group>"; };
@@ -2934,99 +2927,106 @@
 		B14F578A939A2C4E5A72D306B54331F9 /* YapMemoryTable.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapMemoryTable.h; path = YapDatabase/Internal/YapMemoryTable.h; sourceTree = "<group>"; };
 		B1B565D3EB5EC67F53C3B14DA20FF35D /* Reachability.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Reachability.modulemap; sourceTree = "<group>"; };
 		B1E3F343179DCCEB57A5AD9C91034D18 /* CodedInputStream.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CodedInputStream.m; path = src/runtime/Classes/CodedInputStream.m; sourceTree = "<group>"; };
-		B2008E36DEA55E0C3D794B9E8A2C39BF /* TSAccountManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSAccountManager.h; sourceTree = "<group>"; };
-		B2246C0044CD8CAEBF4E2903FBAA75CA /* OWSOutgoingSyncMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSOutgoingSyncMessage.h; sourceTree = "<group>"; };
 		B245E4D7439151C042D72F909375767B /* YapDatabaseSearchResultsViewTransaction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseSearchResultsViewTransaction.h; path = YapDatabase/Extensions/SearchResultsView/YapDatabaseSearchResultsViewTransaction.h; sourceTree = "<group>"; };
 		B24B789CDBDF256D4F96F0E9C5A839AC /* DDAbstractDatabaseLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDAbstractDatabaseLogger.m; path = Classes/DDAbstractDatabaseLogger.m; sourceTree = "<group>"; };
 		B25983951E9473A96ACC840AF59472F1 /* YapDatabaseHooks.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseHooks.h; path = YapDatabase/Extensions/Hooks/YapDatabaseHooks.h; sourceTree = "<group>"; };
 		B25A55CEBBBA7E20872FFE8CB072E344 /* YapDatabaseCloudCore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCloudCore.h; path = YapDatabase/Extensions/CloudCore/YapDatabaseCloudCore.h; sourceTree = "<group>"; };
-		B294575969E66B07ACFB2674C1A98375 /* MIMETypeUtil.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = MIMETypeUtil.m; sourceTree = "<group>"; };
 		B2BA59DFA6BC4ABCDA37EA3B4811B25C /* YapDatabaseManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseManager.m; path = YapDatabase/Internal/YapDatabaseManager.m; sourceTree = "<group>"; };
 		B313109C03454A3B429D30EFC76003AA /* FieldTypes.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = FieldTypes.swift; path = Sources/SwiftProtobuf/FieldTypes.swift; sourceTree = "<group>"; };
+		B390F841F9CDC0BE583E391284ACDD14 /* OWSMessageHandler.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSMessageHandler.h; sourceTree = "<group>"; };
 		B3AE6BF7DE72BC63495FF7F39358FCD2 /* GeneratedMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GeneratedMessage.m; path = src/runtime/Classes/GeneratedMessage.m; sourceTree = "<group>"; };
 		B3D5F8668DE3322B107769669B8C3ADA /* YapDatabase-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "YapDatabase-prefix.pch"; sourceTree = "<group>"; };
-		B41698C194A322CF24D5E3E5ED4C3A4E /* OWSDeviceProvisioner.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDeviceProvisioner.m; sourceTree = "<group>"; };
 		B423DC7873B0C58405217476075A5FF6 /* NSURLRequest+SRWebSocket.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSURLRequest+SRWebSocket.h"; path = "SocketRocket/NSURLRequest+SRWebSocket.h"; sourceTree = "<group>"; };
 		B42BF7102F457935E3CF2AE9AF459FE8 /* SocketRocket.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SocketRocket.h; path = SocketRocket/SocketRocket.h; sourceTree = "<group>"; };
 		B44343E2ABF9444F0F9E13D6A2827988 /* YapDatabaseRelationship.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseRelationship.h; path = YapDatabase/Extensions/Relationships/YapDatabaseRelationship.h; sourceTree = "<group>"; };
 		B4438BAB84F791E234FEBC45783FF2A0 /* ExtendableMessageBuilder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ExtendableMessageBuilder.h; path = src/runtime/Classes/ExtendableMessageBuilder.h; sourceTree = "<group>"; };
 		B45594B4099E67CFEE631CC4E736B146 /* YapDatabaseRelationshipTransaction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseRelationshipTransaction.h; path = YapDatabase/Extensions/Relationships/YapDatabaseRelationshipTransaction.h; sourceTree = "<group>"; };
-		B46F91D5B8C54FD4BB7CA312D9204B1E /* OWSSwiftUtils.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OWSSwiftUtils.swift; sourceTree = "<group>"; };
-		B480A1222618D41343C61A82E0C2825F /* SecurityUtils.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = SecurityUtils.m; sourceTree = "<group>"; };
 		B48256D6CD538E23A29B2B9B64E572B8 /* ge_add.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ge_add.c; path = Sources/ed25519/ge_add.c; sourceTree = "<group>"; };
 		B48B60F293E2E966215BDE813F0AEACC /* fe_sq.c */ = {isa = PBXFileReference; includeInIndex = 1; name = fe_sq.c; path = Sources/ed25519/fe_sq.c; sourceTree = "<group>"; };
-		B4965DA1D17633A8F76C1168BE750652 /* NSString+SSK.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSString+SSK.h"; sourceTree = "<group>"; };
+		B490C198DACABB332BF11BC3A5A04149 /* OWSUploadOperation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSUploadOperation.h; sourceTree = "<group>"; };
+		B49A98FB3349B090ABFD0C5FE42C1CF1 /* OWSWebsocketSecurityPolicy.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSWebsocketSecurityPolicy.h; sourceTree = "<group>"; };
+		B4A9FCA8A5D22505E86EB851F171C428 /* OWSDeviceProvisioningService.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDeviceProvisioningService.h; sourceTree = "<group>"; };
 		B4DA5756A9C1E41801AD71A8B3A7CC3B /* YapDatabaseHooksTransaction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseHooksTransaction.m; path = YapDatabase/Extensions/Hooks/YapDatabaseHooksTransaction.m; sourceTree = "<group>"; };
+		B5045049F1E808F3792B6EDA18A38117 /* ProvisioningProto.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ProvisioningProto.swift; sourceTree = "<group>"; };
 		B5179DFDF94AE7223AC95639949A57D3 /* YapBidirectionalCache.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapBidirectionalCache.m; path = YapDatabase/Utilities/YapBidirectionalCache.m; sourceTree = "<group>"; };
 		B558B3A0DBC1C786689E791EAC8433A2 /* ATAppUpdater-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "ATAppUpdater-dummy.m"; sourceTree = "<group>"; };
 		B57991DC62AAD2A2FE5474D07FCD7571 /* CocoaLumberjack-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CocoaLumberjack-prefix.pch"; sourceTree = "<group>"; };
 		B592B5360BA8985677EA95AB9EEB49B1 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		B596CEBFF2A9DE1428FFCDE27FD8F8CC /* OWSCensorshipConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSCensorshipConfiguration.m; sourceTree = "<group>"; };
+		B5CC430919A3E517A006286B87D65EE7 /* Cryptography.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = Cryptography.m; sourceTree = "<group>"; };
 		B5CDAFB29DB81445BAB96A5B7F018481 /* crypto_uint64.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = crypto_uint64.h; path = Sources/ed25519/nacl_includes/crypto_uint64.h; sourceTree = "<group>"; };
-		B60201AB93CB0DF5D19C28BDB0E38E2E /* ias-root.cer */ = {isa = PBXFileReference; includeInIndex = 1; name = "ias-root.cer"; path = "SignalServiceKit/Resources/Certificates/ias-root.cer"; sourceTree = "<group>"; };
-		B62293EF5E91E1CDF187A64F88092D36 /* FunctionalUtil.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = FunctionalUtil.h; sourceTree = "<group>"; };
 		B675A4C5D9D79F70EE5347BB170D5A9A /* CustomJSONCodable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CustomJSONCodable.swift; path = Sources/SwiftProtobuf/CustomJSONCodable.swift; sourceTree = "<group>"; };
-		B6C0EC5FE802FA902719989B5E8D3DE1 /* TSErrorMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSErrorMessage.m; sourceTree = "<group>"; };
+		B69B6FE11B0D9FCB40AC28C630D1B5DC /* SignalServiceKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "SignalServiceKit-dummy.m"; sourceTree = "<group>"; };
 		B6E84C8E7B1B34E85694371E81A257E3 /* PureLayout-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PureLayout-umbrella.h"; sourceTree = "<group>"; };
-		B70282588C815066CFA577E06E12AC22 /* OWSCallOfferMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSCallOfferMessage.h; sourceTree = "<group>"; };
-		B747C5B68A7C6451B2CDDA6BB3364302 /* OWSFingerprint.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSFingerprint.h; sourceTree = "<group>"; };
+		B726CF216E4408AED51CC534AFA9DDF5 /* TSDatabaseView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSDatabaseView.m; sourceTree = "<group>"; };
 		B76C37DE19389B5F7D7527671B6CFFC7 /* ATAppUpdater.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = ATAppUpdater.xcconfig; sourceTree = "<group>"; };
 		B79C96CEA903260F853177B3D8CF968B /* ChainKey.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = ChainKey.m; path = AxolotlKit/Classes/Ratchet/ChainKey.m; sourceTree = "<group>"; };
 		B7FF5E6D32130F1C3A379788275CF17D /* ATAppUpdater.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = ATAppUpdater.framework; path = ATAppUpdater.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B8015C4A33AEC149C912C4BA8493B783 /* Reachability.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Reachability.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		B81AE76BE4A2311A5D18790B3D322988 /* SignalAccount.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = SignalAccount.m; sourceTree = "<group>"; };
-		B8AF60FF53D28195286F2509AD3AFFC5 /* WebSocketResources.pb.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = WebSocketResources.pb.h; sourceTree = "<group>"; };
+		B8B932F27B6A1D9027A7DE34B77A3704 /* OWSVerificationStateChangeMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSVerificationStateChangeMessage.m; sourceTree = "<group>"; };
+		B8C905E6DEF334DD49AFAEE885D14A18 /* TextSecureKitEnv.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TextSecureKitEnv.h; path = SignalServiceKit/src/TextSecureKitEnv.h; sourceTree = "<group>"; };
 		B8CC44B17725A2C7F41A01E812A8D723 /* Utilities.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = Utilities.m; path = src/runtime/Classes/Utilities.m; sourceTree = "<group>"; };
-		B92B15C5566263821494E521EE9C46D5 /* TSInvalidIdentityKeySendingErrorMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSInvalidIdentityKeySendingErrorMessage.h; sourceTree = "<group>"; };
+		B8FA1C39CD90A08A728D5392075FAF01 /* OWSIncompleteCallsJob.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSIncompleteCallsJob.m; sourceTree = "<group>"; };
 		B9399EBEE32C7923D33729DD709F63FC /* AbstractMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AbstractMessage.m; path = src/runtime/Classes/AbstractMessage.m; sourceTree = "<group>"; };
 		B94C0D15C274CCE8FC52788029FCB237 /* YapDatabaseCloudKit.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCloudKit.h; path = YapDatabase/Extensions/CloudKit/YapDatabaseCloudKit.h; sourceTree = "<group>"; };
 		B96AD47705EDF6B495B624D9BFF062C5 /* YapDatabaseManualViewConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseManualViewConnection.m; path = YapDatabase/Extensions/ManualView/YapDatabaseManualViewConnection.m; sourceTree = "<group>"; };
+		B9AD63DC8216282BFDC5A98D4AD28A71 /* OWSDevicesService.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDevicesService.m; sourceTree = "<group>"; };
 		B9BAE6B24BA26185ABDA7C4DC67144E9 /* SRWebSocket.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SRWebSocket.m; path = SocketRocket/SRWebSocket.m; sourceTree = "<group>"; };
+		B9DB4A6FCBD42EC3737D0730D500E442 /* TSContactThread.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSContactThread.m; sourceTree = "<group>"; };
+		B9E278B855144B95A2081BB20F1E694F /* OWSIncomingSentMessageTranscript.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSIncomingSentMessageTranscript.h; sourceTree = "<group>"; };
+		BA39197A244B39F627DEAD8E6032D707 /* TSInvalidIdentityKeyReceivingErrorMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSInvalidIdentityKeyReceivingErrorMessage.h; sourceTree = "<group>"; };
 		BA3AAFBB1F002B3216E13F5C822DE62A /* Google_Protobuf_Any+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Google_Protobuf_Any+Extensions.swift"; path = "Sources/SwiftProtobuf/Google_Protobuf_Any+Extensions.swift"; sourceTree = "<group>"; };
 		BA60E92B1C71A73FC40EF4BCFFC8B8B7 /* SAMKeychain.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SAMKeychain.xcconfig; sourceTree = "<group>"; };
 		BA6E7166A7C6434DA6A39C3F1C434C08 /* AFImageDownloader.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFImageDownloader.m; path = "UIKit+AFNetworking/AFImageDownloader.m"; sourceTree = "<group>"; };
 		BA8127B4D42F47177A65F53048274ED9 /* YapMutationStack.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapMutationStack.m; path = YapDatabase/Utilities/YapMutationStack.m; sourceTree = "<group>"; };
+		BA87CFE16BA12115EFCC9A6CFE0DED6F /* OWSStorage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSStorage.h; sourceTree = "<group>"; };
 		BA9D05D8854F3753719699C314C8245C /* YapDatabaseExtensionTransaction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseExtensionTransaction.m; path = YapDatabase/Extensions/Protocol/YapDatabaseExtensionTransaction.m; sourceTree = "<group>"; };
 		BAC068985EA7FA6CC4329EB7E863667D /* NSURLSession+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSURLSession+AnyPromise.m"; path = "Extensions/Foundation/Sources/NSURLSession+AnyPromise.m"; sourceTree = "<group>"; };
 		BAE44806190815180335069735559778 /* wrappers.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = wrappers.pb.swift; path = Sources/SwiftProtobuf/wrappers.pb.swift; sourceTree = "<group>"; };
-		BB3436A861110E3D49FAEE5CC6B063DA /* OWSDisappearingMessagesConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDisappearingMessagesConfiguration.m; sourceTree = "<group>"; };
+		BB47E0CB75572AC8F82A63BFC9EA487F /* AppReadiness.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = AppReadiness.h; sourceTree = "<group>"; };
+		BB6557D2C8E0B566296A5B3300F692A3 /* AppReadiness.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = AppReadiness.m; sourceTree = "<group>"; };
 		BB669F816DF19D9FA59CFBE1C684A158 /* YapDatabaseViewOptions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseViewOptions.h; path = YapDatabase/Extensions/View/YapDatabaseViewOptions.h; sourceTree = "<group>"; };
 		BBC26C84ECC3E9D6EAF385ECBA6A312A /* ge_p3_0.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ge_p3_0.c; path = Sources/ed25519/ge_p3_0.c; sourceTree = "<group>"; };
 		BBE7A2757F43CC87644C8DB7A07224A1 /* DDLogMacros.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDLogMacros.h; path = Classes/DDLogMacros.h; sourceTree = "<group>"; };
 		BBFFFCEC874E5141C9829F20E1391341 /* BinaryEncodingError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BinaryEncodingError.swift; path = Sources/SwiftProtobuf/BinaryEncodingError.swift; sourceTree = "<group>"; };
-		BC00444A687003EDA96AE7F5EE6D820D /* OWSMessageManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSMessageManager.h; sourceTree = "<group>"; };
 		BC00808E62C639FD60363570CD3A07B3 /* Varint.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Varint.swift; path = Sources/SwiftProtobuf/Varint.swift; sourceTree = "<group>"; };
 		BC1E6A076DE0399CD03A9144E4A9C5E6 /* AxolotlParameters.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AxolotlParameters.h; path = AxolotlKit/Classes/Ratchet/AxolotlParameters.h; sourceTree = "<group>"; };
 		BC4FAF7DFB41E17908DEAAD990E3045C /* ExtendableMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ExtendableMessage.h; path = src/runtime/Classes/ExtendableMessage.h; sourceTree = "<group>"; };
-		BC5A9F0F600558C737EE5920E6073297 /* TSYapDatabaseObject.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSYapDatabaseObject.m; sourceTree = "<group>"; };
+		BC6BB378E808FACCC665A106A33F4615 /* OWSCallBusyMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSCallBusyMessage.m; sourceTree = "<group>"; };
 		BC845DBF3D21D36ED80EB47DD758D521 /* ATAppUpdater.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ATAppUpdater.h; path = ATAppUpdater/ATAppUpdater.h; sourceTree = "<group>"; };
 		BC9F84F80852128D4763BDCA893FA2CE /* BinaryDecodingOptions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BinaryDecodingOptions.swift; path = Sources/SwiftProtobuf/BinaryDecodingOptions.swift; sourceTree = "<group>"; };
-		BCF2316B1AADDCBE5CD553C6EE306731 /* textsecure.cer */ = {isa = PBXFileReference; includeInIndex = 1; name = textsecure.cer; path = SignalServiceKit/Resources/Certificates/textsecure.cer; sourceTree = "<group>"; };
 		BD6F5E9A99EC98E84A1DEA1BE5B4B8CA /* YapDatabaseActionManagerConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseActionManagerConnection.h; path = YapDatabase/Extensions/ActionManager/YapDatabaseActionManagerConnection.h; sourceTree = "<group>"; };
-		BDB3FA54232098D6ECF79133DB208B6A /* OWSPrimaryStorage+messageIDs.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OWSPrimaryStorage+messageIDs.h"; sourceTree = "<group>"; };
-		BDD81A343551770E69146E2D460CD20F /* UIImage+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "UIImage+OWS.h"; sourceTree = "<group>"; };
+		BDC0B949D09ECD450295DAA9D48F7179 /* TSInvalidIdentityKeyErrorMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSInvalidIdentityKeyErrorMessage.h; sourceTree = "<group>"; };
 		BDDC248FB22A536F0EE4E1078BE8F223 /* DDAbstractDatabaseLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDAbstractDatabaseLogger.h; path = Classes/DDAbstractDatabaseLogger.h; sourceTree = "<group>"; };
 		BE07946BCA78241DE7162E91FE4D8601 /* YapDatabaseSearchResultsViewConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseSearchResultsViewConnection.m; path = YapDatabase/Extensions/SearchResultsView/YapDatabaseSearchResultsViewConnection.m; sourceTree = "<group>"; };
 		BE383F0B8FA825A3C8F64D2114F12594 /* WireFormat.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = WireFormat.m; path = src/runtime/Classes/WireFormat.m; sourceTree = "<group>"; };
 		BE3FAB9F7E307A50F5CB7A02A72CDBE0 /* YapProxyObject.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapProxyObject.m; path = YapDatabase/Utilities/YapProxyObject.m; sourceTree = "<group>"; };
-		BE49237E59FC2346E987BB5106FB75E4 /* OWSPrimaryStorage+SignedPreKeyStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OWSPrimaryStorage+SignedPreKeyStore.h"; sourceTree = "<group>"; };
 		BE5FE9B6F2878265EF469555922AD5CF /* ExtensionFieldValueSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExtensionFieldValueSet.swift; path = Sources/SwiftProtobuf/ExtensionFieldValueSet.swift; sourceTree = "<group>"; };
+		BE76AB5FFB6311B4A9F77BE3C03F6928 /* OWSMessageUtils.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSMessageUtils.m; sourceTree = "<group>"; };
+		BE94B6096122158DB37998FAC9A3DADD /* OWSLinkedDeviceReadReceipt.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSLinkedDeviceReadReceipt.m; sourceTree = "<group>"; };
 		BECC9C24A3B8A9CDB422142A29650041 /* ProtocolBuffers.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ProtocolBuffers.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		BED91F6DA8CD15F04C3C7D4C1F46CD84 /* OWSReadTracking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSReadTracking.h; sourceTree = "<group>"; };
 		BEEFD679127BDB16BEB80AC97628AD57 /* BobAxolotlParameters.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = BobAxolotlParameters.m; path = AxolotlKit/Classes/Ratchet/BobAxolotlParameters.m; sourceTree = "<group>"; };
 		BF1003D0DF35EF668B7D6B3B27396BED /* SendingChain.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SendingChain.h; path = AxolotlKit/Classes/Ratchet/SendingChain.h; sourceTree = "<group>"; };
 		BF1C03FAF3F25B5FF3230A38A72A80FC /* ge_p3_dbl.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ge_p3_dbl.c; path = Sources/ed25519/ge_p3_dbl.c; sourceTree = "<group>"; };
 		BF26754818B54055495143423F4F2DE4 /* YapDatabaseStatement.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseStatement.h; path = YapDatabase/Internal/YapDatabaseStatement.h; sourceTree = "<group>"; };
+		BF5EEF1FE3E053C50ECB2A79007C27E7 /* OWSBlockedPhoneNumbersMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSBlockedPhoneNumbersMessage.h; sourceTree = "<group>"; };
+		BF5F5F7F1E0ED6E3A2178EAE80A9230C /* TSRequest.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSRequest.h; sourceTree = "<group>"; };
 		BF7610BEA7CD49263A8711B227FCD4B5 /* SendingChain.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SendingChain.m; path = AxolotlKit/Classes/Ratchet/SendingChain.m; sourceTree = "<group>"; };
+		BF9E7C59CAB1D19FBD0380C4D716E611 /* OWSOrphanedDataCleaner.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSOrphanedDataCleaner.h; sourceTree = "<group>"; };
 		BFB41A7689CA19B4B040C5D19E6343CE /* Pods-Signal.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Signal.release.xcconfig"; sourceTree = "<group>"; };
 		BFE8EC7EA83A7AD094A9D28A1BD3F9C1 /* YapDatabaseViewPage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseViewPage.h; path = YapDatabase/Extensions/View/Internal/YapDatabaseViewPage.h; sourceTree = "<group>"; };
-		C00943CF0CE912037DC1303592C3F090 /* OWSDeviceProvisioningService.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDeviceProvisioningService.h; sourceTree = "<group>"; };
+		C024A4D0C3AA1DDA449AF3D5305F7798 /* OWSPrimaryStorage+SessionStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OWSPrimaryStorage+SessionStore.h"; sourceTree = "<group>"; };
 		C0408DCEA314B022A342F8DFC8705D9C /* YapDatabaseViewTransaction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseViewTransaction.h; path = YapDatabase/Extensions/View/YapDatabaseViewTransaction.h; sourceTree = "<group>"; };
-		C075CB74306186930823FD7B24B4B3E4 /* GSR2.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = GSR2.crt; path = SignalServiceKit/Resources/Certificates/GSR2.crt; sourceTree = "<group>"; };
+		C0733F441FB33CFC0D663540EBBCA4E2 /* TSRequest.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSRequest.m; sourceTree = "<group>"; };
 		C08CC4B1A70FF79391F2D555B6F8039D /* fe_tobytes.c */ = {isa = PBXFileReference; includeInIndex = 1; name = fe_tobytes.c; path = Sources/ed25519/fe_tobytes.c; sourceTree = "<group>"; };
+		C090C9385E2A11FA3B4CD4A9AE2336C6 /* FingerprintProto.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FingerprintProto.swift; sourceTree = "<group>"; };
 		C092809F3F5225DD9369F490105FDDCD /* YapDatabaseExtensionTransaction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseExtensionTransaction.h; path = YapDatabase/Extensions/Protocol/YapDatabaseExtensionTransaction.h; sourceTree = "<group>"; };
 		C09343932AA2FE4941E78112CC58A0CD /* Pods-SignalTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SignalTests-acknowledgements.markdown"; sourceTree = "<group>"; };
 		C09675336CB4CCD42E9DBDF66FE80C3A /* YapDatabaseFilteredViewTransaction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseFilteredViewTransaction.m; path = YapDatabase/Extensions/FilteredView/YapDatabaseFilteredViewTransaction.m; sourceTree = "<group>"; };
+		C0BE95DF7A601EE23E349D2E08AEF1D5 /* OWSCallIceUpdateMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSCallIceUpdateMessage.h; sourceTree = "<group>"; };
+		C0C9610E40AC6E7207697D426289ED1C /* SecurityUtils.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = SecurityUtils.m; sourceTree = "<group>"; };
 		C0D9B03D9D4F24634D0D348BCD21308D /* PromiseKit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PromiseKit-umbrella.h"; sourceTree = "<group>"; };
+		C0ECD69E2A2BAA46B1D5417C89310E05 /* GTSR2.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = GTSR2.crt; path = SignalServiceKit/Resources/Certificates/GTSR2.crt; sourceTree = "<group>"; };
 		C0FF4BBA91D66B7FE2F72F2A9271086F /* DDLog+LOGV.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "DDLog+LOGV.h"; path = "Classes/DDLog+LOGV.h"; sourceTree = "<group>"; };
 		C1226ECB940A2EC82DA29114E2924353 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
 		C1332F2E64D8767EFAE40416BFABEB93 /* zip.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = zip.h; path = SSZipArchive/minizip/zip.h; sourceTree = "<group>"; };
@@ -3035,222 +3035,214 @@
 		C1734DB3D0C3A40A9CA1296B7C519642 /* race.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = race.swift; path = Sources/race.swift; sourceTree = "<group>"; };
 		C1C585131A28CC29F17B3BF25EDBFC03 /* after.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = after.m; path = Sources/after.m; sourceTree = "<group>"; };
 		C1D4AC777820F67F78302AADC7CB8124 /* YapDatabaseFilteredView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseFilteredView.h; path = YapDatabase/Extensions/FilteredView/YapDatabaseFilteredView.h; sourceTree = "<group>"; };
-		C2ABEA8D2B6C2178AF07899A274BCCF5 /* OWSOutgoingCallMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSOutgoingCallMessage.h; sourceTree = "<group>"; };
 		C2C9BEA1710BA38463FBF9F447E194AE /* base2.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = base2.h; path = Sources/ed25519/base2.h; sourceTree = "<group>"; };
-		C2D38312B925794428A3BB94D8BFFC4A /* OWSMessageReceiver.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSMessageReceiver.h; sourceTree = "<group>"; };
 		C2DC83F04B746D36BDEC07EA8EBFF15B /* PromiseKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PromiseKit-prefix.pch"; sourceTree = "<group>"; };
-		C2F962A2A0360E3980FB6E741AF67E66 /* OWSSignaliOSProtos.pb.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSSignaliOSProtos.pb.m; sourceTree = "<group>"; };
-		C34574B2BFD4CCEE88AA9979DF847E61 /* TSMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSMessage.h; sourceTree = "<group>"; };
 		C3490717DDC34B2527D43599770913D8 /* YapDatabaseConnectionState.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseConnectionState.m; path = YapDatabase/Internal/YapDatabaseConnectionState.m; sourceTree = "<group>"; };
-		C38D26455FB633E8962A251659E27CD6 /* TSGroupModel.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSGroupModel.m; sourceTree = "<group>"; };
 		C39734D1F85C8C7CD804B81F2CEC7DDA /* EXTRuntimeExtensions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = EXTRuntimeExtensions.h; path = Mantle/extobjc/EXTRuntimeExtensions.h; sourceTree = "<group>"; };
 		C3A0EC177F30640A10FF34827918C943 /* JSONScanner.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONScanner.swift; path = Sources/SwiftProtobuf/JSONScanner.swift; sourceTree = "<group>"; };
-		C3E4631DDCCA58353A3C8A2D5BB9F730 /* OWSContact+Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OWSContact+Private.h"; sourceTree = "<group>"; };
-		C4038DB00C5382E26B4F41A442873113 /* OWSHTTPSecurityPolicy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSHTTPSecurityPolicy.m; sourceTree = "<group>"; };
 		C48CEB8F37B7E1F3FA73464BEB5BF6CA /* crypto_hash_sha512.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = crypto_hash_sha512.h; path = Sources/ed25519/additions/crypto_hash_sha512.h; sourceTree = "<group>"; };
-		C4984B9072AF2012DED196B7A67C195B /* GTSR4.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = GTSR4.crt; path = SignalServiceKit/Resources/Certificates/GTSR4.crt; sourceTree = "<group>"; };
-		C4A9992ED6AB42966333730EB2E076E8 /* TSThread.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSThread.h; sourceTree = "<group>"; };
+		C513ED51764AD18FE8B2E5FFFD78D1AB /* OWSReadReceiptsForLinkedDevicesMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSReadReceiptsForLinkedDevicesMessage.m; sourceTree = "<group>"; };
 		C52E6AEC7855E1D547AF5607F2025051 /* Mantle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Mantle.framework; path = Mantle.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C554D54AD4352A273FD9675A74691E23 /* YapDatabaseConnectionProxy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseConnectionProxy.m; path = YapDatabase/Extensions/ConnectionProxy/YapDatabaseConnectionProxy.m; sourceTree = "<group>"; };
 		C62D74C5AF13A6CBA84F046985FD78A7 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; };
-		C64097879454AF28094C433B3270F4BA /* OWSDisappearingMessagesFinder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDisappearingMessagesFinder.h; sourceTree = "<group>"; };
+		C62FD32DA9CE379D1B9EBAF216C3C4E6 /* OWSPrimaryStorage+SignedPreKeyStore.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OWSPrimaryStorage+SignedPreKeyStore.m"; sourceTree = "<group>"; };
 		C644C301D215785F9F858AA21E50DF76 /* ATAppUpdater.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = ATAppUpdater.m; path = ATAppUpdater/ATAppUpdater.m; sourceTree = "<group>"; };
 		C64B9ECB6026C722B12C9544CA16E1B6 /* YapDatabaseCloudKitOptions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseCloudKitOptions.m; path = YapDatabase/Extensions/CloudKit/YapDatabaseCloudKitOptions.m; sourceTree = "<group>"; };
+		C64C2ED6C40054485F42A621DD591A2E /* TSMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSMessage.m; sourceTree = "<group>"; };
+		C680BB13CBF4519CD87BDD68A522D631 /* OWSProvisioningMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSProvisioningMessage.m; sourceTree = "<group>"; };
 		C68606CDC165E3310DF47EF1F432B104 /* NSTask+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSTask+AnyPromise.m"; path = "Extensions/Foundation/Sources/NSTask+AnyPromise.m"; sourceTree = "<group>"; };
+		C6BBD211883D04DA7B250F0DC15F8457 /* NSURLSessionDataTask+StatusCode.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSURLSessionDataTask+StatusCode.h"; sourceTree = "<group>"; };
 		C6CC222D6DADC1EF468439F7678BD542 /* YapSet.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapSet.h; path = YapDatabase/Utilities/YapSet.h; sourceTree = "<group>"; };
 		C6D03595AAC439461CC75F0D2913848B /* ExtensionRegistry.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ExtensionRegistry.h; path = src/runtime/Classes/ExtensionRegistry.h; sourceTree = "<group>"; };
 		C710CB3C6199788C97A23DB403BD0CC3 /* YapDatabaseViewLocator.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseViewLocator.h; path = YapDatabase/Extensions/View/Internal/YapDatabaseViewLocator.h; sourceTree = "<group>"; };
 		C72309A238215F5F051241C82A4709B9 /* Pods-SignalTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-SignalTests.modulemap"; sourceTree = "<group>"; };
 		C730C6A684EB5406E1F26FAD8DC7021D /* open.c */ = {isa = PBXFileReference; includeInIndex = 1; name = open.c; path = Sources/ed25519/open.c; sourceTree = "<group>"; };
 		C78ED5DDDA0D4F882669ED87262F5788 /* Google_Protobuf_FieldMask+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Google_Protobuf_FieldMask+Extensions.swift"; path = "Sources/SwiftProtobuf/Google_Protobuf_FieldMask+Extensions.swift"; sourceTree = "<group>"; };
+		C7E88C37B63D1B5450CC492FA86BAD77 /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.m; sourceTree = "<group>"; };
 		C7F93CCF9B5A4B84BEC3E5D81041B413 /* UIRefreshControl+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIRefreshControl+AFNetworking.h"; path = "UIKit+AFNetworking/UIRefreshControl+AFNetworking.h"; sourceTree = "<group>"; };
 		C80C5F00843A4DDD7A5B30655DB5A126 /* YapDatabase-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "YapDatabase-umbrella.h"; sourceTree = "<group>"; };
-		C847716500ADD439B3934452E92C60BA /* SignalServiceKit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SignalServiceKit-umbrella.h"; sourceTree = "<group>"; };
+		C821D636DA7F75D2248A5C07538E046A /* TSGroupThread.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSGroupThread.m; sourceTree = "<group>"; };
 		C848664D7AACA42948A142E649453E8E /* BobAxolotlParameters.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = BobAxolotlParameters.h; path = AxolotlKit/Classes/Ratchet/BobAxolotlParameters.h; sourceTree = "<group>"; };
-		C891B28F552BEE086699519DD3A6B0B6 /* ProvisioningProto.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ProvisioningProto.swift; sourceTree = "<group>"; };
-		C8AFB2C4A0FCBCCD6C5F40A7E568393D /* NSUserDefaults+OWS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSUserDefaults+OWS.m"; sourceTree = "<group>"; };
-		C8C41B93281D1BBE5185648A996590D1 /* OWSBackupFragment.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSBackupFragment.m; sourceTree = "<group>"; };
-		C99872F33DCEC174C60682096A58D305 /* TSPreKeyManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSPreKeyManager.m; sourceTree = "<group>"; };
-		C9D4985C424C72BB37C86E7E9B94F89C /* NSData+messagePadding.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSData+messagePadding.m"; sourceTree = "<group>"; };
+		C8B2EE64D6F657C5B0CF0123690D6831 /* NSArray+OWS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSArray+OWS.m"; sourceTree = "<group>"; };
+		C8DC041280F2D718B5BCEF334AEBAA54 /* TSSocketManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSSocketManager.h; sourceTree = "<group>"; };
+		C903E89B6E77C4981F352D4BBCF3B439 /* OWSFingerprintBuilder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSFingerprintBuilder.h; sourceTree = "<group>"; };
+		C92573B019E11BD3AF43675A65C38B8F /* TSSocketManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSSocketManager.m; sourceTree = "<group>"; };
+		C9D8F7328692DDAECB3C9A5DA5FFF986 /* SignalRecipient.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = SignalRecipient.m; sourceTree = "<group>"; };
 		C9EBB1188825ACD45CD0C842B426D17C /* AFNetworkActivityIndicatorManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFNetworkActivityIndicatorManager.h; path = "UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h"; sourceTree = "<group>"; };
+		CA10129A8A25EA149DA170C7393DB7E1 /* OWSAnalyticsEvents.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSAnalyticsEvents.h; sourceTree = "<group>"; };
+		CA446E27EF7B254698B5B24595A7381E /* OWSDevicesService.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDevicesService.h; sourceTree = "<group>"; };
 		CA5C56A2681B8CCC6C8DCBB09883D895 /* YapDatabaseSearchResultsViewTransaction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseSearchResultsViewTransaction.m; path = YapDatabase/Extensions/SearchResultsView/YapDatabaseSearchResultsViewTransaction.m; sourceTree = "<group>"; };
 		CAA16F790844C06CDA75AA3E813E27EE /* DDLog.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDLog.h; path = Classes/DDLog.h; sourceTree = "<group>"; };
 		CAA3AD1BD1DE97FEB8A1541541A46BF5 /* YapDatabaseFullTextSearchSnippetOptions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseFullTextSearchSnippetOptions.m; path = YapDatabase/Extensions/FullTextSearch/YapDatabaseFullTextSearchSnippetOptions.m; sourceTree = "<group>"; };
 		CB08194867F9B801952B0629669BF8CA /* RootKey.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RootKey.m; path = AxolotlKit/Classes/Ratchet/RootKey.m; sourceTree = "<group>"; };
 		CB2C7DE131565BA4D0B3A808C0F22AA7 /* YapMurmurHash.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapMurmurHash.m; path = YapDatabase/Utilities/YapMurmurHash.m; sourceTree = "<group>"; };
+		CB4648F164AB27CBC5E6109CB4D9C908 /* OWSProvisioningProtos.pb.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSProvisioningProtos.pb.h; sourceTree = "<group>"; };
+		CB7890D6B1B8D31D1F853CC076468B4C /* OWS2FAManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWS2FAManager.h; sourceTree = "<group>"; };
+		CBF741E0ACA119EAD241DB55E063666C /* TSIncomingMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSIncomingMessage.h; sourceTree = "<group>"; };
 		CC599D315B1037D983714E8AD3F78101 /* YapDatabaseCloudCoreTransaction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCloudCoreTransaction.h; path = YapDatabase/Extensions/CloudCore/YapDatabaseCloudCoreTransaction.h; sourceTree = "<group>"; };
 		CC6BF712B0313502BD5837F9F295813A /* JSONDecodingError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONDecodingError.swift; path = Sources/SwiftProtobuf/JSONDecodingError.swift; sourceTree = "<group>"; };
 		CC79E49CF11243DEE534D77356489131 /* ge_p2_0.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ge_p2_0.c; path = Sources/ed25519/ge_p2_0.c; sourceTree = "<group>"; };
 		CC9982F7D6DAD248A600BDE0A3A90226 /* YapDatabaseViewMappings.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseViewMappings.m; path = YapDatabase/Extensions/View/Utilities/YapDatabaseViewMappings.m; sourceTree = "<group>"; };
 		CCA23F9C96E107BAD3587F4654C9CA37 /* YapDatabaseCloudCoreConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCloudCoreConnection.h; path = YapDatabase/Extensions/CloudCore/YapDatabaseCloudCoreConnection.h; sourceTree = "<group>"; };
 		CCA4FFFB1A3676019A5177BBF732DB34 /* TextFormatEncodingVisitor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TextFormatEncodingVisitor.swift; path = Sources/SwiftProtobuf/TextFormatEncodingVisitor.swift; sourceTree = "<group>"; };
-		CCE52D3EE9359F24F1D52E04F88D74E1 /* OWSPrimaryStorage+SessionStore.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OWSPrimaryStorage+SessionStore.m"; sourceTree = "<group>"; };
+		CCD4F31BBCD27F02A92A807D0C67DC34 /* OWSIncomingSentMessageTranscript.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSIncomingSentMessageTranscript.m; sourceTree = "<group>"; };
 		CD0FF5AF4DF3E51EE523DDE035FEE455 /* AFNetworking-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "AFNetworking-prefix.pch"; sourceTree = "<group>"; };
+		CD3771419E86ED6A25144F856CA50EFF /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.h; sourceTree = "<group>"; };
 		CD6898578DDFB4D0C0E42C1AD39A7F77 /* YapDatabaseActionManagerConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseActionManagerConnection.m; path = YapDatabase/Extensions/ActionManager/YapDatabaseActionManagerConnection.m; sourceTree = "<group>"; };
+		CD95741466D49D3C73BAEBE0564F5B1D /* SignalServiceKit.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = SignalServiceKit.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		CE3DE6A44A71C2455E93BFDC5A20FFA1 /* prng.c */ = {isa = PBXFileReference; includeInIndex = 1; name = prng.c; path = SSZipArchive/minizip/aes/prng.c; sourceTree = "<group>"; };
 		CE43309DB7FC467AF6CAAEA075828BC1 /* ChainKey.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ChainKey.h; path = AxolotlKit/Classes/Ratchet/ChainKey.h; sourceTree = "<group>"; };
+		CE955D7EADCE58F5C564E0DAB6BD40FD /* TSNetworkManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSNetworkManager.m; sourceTree = "<group>"; };
 		CEDE714AF7600B956EAA40249316AD27 /* fe_copy.c */ = {isa = PBXFileReference; includeInIndex = 1; name = fe_copy.c; path = Sources/ed25519/fe_copy.c; sourceTree = "<group>"; };
 		CEF006F546A2A7D06E09B35E60C1CF9B /* Pods-Signal-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Signal-resources.sh"; sourceTree = "<group>"; };
+		CF0597A9A4511323E43F39E923756EAA /* UIImage+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "UIImage+OWS.h"; sourceTree = "<group>"; };
 		CF22ED99F3C921502F0D40D8DF1DF9CB /* Enum.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Enum.swift; path = Sources/SwiftProtobuf/Enum.swift; sourceTree = "<group>"; };
 		CF329DB091E539D9355C9653BF1F7A67 /* ProtocolBuffers.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = ProtocolBuffers.modulemap; sourceTree = "<group>"; };
-		CF541899CD99BD9E93346BEEE05B0207 /* BadArgument.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = BadArgument.h; sourceTree = "<group>"; };
-		CF5C46EEC133BA0ECA03B04BD210685A /* AppVersion.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = AppVersion.m; sourceTree = "<group>"; };
 		CF6517B8DB0D5956009A7E0041C8E135 /* brg_types.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = brg_types.h; path = SSZipArchive/minizip/aes/brg_types.h; sourceTree = "<group>"; };
+		CF65E6F0B6C3E6BB301FB8312A27046C /* OWSPrimaryStorage+PreKeyStore.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OWSPrimaryStorage+PreKeyStore.m"; sourceTree = "<group>"; };
 		CF6B4FF7702EC86AA1077FE10A277A96 /* NBPhoneNumberDefines.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NBPhoneNumberDefines.h; path = libPhoneNumber/NBPhoneNumberDefines.h; sourceTree = "<group>"; };
 		CF9C88B1E526C563F59B83459928EBC6 /* YapDatabaseRTreeIndexHandler.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseRTreeIndexHandler.h; path = YapDatabase/Extensions/RTreeIndex/YapDatabaseRTreeIndexHandler.h; sourceTree = "<group>"; };
+		CFA3358BD58C158674758A5230FC3487 /* TSAttachmentStream.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSAttachmentStream.h; sourceTree = "<group>"; };
 		CFCA1AAAFD4CA9D9E16AFE1530BA8FDF /* SSZipArchive-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SSZipArchive-umbrella.h"; sourceTree = "<group>"; };
 		CFF1915CF760FD9066AFB093E328B3AD /* fileenc.c */ = {isa = PBXFileReference; includeInIndex = 1; name = fileenc.c; path = SSZipArchive/minizip/aes/fileenc.c; sourceTree = "<group>"; };
 		CFFD83480D73A67C41C9B680C6F1E503 /* AxolotlKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "AxolotlKit-dummy.m"; sourceTree = "<group>"; };
 		D0054D9EA39C205D526BF77994F377A8 /* YapDatabaseViewRangeOptions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseViewRangeOptions.h; path = YapDatabase/Extensions/View/Utilities/YapDatabaseViewRangeOptions.h; sourceTree = "<group>"; };
+		D01311A043347D8D707F7AE821B70A1D /* PhoneNumberUtil.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = PhoneNumberUtil.h; sourceTree = "<group>"; };
 		D0158446BCE5CD02A9C91BCCE8A0F061 /* YapDatabaseSecondaryIndexOptions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseSecondaryIndexOptions.m; path = YapDatabase/Extensions/SecondaryIndex/YapDatabaseSecondaryIndexOptions.m; sourceTree = "<group>"; };
-		D02D704BD489EE312522B49B3A80658B /* OWSFailedMessagesJob.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSFailedMessagesJob.m; sourceTree = "<group>"; };
-		D03C1CF11242891CAE73865ED5A08A3F /* TSVerifyCodeRequest.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSVerifyCodeRequest.h; sourceTree = "<group>"; };
 		D040788F0CE0434E40998135CFC528B7 /* AES-CBC.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "AES-CBC.m"; path = "AxolotlKit/Classes/Crypto/AES-CBC.m"; sourceTree = "<group>"; };
 		D0778027AEC344C4139952068A844B3C /* TimeUtils.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TimeUtils.swift; path = Sources/SwiftProtobuf/TimeUtils.swift; sourceTree = "<group>"; };
+		D0E470848E72E1826D838312F73F504A /* FunctionalUtil.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = FunctionalUtil.m; sourceTree = "<group>"; };
 		D127F5DF6BA2B6D8CACCEE990DA0D243 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
-		D1494E5E7E6AA837EB49C24716193819 /* OWSRecipientIdentity.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSRecipientIdentity.h; sourceTree = "<group>"; };
 		D1AD255434355779BAA8ABDBD8BC4E8C /* YDBCKRecord.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YDBCKRecord.m; path = YapDatabase/Extensions/CloudKit/Utilities/YDBCKRecord.m; sourceTree = "<group>"; };
 		D1BB57B6AD81C0DF82FA7EAF9FEC559C /* YapDatabaseViewPageMetadata.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseViewPageMetadata.m; path = YapDatabase/Extensions/View/Internal/YapDatabaseViewPageMetadata.m; sourceTree = "<group>"; };
 		D1EF24D9FA58EEAF2F00E5A9784B8B85 /* PMKAlertController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PMKAlertController.swift; path = Extensions/UIKit/Sources/PMKAlertController.swift; sourceTree = "<group>"; };
+		D20B78B9C87B63BF0384EFB4A11FAEB0 /* OWSContactsOutputStream.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSContactsOutputStream.m; sourceTree = "<group>"; };
+		D227353D51A5527255638EC37578ECBE /* OWSPrimaryStorage+PreKeyStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OWSPrimaryStorage+PreKeyStore.h"; sourceTree = "<group>"; };
 		D22F67B70E5AE0E14EF088B03E6C7164 /* YapDatabaseSearchResultsViewPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseSearchResultsViewPrivate.h; path = YapDatabase/Extensions/SearchResultsView/Internal/YapDatabaseSearchResultsViewPrivate.h; sourceTree = "<group>"; };
 		D23960425BFEA3AB062674F8C985C04A /* YYImage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = YYImage.framework; path = YYImage.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		D27036F11A73CFF04719DE21EA403D2E /* OWSCallIceUpdateMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSCallIceUpdateMessage.h; sourceTree = "<group>"; };
+		D25366A7C3DD93AE19D0F90B138C7FF4 /* OWSUnknownContactBlockOfferMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSUnknownContactBlockOfferMessage.h; sourceTree = "<group>"; };
 		D2805292FDA5FB3B73AA7A0D7A715ADC /* SimpleExtensionMap.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SimpleExtensionMap.swift; path = Sources/SwiftProtobuf/SimpleExtensionMap.swift; sourceTree = "<group>"; };
-		D2DAC06623851F526BCA37E518BF94B6 /* OWSBackgroundTask.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSBackgroundTask.m; sourceTree = "<group>"; };
 		D3424EDABBDDA94759B4BBEBFF5C45B1 /* UIView+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIView+AnyPromise.m"; path = "Extensions/UIKit/Sources/UIView+AnyPromise.m"; sourceTree = "<group>"; };
 		D354D387B44F7FD652ED26D6FB4796CD /* SignalServiceKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = SignalServiceKit.framework; path = SignalServiceKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D37FA31908C8A38F0452743A7E38EA1C /* AFAutoPurgingImageCache.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFAutoPurgingImageCache.h; path = "UIKit+AFNetworking/AFAutoPurgingImageCache.h"; sourceTree = "<group>"; };
+		D3B1B1EF05BD38BB43EFBB3DABFF90FD /* OWSAsserts.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSAsserts.m; sourceTree = "<group>"; };
+		D3C100E70B26E998089D0B2F0694B999 /* TSInvalidIdentityKeyReceivingErrorMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSInvalidIdentityKeyReceivingErrorMessage.m; sourceTree = "<group>"; };
 		D42832E7A656A50FDF21643E1D73FB1D /* ExtensionFields.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExtensionFields.swift; path = Sources/SwiftProtobuf/ExtensionFields.swift; sourceTree = "<group>"; };
-		D43BA48BA07AD42F049FF7D3FEC8040C /* TSConstants.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TSConstants.h; path = SignalServiceKit/src/TSConstants.h; sourceTree = "<group>"; };
 		D45C1E35ABEC6A6BBF780595937BC0EA /* libPhoneNumber_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libPhoneNumber_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D51BFB18D30831C4B15D873B9FBAAC31 /* YapDatabaseAutoViewTransaction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseAutoViewTransaction.h; path = YapDatabase/Extensions/AutoView/YapDatabaseAutoViewTransaction.h; sourceTree = "<group>"; };
-		D522B055E7FB86F4AAF4EAD21A4C58CD /* OWSRecipientIdentity.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSRecipientIdentity.m; sourceTree = "<group>"; };
-		D52AF4EFBB0F656E8E213CB407938549 /* OWSAsserts.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSAsserts.m; sourceTree = "<group>"; };
-		D57C9F093B0E1330E17B8AF4012C08F9 /* OWSIncomingMessageFinder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSIncomingMessageFinder.h; sourceTree = "<group>"; };
 		D5A055F35CCEFCE3A2A64B09805A2123 /* YDBCKRecordTableInfo.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YDBCKRecordTableInfo.m; path = YapDatabase/Extensions/CloudKit/Internal/YDBCKRecordTableInfo.m; sourceTree = "<group>"; };
 		D5A7C33DD974F00F98A0B3E74D138561 /* SRDelegateController.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SRDelegateController.h; path = SocketRocket/Internal/Delegate/SRDelegateController.h; sourceTree = "<group>"; };
 		D5AB7269AC3AFECCEC2997824439D4FC /* Pods-Signal-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Signal-frameworks.sh"; sourceTree = "<group>"; };
 		D5F72231DC112F79A4533474C9E7466D /* NSTask+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSTask+AnyPromise.h"; path = "Extensions/Foundation/Sources/NSTask+AnyPromise.h"; sourceTree = "<group>"; };
 		D622CC5FAE29F6F7CA588A83C2193E49 /* NSRunLoop+SRWebSocket.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSRunLoop+SRWebSocket.m"; path = "SocketRocket/NSRunLoop+SRWebSocket.m"; sourceTree = "<group>"; };
+		D65AC8D1DC2EAD8A432FB3DEF26E1495 /* OWSOutgoingNullMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSOutgoingNullMessage.h; sourceTree = "<group>"; };
 		D66AB5BC37D6C35ADA4AA1E34A37A1A7 /* SQLCipher-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "SQLCipher-dummy.m"; sourceTree = "<group>"; };
 		D66EC3D026096B5BA9B222F76492160B /* AFNetworkReachabilityManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFNetworkReachabilityManager.h; path = AFNetworking/AFNetworkReachabilityManager.h; sourceTree = "<group>"; };
 		D68CC8622548C1007F7A8F7608364E74 /* Pods-SignalTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SignalTests-umbrella.h"; sourceTree = "<group>"; };
-		D6A9E1D862BE5EE8F6C176DD8BD97CDF /* DataSource.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = DataSource.m; sourceTree = "<group>"; };
+		D69F2EA09BDA1752D88D422D45056B33 /* OWSLinkedDeviceReadReceipt.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSLinkedDeviceReadReceipt.h; sourceTree = "<group>"; };
+		D6A6CEEFA6861466743377992FB297EC /* OWSPrimaryStorage+keyFromIntLong.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OWSPrimaryStorage+keyFromIntLong.h"; sourceTree = "<group>"; };
 		D6BFE1408382EE5A2D08441A72AE5B4E /* SessionBuilder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SessionBuilder.m; path = AxolotlKit/Classes/Sessions/SessionBuilder.m; sourceTree = "<group>"; };
 		D706E9B673E67DD8D605D594D19F4185 /* Pods-Signal-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-Signal-acknowledgements.markdown"; sourceTree = "<group>"; };
 		D75045E585B5D0CFEADD96EFDDAB1EDD /* YapDatabaseFullTextSearchTransaction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseFullTextSearchTransaction.m; path = YapDatabase/Extensions/FullTextSearch/YapDatabaseFullTextSearchTransaction.m; sourceTree = "<group>"; };
 		D79E8058A1A623B79218E5A1D4D2B087 /* YapDatabaseManualView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseManualView.h; path = YapDatabase/Extensions/ManualView/YapDatabaseManualView.h; sourceTree = "<group>"; };
 		D7AEAA1F9F2F89E5FDEB0F08F99E27F0 /* YapDatabaseFullTextSearchConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseFullTextSearchConnection.m; path = YapDatabase/Extensions/FullTextSearch/YapDatabaseFullTextSearchConnection.m; sourceTree = "<group>"; };
 		D7BA5399B5DEAF6258756464D1E98E7E /* ALView+PureLayout.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "ALView+PureLayout.m"; path = "PureLayout/PureLayout/ALView+PureLayout.m"; sourceTree = "<group>"; };
-		D7F8DBF22CB59736275B94144C2DF749 /* ContactDiscoveryService.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = ContactDiscoveryService.h; sourceTree = "<group>"; };
 		D810AEB1E0FAA59D09772E21732243AF /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		D8519BE2C10B1E623CE37BD6846BC001 /* YapDatabaseViewTypes.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseViewTypes.m; path = YapDatabase/Extensions/AutoView/YapDatabaseViewTypes.m; sourceTree = "<group>"; };
 		D863515A54F6D279CD462BE53057FCD8 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
 		D8AE4507803D7DCAC42275F45C8CCC38 /* PureLayout.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PureLayout.xcconfig; sourceTree = "<group>"; };
 		D8DDABA5BD0D6CE926785667C6D20380 /* CocoaLumberjack.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CocoaLumberjack.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D8E084A41152D558F5877FC47D724249 /* YapDatabaseExtensionConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseExtensionConnection.m; path = YapDatabase/Extensions/Protocol/YapDatabaseExtensionConnection.m; sourceTree = "<group>"; };
-		D8E89DC82ED0C9D6FEE56F28D89B515C /* DigiCertSHA2HighAssuranceServerCA.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = DigiCertSHA2HighAssuranceServerCA.crt; path = SignalServiceKit/Resources/Certificates/DigiCertSHA2HighAssuranceServerCA.crt; sourceTree = "<group>"; };
 		D8ECCF40DC133F8BF15AD9C2EF43027A /* YapDatabaseViewPageMetadata.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseViewPageMetadata.h; path = YapDatabase/Extensions/View/Internal/YapDatabaseViewPageMetadata.h; sourceTree = "<group>"; };
 		D8F165A0B37AE7F4A62DDF5F698625BB /* duration.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = duration.pb.swift; path = Sources/SwiftProtobuf/duration.pb.swift; sourceTree = "<group>"; };
-		D94539D8ED1E8B1199C1C6DD71D04630 /* ContactsUpdater.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = ContactsUpdater.m; sourceTree = "<group>"; };
-		D96708651683272BDF510A982045755A /* NSData+Image.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSData+Image.h"; sourceTree = "<group>"; };
+		D9051A47AD0D7B7D8A8E7B000179B195 /* TSCall.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSCall.h; sourceTree = "<group>"; };
+		D979CD8342646B5E176C5783C85C65A7 /* TSInteraction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSInteraction.h; sourceTree = "<group>"; };
 		D990DB7A3790014498215542A2AD7790 /* UIView+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "UIView+Promise.swift"; path = "Extensions/UIKit/Sources/UIView+Promise.swift"; sourceTree = "<group>"; };
 		D9B6803629E569684771A0009AD56A7F /* YapDatabaseCrossProcessNotificationPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCrossProcessNotificationPrivate.h; path = YapDatabase/Extensions/CrossProcessNotification/Internal/YapDatabaseCrossProcessNotificationPrivate.h; sourceTree = "<group>"; };
 		D9B923BD82ED9F1B7A6E4D3D6062850D /* AES-CBC.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "AES-CBC.h"; path = "AxolotlKit/Classes/Crypto/AES-CBC.h"; sourceTree = "<group>"; };
+		DA0BAF72542D6AF52046D854959D02F9 /* OWSMediaGalleryFinder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSMediaGalleryFinder.m; sourceTree = "<group>"; };
 		DA4D255D730EBB5A456111F825D7E6E6 /* NBPhoneNumberDefines.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NBPhoneNumberDefines.m; path = libPhoneNumber/NBPhoneNumberDefines.m; sourceTree = "<group>"; };
 		DA5810F5F2EA06ED7099B27F4734BCF6 /* AFImageDownloader.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFImageDownloader.h; path = "UIKit+AFNetworking/AFImageDownloader.h"; sourceTree = "<group>"; };
 		DA62AAD915F1EF728CC9EF7A5208CA56 /* YapDatabaseHooksPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseHooksPrivate.h; path = YapDatabase/Extensions/Hooks/Internal/YapDatabaseHooksPrivate.h; sourceTree = "<group>"; };
 		DA7EC66C0898401958A1A00BC911F8FC /* api.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = api.h; path = Sources/ed25519/api.h; sourceTree = "<group>"; };
 		DAF0E5520C6A627FE3371FC4FDA83C99 /* YYImage-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "YYImage-umbrella.h"; sourceTree = "<group>"; };
+		DB2431D19257F23B2DB55E825A85ED64 /* TSCall.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSCall.m; sourceTree = "<group>"; };
 		DB59C21EFF2DFE0333BAB5FB79828ED5 /* curve25519-donna.c */ = {isa = PBXFileReference; includeInIndex = 1; name = "curve25519-donna.c"; path = "Sources/Curve25519/curve25519-donna.c"; sourceTree = "<group>"; };
 		DB6AED19ED45DF15137488BF62F6B135 /* PromiseKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = PromiseKit.modulemap; sourceTree = "<group>"; };
-		DB703A1B16D16E5987F7EBD484E31A66 /* OWSUnknownContactBlockOfferMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSUnknownContactBlockOfferMessage.h; sourceTree = "<group>"; };
 		DB75C97D9F4498D3E96AB1DDB0005B06 /* Promise+AnyPromise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Promise+AnyPromise.swift"; path = "Sources/Promise+AnyPromise.swift"; sourceTree = "<group>"; };
-		DB8F8FD087C469E4BE81701CF105FDD9 /* OWSPrimaryStorage+PreKeyStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OWSPrimaryStorage+PreKeyStore.h"; sourceTree = "<group>"; };
 		DB9CE03C39DEA3FF2AF2EE7FC78D42CB /* NSNotificationCenter+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSNotificationCenter+AnyPromise.h"; path = "Extensions/Foundation/Sources/NSNotificationCenter+AnyPromise.h"; sourceTree = "<group>"; };
 		DBB8E8A9DAE9B7A8201E0DB0B28E4A14 /* NSValueTransformer+MTLInversionAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSValueTransformer+MTLInversionAdditions.h"; path = "Mantle/NSValueTransformer+MTLInversionAdditions.h"; sourceTree = "<group>"; };
 		DBC5C038F527BA28BDA1D58AC3C71952 /* YapDatabaseRTreeIndexOptions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseRTreeIndexOptions.h; path = YapDatabase/Extensions/RTreeIndex/YapDatabaseRTreeIndexOptions.h; sourceTree = "<group>"; };
 		DBF62E7D2F0D944EFF99E98AFF2A40E2 /* CocoaLumberjack.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = CocoaLumberjack.xcconfig; sourceTree = "<group>"; };
-		DC23E5955F92D5EA0A4656115D6860A0 /* TSQuotedMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSQuotedMessage.m; sourceTree = "<group>"; };
-		DCD639FACDCFD9A611FC6258C4DFBABA /* TSIncomingMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSIncomingMessage.m; sourceTree = "<group>"; };
+		DCEC3703933E8076FB3916B7952915BE /* OWSOperation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSOperation.h; sourceTree = "<group>"; };
+		DD3D525EF6D7FDFE1727C2BF5ED81D65 /* NSObject+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSObject+OWS.h"; sourceTree = "<group>"; };
+		DD40A60C385F1B815CFB839B843A3817 /* TSThread.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSThread.m; sourceTree = "<group>"; };
 		DD5209AED189F3CFB55E425180C89398 /* AxolotlKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = AxolotlKit.framework; path = AxolotlKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		DDB9F1CFF6A905DF2817B6040514574F /* TSSocketManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSSocketManager.h; sourceTree = "<group>"; };
+		DD69B9600F1759408BD75489DAE2D018 /* BadArgument.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = BadArgument.h; sourceTree = "<group>"; };
 		DDC46B3E1F86FF7C08F3670C60E1C53C /* Internal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Internal.swift; path = Sources/SwiftProtobuf/Internal.swift; sourceTree = "<group>"; };
 		DE011B4194838079C30682F3DCCC9C64 /* YapDatabaseCloudCoreOptions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCloudCoreOptions.h; path = YapDatabase/Extensions/CloudCore/YapDatabaseCloudCoreOptions.h; sourceTree = "<group>"; };
 		DE3CFC086C365639797066BF2074F220 /* ReceivingChain.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ReceivingChain.h; path = AxolotlKit/Classes/Ratchet/ReceivingChain.h; sourceTree = "<group>"; };
 		DE67814E67EF69C889B3059EFFAC891A /* YDBCKRecord.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YDBCKRecord.h; path = YapDatabase/Extensions/CloudKit/Utilities/YDBCKRecord.h; sourceTree = "<group>"; };
 		DE6FE792337AD939FD1042CFB58C4EEB /* YapDatabaseViewConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseViewConnection.m; path = YapDatabase/Extensions/View/YapDatabaseViewConnection.m; sourceTree = "<group>"; };
+		DE9012C08AC3C6684E4D082158D849D9 /* SignalServiceKit.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SignalServiceKit.xcconfig; sourceTree = "<group>"; };
+		DEC48287E6CBFC8A07383E195B69F88A /* OWSBatchMessageProcessor.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSBatchMessageProcessor.m; sourceTree = "<group>"; };
 		DECFC0349D2D81467162208DA02E975C /* HKDFKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "HKDFKit-prefix.pch"; sourceTree = "<group>"; };
-		DEE0C6A7D9826BDB00B7253207581ED0 /* OWSContact.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSContact.h; sourceTree = "<group>"; };
-		DF28247262E9BBB702C4C4CFED1D1A40 /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.m; sourceTree = "<group>"; };
 		DF65DBC91E0EA91A46C0DF0C95B3AE79 /* YapDatabaseCloudCoreTransaction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseCloudCoreTransaction.m; path = YapDatabase/Extensions/CloudCore/YapDatabaseCloudCoreTransaction.m; sourceTree = "<group>"; };
 		DFB79B85A02B9E90BFE0C4A6C1B0FA81 /* ExtensibleMessage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExtensibleMessage.swift; path = Sources/SwiftProtobuf/ExtensibleMessage.swift; sourceTree = "<group>"; };
 		DFD17EE1B3A7D2D3A72CD86C5C0397F5 /* NBPhoneNumberDesc.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NBPhoneNumberDesc.m; path = libPhoneNumber/NBPhoneNumberDesc.m; sourceTree = "<group>"; };
 		DFE2CD6602E1FDF9A3575730D905B0FA /* JSONMapEncodingVisitor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONMapEncodingVisitor.swift; path = Sources/SwiftProtobuf/JSONMapEncodingVisitor.swift; sourceTree = "<group>"; };
+		DFE5EB3520EAF5808BC9E0A6DA6B1503 /* OWSDispatch.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDispatch.h; sourceTree = "<group>"; };
 		DFEDE811D5B8B2679DF84240D10C1DA3 /* YapDatabaseHooks.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseHooks.m; path = YapDatabase/Extensions/Hooks/YapDatabaseHooks.m; sourceTree = "<group>"; };
-		E01805482847BDFDBD65E417790CFD23 /* SignalServiceKit.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SignalServiceKit.h; path = SignalServiceKit/src/SignalServiceKit.h; sourceTree = "<group>"; };
+		E012A326CE29792E70C3E6414B69EF68 /* NotificationsProtocol.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = NotificationsProtocol.h; sourceTree = "<group>"; };
 		E0C916E401A3681DAA5CF50E11CAC69F /* YapDatabaseCloudCoreOperation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCloudCoreOperation.h; path = YapDatabase/Extensions/CloudCore/Utilities/Operations/YapDatabaseCloudCoreOperation.h; sourceTree = "<group>"; };
-		E0D423E15BF7026DEB0566965610B3B8 /* MIMETypeUtil.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = MIMETypeUtil.h; sourceTree = "<group>"; };
-		E11BC8DD95DB855E1DFB83981AD9B2A6 /* TSDatabaseView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSDatabaseView.h; sourceTree = "<group>"; };
 		E17DC27D24D27431FC204A929D3C6EDA /* sc_reduce.c */ = {isa = PBXFileReference; includeInIndex = 1; name = sc_reduce.c; path = Sources/ed25519/sc_reduce.c; sourceTree = "<group>"; };
 		E1918285BC1A524367F812D6250CD570 /* YYImage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YYImage.m; path = YYImage/YYImage.m; sourceTree = "<group>"; };
 		E1992874F5D31DF6CE70FBC561076989 /* yap_vfs_shim.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = yap_vfs_shim.h; path = YapDatabase/Internal/yap_vfs_shim.h; sourceTree = "<group>"; };
-		E1DC366A85C9D9DE16B5295DB1633FFD /* NSData+Image.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSData+Image.m"; sourceTree = "<group>"; };
 		E1FAF037C3C01E892EFDDBD55B016F83 /* SessionRecord.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SessionRecord.m; path = AxolotlKit/Classes/Sessions/SessionRecord.m; sourceTree = "<group>"; };
-		E22B8BEA04345035EAE1048940DB39AB /* OWSFailedAttachmentDownloadsJob.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSFailedAttachmentDownloadsJob.h; sourceTree = "<group>"; };
+		E200940278B8060F500F8AF6BF807F45 /* OWSUploadOperation.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSUploadOperation.m; sourceTree = "<group>"; };
 		E23215D0AA79BC951748BBB33E4F9AF2 /* Pods-SignalTests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SignalTests-resources.sh"; sourceTree = "<group>"; };
-		E2AAC5E69421FF1640869EF39CF950FD /* SignalRecipient.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = SignalRecipient.m; sourceTree = "<group>"; };
+		E24600DAB2B39B420164E063454366FC /* OWSQueues.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSQueues.h; sourceTree = "<group>"; };
+		E273C9583DC2C29CBA32159C9F8C1EB1 /* TSErrorMessage_privateConstructor.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSErrorMessage_privateConstructor.h; sourceTree = "<group>"; };
 		E2B82860D34500BBBBE58D720623F979 /* YapDatabaseFullTextSearchSnippetOptions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseFullTextSearchSnippetOptions.h; path = YapDatabase/Extensions/FullTextSearch/YapDatabaseFullTextSearchSnippetOptions.h; sourceTree = "<group>"; };
 		E311AE9DCD8D8B6D74A486BFF833AAF3 /* Message+TextFormatAdditions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Message+TextFormatAdditions.swift"; path = "Sources/SwiftProtobuf/Message+TextFormatAdditions.swift"; sourceTree = "<group>"; };
-		E32338AF00492DCBD7322D7A9CCE3EAD /* SFSRootCAG2.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = SFSRootCAG2.crt; path = SignalServiceKit/Resources/Certificates/SFSRootCAG2.crt; sourceTree = "<group>"; };
 		E330159BD0281F555EAA21E24C455DB4 /* YapDatabaseCloudKitConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCloudKitConnection.h; path = YapDatabase/Extensions/CloudKit/YapDatabaseCloudKitConnection.h; sourceTree = "<group>"; };
 		E33584A4141FB1947383067481414FE0 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
 		E35F3F81A3AD3EF692D0B4D32524A25D /* AliceAxolotlParameters.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AliceAxolotlParameters.m; path = AxolotlKit/Classes/Ratchet/AliceAxolotlParameters.m; sourceTree = "<group>"; };
 		E3A1B72DB2203D88F5FE44973CD6BD49 /* Randomness.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Randomness.h; path = Classes/Randomness.h; sourceTree = "<group>"; };
-		E3AEE00FE231E7FAF4EC500F5B271E64 /* SSKProto.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SSKProto.swift; sourceTree = "<group>"; };
 		E3B7E3D60A910FB286F4C176A0E1F45E /* NBPhoneNumberUtil.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NBPhoneNumberUtil.h; path = libPhoneNumber/NBPhoneNumberUtil.h; sourceTree = "<group>"; };
 		E3CCC5D9A8058110C057396D35F5A59F /* pwd2key.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = pwd2key.h; path = SSZipArchive/minizip/aes/pwd2key.h; sourceTree = "<group>"; };
-		E3F22CB9803008FADD9639BC97114A51 /* OWSRequestFactory.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSRequestFactory.h; sourceTree = "<group>"; };
 		E400DD68D1D88189ACFE235C50075D26 /* NSDate+YapDatabase.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSDate+YapDatabase.h"; path = "YapDatabase/Internal/NSDate+YapDatabase.h"; sourceTree = "<group>"; };
 		E414FBD07B05DC78066734F769332410 /* YapDatabaseExtension.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseExtension.m; path = YapDatabase/Extensions/Protocol/YapDatabaseExtension.m; sourceTree = "<group>"; };
 		E45A5611438C3603883F32C51A515717 /* NSURLSession+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSURLSession+Promise.swift"; path = "Extensions/Foundation/Sources/NSURLSession+Promise.swift"; sourceTree = "<group>"; };
-		E467C5C6FEA93E7BAF2CA5B464B6FB3C /* OWSSyncGroupsRequestMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSSyncGroupsRequestMessage.m; sourceTree = "<group>"; };
 		E4CE3189430CB0751FDB2B3F0D577A99 /* AFNetworking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AFNetworking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		E4E58832B5059FA04AFEE9FD01BE6F6B /* ProtoUtils.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = ProtoUtils.h; sourceTree = "<group>"; };
 		E4ECF4C71EFDBF40883BC7D2DF5182E7 /* NSNotificationCenter+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSNotificationCenter+Promise.swift"; path = "Extensions/Foundation/Sources/NSNotificationCenter+Promise.swift"; sourceTree = "<group>"; };
 		E5017BE195C9B7798997B68B997ABD9D /* Pods-SignalMessaging-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SignalMessaging-acknowledgements.plist"; sourceTree = "<group>"; };
 		E55A4A67EB5552914E2B34C4999D63B9 /* YapDatabaseConnectionPool.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseConnectionPool.h; path = YapDatabase/Extensions/ConnectionPool/YapDatabaseConnectionPool.h; sourceTree = "<group>"; };
-		E56669DA81F7018732B8268061ED6618 /* OWSBackupFragment.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSBackupFragment.h; sourceTree = "<group>"; };
 		E5718D39EE88DBA37458533790CA57BA /* HKDFKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HKDFKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		E58CE09CB4F7301622AFB5079FFFED28 /* OWSReadReceiptsForLinkedDevicesMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSReadReceiptsForLinkedDevicesMessage.h; sourceTree = "<group>"; };
+		E5B1F47515199B7D49B7B2AA134CEC42 /* NSDate+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSDate+OWS.h"; sourceTree = "<group>"; };
 		E5D914D74C282993BB0D9CE6E6CF627C /* YapDatabaseRelationshipEdge.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseRelationshipEdge.h; path = YapDatabase/Extensions/Relationships/YapDatabaseRelationshipEdge.h; sourceTree = "<group>"; };
+		E5E11DD79746162A76EDFA5E97CB1E03 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; path = README.md; sourceTree = "<group>"; };
 		E5FFB0EF1632D798E786EF17C63C8883 /* ATAppUpdater-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "ATAppUpdater-umbrella.h"; sourceTree = "<group>"; };
 		E610881826392F834473BFD681593434 /* YapCache.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapCache.m; path = YapDatabase/Utilities/YapCache.m; sourceTree = "<group>"; };
 		E65C45CB77E304DB6C1A483243CA9683 /* Pods-Signal.app store release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Signal.app store release.xcconfig"; sourceTree = "<group>"; };
 		E6601B182467160C08A2924D173B51AF /* DDASLLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDASLLogger.h; path = Classes/DDASLLogger.h; sourceTree = "<group>"; };
-		E66543AA0B4464305389E6FA5304EBA1 /* TSThread.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSThread.m; sourceTree = "<group>"; };
-		E78021C341F490C8C508A22AADDB03CF /* OWSBackgroundTask.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSBackgroundTask.h; sourceTree = "<group>"; };
-		E790FFD630BE46B12350C469D1BF9B04 /* OWSIncompleteCallsJob.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSIncompleteCallsJob.h; sourceTree = "<group>"; };
+		E73B001A4AA833F35857843F9E632342 /* OWSFailedMessagesJob.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSFailedMessagesJob.h; sourceTree = "<group>"; };
+		E789403C585B4F0654DF297F1C0E769D /* OWSSyncGroupsRequestMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSSyncGroupsRequestMessage.m; sourceTree = "<group>"; };
+		E7D1A1F4812DDE995833A4D744372003 /* YapDatabaseConnection+OWS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "YapDatabaseConnection+OWS.h"; sourceTree = "<group>"; };
 		E7D7B5E71F68485E84E0AEEE9AA54ACA /* hash.c */ = {isa = PBXFileReference; includeInIndex = 1; name = hash.c; path = Sources/ed25519/nacl_sha512/hash.c; sourceTree = "<group>"; };
 		E8020D4F00E8931BBE9D9E63D4B82BD8 /* libPhoneNumber-iOS-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "libPhoneNumber-iOS-prefix.pch"; sourceTree = "<group>"; };
 		E80A2881D00EF28ADA181E995B2411CB /* MTLModel.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MTLModel.m; path = Mantle/MTLModel.m; sourceTree = "<group>"; };
 		E81481BAA17A1A21C847ACB4C9B6D887 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/CoreFoundation.framework; sourceTree = DEVELOPER_DIR; };
-		E84FA178FAEB325B13D0CF5DD22C1827 /* CDSSigningCertificate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = CDSSigningCertificate.h; sourceTree = "<group>"; };
 		E85707CFF01107060A3D97D512729068 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		E86CC2E4AB97374116857447658876D1 /* PromiseKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PromiseKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		E87D5362E8901814BF4F34E852A60FB7 /* TSOutgoingMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSOutgoingMessage.m; sourceTree = "<group>"; };
 		E8CC360E514B05E9E55F9D2547671F51 /* AbstractMessageBuilder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AbstractMessageBuilder.m; path = src/runtime/Classes/AbstractMessageBuilder.m; sourceTree = "<group>"; };
 		E8DC22ED0C4BA2EE0E4A686E7D1F3F78 /* SAMKeychain-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SAMKeychain-prefix.pch"; sourceTree = "<group>"; };
 		E8FCEEBF46DF051B2451562B3E37CD34 /* YapDatabaseCloudCoreOperationPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseCloudCoreOperationPrivate.h; path = YapDatabase/Extensions/CloudCore/Internal/YapDatabaseCloudCoreOperationPrivate.h; sourceTree = "<group>"; };
-		E9195C958F6BA7FB29538724DE01EE95 /* TSCall.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSCall.m; sourceTree = "<group>"; };
-		E91FD0007CAE74D404197B6C71EE9C26 /* SignalServiceKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = SignalServiceKit.modulemap; sourceTree = "<group>"; };
-		E92A1505D72661FB46FA29D07128E134 /* ParamParser.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ParamParser.swift; sourceTree = "<group>"; };
-		E93FBC7412CDFFCFB0A43673D24A74E6 /* OWSCallOfferMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSCallOfferMessage.m; sourceTree = "<group>"; };
-		E955941CCE942810C61FD9A2E8FF8E67 /* TSNetworkManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSNetworkManager.m; sourceTree = "<group>"; };
-		E9BA554A07FD4C0AAEDD2599860A92BD /* OWSOutgoingSyncMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSOutgoingSyncMessage.m; sourceTree = "<group>"; };
+		E92C5F13CE74C286B4D24FC95B186EB6 /* OWSHTTPSecurityPolicy.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSHTTPSecurityPolicy.h; sourceTree = "<group>"; };
 		E9E3794EA8686580A1B44B678AFBEAF5 /* GeneratedMessageBuilder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GeneratedMessageBuilder.m; path = src/runtime/Classes/GeneratedMessageBuilder.m; sourceTree = "<group>"; };
 		E9ECE9434C139E1D5DB72EFE20F2F1DE /* YapDatabase.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabase.m; path = YapDatabase/YapDatabase.m; sourceTree = "<group>"; };
 		EAD1898ECEE9DAC2052DD9468011764B /* YapWhitelistBlacklist.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapWhitelistBlacklist.m; path = YapDatabase/Utilities/YapWhitelistBlacklist.m; sourceTree = "<group>"; };
-		EAD746CCF71A77D00EB2BC594E1C8394 /* TSAttributes.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSAttributes.h; sourceTree = "<group>"; };
 		EAEA3DB6DC3CF53CEABA47DD339ADC11 /* SocketRocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = SocketRocket.framework; path = SocketRocket.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		EAF33202CDF0688CCA67373D3A52C8B3 /* YapDatabaseRTreeIndexPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseRTreeIndexPrivate.h; path = YapDatabase/Extensions/RTreeIndex/Internal/YapDatabaseRTreeIndexPrivate.h; sourceTree = "<group>"; };
 		EAF4CEC91874CB8720F0DA6BB3402FDB /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -3261,38 +3253,40 @@
 		EC028DC4459134C6C5DB1400801E8667 /* Pods-SignalShareExtension-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SignalShareExtension-acknowledgements.markdown"; sourceTree = "<group>"; };
 		EC353F94FD3FCD9F9088F222A9D4A282 /* ConcreteExtensionField.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ConcreteExtensionField.h; path = src/runtime/Classes/ConcreteExtensionField.h; sourceTree = "<group>"; };
 		EC59961097ADDD701ED836E2BE99196C /* SQLCipher.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = SQLCipher.framework; path = SQLCipher.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		ECA492D371F9EA340746FBEA65472C36 /* OWSSyncGroupsRequestMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSSyncGroupsRequestMessage.h; sourceTree = "<group>"; };
+		EC7760E743DF17A8A5845A57C2B344EE /* ContactDiscoveryService.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = ContactDiscoveryService.h; sourceTree = "<group>"; };
 		ECAFC02231F93C6E4FDBFD5DA9303C20 /* CocoaLumberjack.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CocoaLumberjack.h; path = Classes/CocoaLumberjack.h; sourceTree = "<group>"; };
 		ECB0D3E2B81029B1AC13FDEA8D36998B /* DDLog.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDLog.m; path = Classes/DDLog.m; sourceTree = "<group>"; };
+		ECBCF498FBA6BE6188F79D816CA6DA7C /* Contact.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = Contact.m; sourceTree = "<group>"; };
 		ECD124A9584FD13AC34E63F0E87B5C84 /* YapDatabaseCrossProcessNotificationTransaction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseCrossProcessNotificationTransaction.m; path = YapDatabase/Extensions/CrossProcessNotification/YapDatabaseCrossProcessNotificationTransaction.m; sourceTree = "<group>"; };
-		ED06BCDF9223725A6F8DF2E462EDBE9F /* NSDate+OWS.mm */ = {isa = PBXFileReference; includeInIndex = 1; path = "NSDate+OWS.mm"; sourceTree = "<group>"; };
 		ED58D8990DB09CF13CCA22297700AABF /* EXTRuntimeExtensions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = EXTRuntimeExtensions.m; path = Mantle/extobjc/EXTRuntimeExtensions.m; sourceTree = "<group>"; };
-		EDA5B5EAAFB689D1C9599607950682B1 /* YapDatabaseTransaction+OWS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "YapDatabaseTransaction+OWS.m"; sourceTree = "<group>"; };
 		EDE366908CFF6B1EC7FD05D4898526BC /* UIViewController+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIViewController+AnyPromise.m"; path = "Extensions/UIKit/Sources/UIViewController+AnyPromise.m"; sourceTree = "<group>"; };
+		EE6235D75398964CE39AEA142A33F650 /* YapDatabaseConnection+OWS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "YapDatabaseConnection+OWS.m"; sourceTree = "<group>"; };
 		EE7FA628DD929F4DEE743728B2DA389E /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		EEBCA7E9F47282065363153607C22B90 /* OWSChunkedOutputStream.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSChunkedOutputStream.m; sourceTree = "<group>"; };
 		EED76D8B414A5C0AE84830D38DC7D17F /* ZipArchive.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ZipArchive.h; path = SSZipArchive/ZipArchive.h; sourceTree = "<group>"; };
 		EEE838BE73985113A36EBC5A7664BE52 /* Message+BinaryAdditions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Message+BinaryAdditions.swift"; path = "Sources/SwiftProtobuf/Message+BinaryAdditions.swift"; sourceTree = "<group>"; };
 		EF25E0AD38352538C70FAF3845E28289 /* TextFormatDecoder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TextFormatDecoder.swift; path = Sources/SwiftProtobuf/TextFormatDecoder.swift; sourceTree = "<group>"; };
-		EF39586E4B7979F5E65EBF0A06F5FD89 /* OWSWebsocketSecurityPolicy.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSWebsocketSecurityPolicy.h; sourceTree = "<group>"; };
 		EF8B4F554E49E555F8180B6C8F82977A /* libPhoneNumber-iOS.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "libPhoneNumber-iOS.xcconfig"; sourceTree = "<group>"; };
-		EFF908A4B1F0A1E839C08BD7A0DEAA93 /* TSOutgoingMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSOutgoingMessage.m; sourceTree = "<group>"; };
 		F002A0DD85490D99452B7544BD883736 /* AxolotlKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = AxolotlKit.modulemap; sourceTree = "<group>"; };
 		F00AD7D9A4F6D2AA16854A974E51E01C /* AFNetworking-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "AFNetworking-umbrella.h"; sourceTree = "<group>"; };
-		F0401DB050A9995150C3A9A283E36255 /* TSDatabaseSecondaryIndexes.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSDatabaseSecondaryIndexes.m; sourceTree = "<group>"; };
-		F07702B47EB4881E2F25D6E50AF5F655 /* OWSHTTPSecurityPolicy.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSHTTPSecurityPolicy.h; sourceTree = "<group>"; };
+		F066CD14BDBA37DB3F1F61F437D52691 /* ContactsManagerProtocol.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = ContactsManagerProtocol.h; sourceTree = "<group>"; };
 		F083240013E2988143D1895AD720849A /* Curve25519Kit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Curve25519Kit-prefix.pch"; sourceTree = "<group>"; };
 		F0A86F81A2F2427EE504067CA44612BE /* SSZipArchive-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "SSZipArchive-dummy.m"; sourceTree = "<group>"; };
-		F0E7DE343118333D3B22ACBA9D27E0E5 /* ProfileManagerProtocol.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = ProfileManagerProtocol.h; sourceTree = "<group>"; };
 		F120E8224DC8C5F7F70AA440242B7CB4 /* SSZipArchive.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = SSZipArchive.modulemap; sourceTree = "<group>"; };
+		F12D43BB9185A4094D6EB57A2F8DF8F5 /* OWSDisappearingMessagesJob.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDisappearingMessagesJob.m; sourceTree = "<group>"; };
 		F16A51F7F2B2DCE0FDB0FF9AEDDC0214 /* crypt.c */ = {isa = PBXFileReference; includeInIndex = 1; name = crypt.c; path = SSZipArchive/minizip/crypt.c; sourceTree = "<group>"; };
+		F184ABE7028E5812A3E2A77B1B0A1D83 /* OWSSyncGroupsRequestMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSSyncGroupsRequestMessage.h; sourceTree = "<group>"; };
+		F1A58CB77101BC6642181196DC1718D4 /* OWSMessageReceiver.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSMessageReceiver.h; sourceTree = "<group>"; };
 		F1C453EB99A7889F2B3D74E5EDDB64E6 /* zeroize.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = zeroize.h; path = Sources/ed25519/additions/zeroize.h; sourceTree = "<group>"; };
 		F1DCB4D1AA95771E955F866A01453744 /* SocketRocket-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SocketRocket-prefix.pch"; sourceTree = "<group>"; };
+		F1E1A67E521174E69AA91B59B4F5C819 /* OWSCallOfferMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSCallOfferMessage.h; sourceTree = "<group>"; };
 		F1E7D0A498E2DEB26C88AFA31A05BB86 /* YapDatabaseSecondaryIndexTransaction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseSecondaryIndexTransaction.m; path = YapDatabase/Extensions/SecondaryIndex/YapDatabaseSecondaryIndexTransaction.m; sourceTree = "<group>"; };
-		F2D5B4D0133313535D6E881A8EA2E927 /* OWSPrimaryStorage+Calling.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OWSPrimaryStorage+Calling.h"; sourceTree = "<group>"; };
+		F29E9178FB17E5BB0F3BCB9E38D6CDE3 /* OWSDisappearingMessagesConfigurationMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDisappearingMessagesConfigurationMessage.m; sourceTree = "<group>"; };
 		F2FC88A2F80932EF6E96DD2382B9EE00 /* UIRefreshControl+AFNetworking.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIRefreshControl+AFNetworking.m"; path = "UIKit+AFNetworking/UIRefreshControl+AFNetworking.m"; sourceTree = "<group>"; };
 		F30CC11A0A11EB6C924613B2F0517659 /* PreKeyBundle.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PreKeyBundle.h; path = AxolotlKit/Classes/Prekeys/PreKeyBundle.h; sourceTree = "<group>"; };
-		F32D85BD5DDA763EECB28D71CD58A714 /* OWSUploadOperation.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSUploadOperation.m; sourceTree = "<group>"; };
-		F3658CAD6984DF1F320843F2685A2B5C /* OWSDisappearingMessagesFinder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDisappearingMessagesFinder.m; sourceTree = "<group>"; };
+		F33535F61A45AB839CD158E9A9B6528A /* GSR4.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = GSR4.crt; path = SignalServiceKit/Resources/Certificates/GSR4.crt; sourceTree = "<group>"; };
+		F34269F2ADFFC4B0B79038AD0DFDD1FD /* TSErrorMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSErrorMessage.m; sourceTree = "<group>"; };
+		F352E29A82EF0AACA2B860ADAEDEAD07 /* TSOutgoingMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSOutgoingMessage.h; sourceTree = "<group>"; };
 		F3A6054AE2BE14F30D68CB80118F0C9F /* YapSet.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapSet.m; path = YapDatabase/Utilities/YapSet.m; sourceTree = "<group>"; };
 		F3E95FCA690FD6A1DDA1BC2BFDB68812 /* StringUtils.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = StringUtils.swift; path = Sources/SwiftProtobuf/StringUtils.swift; sourceTree = "<group>"; };
 		F3F6BB352EA1ACE90EB6E8E6592C390E /* YapDatabaseRelationshipConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseRelationshipConnection.m; path = YapDatabase/Extensions/Relationships/YapDatabaseRelationshipConnection.m; sourceTree = "<group>"; };
@@ -3300,57 +3294,59 @@
 		F46F4EBC90337D76725ADEDE9EF75248 /* Google_Protobuf_Value+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Google_Protobuf_Value+Extensions.swift"; path = "Sources/SwiftProtobuf/Google_Protobuf_Value+Extensions.swift"; sourceTree = "<group>"; };
 		F474326FDCCE1E6D1FFDC2F61F679D94 /* Message+AnyAdditions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Message+AnyAdditions.swift"; path = "Sources/SwiftProtobuf/Message+AnyAdditions.swift"; sourceTree = "<group>"; };
 		F4D0417F0D6930A7FF4B46DDF93EB2FC /* YapDatabaseRelationshipOptions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseRelationshipOptions.h; path = YapDatabase/Extensions/Relationships/YapDatabaseRelationshipOptions.h; sourceTree = "<group>"; };
+		F4D7A91B7DCEC1C62C061D2FFB52DC9B /* OWSContact.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSContact.h; sourceTree = "<group>"; };
+		F51EEA8A6A450EE11416380C7C307A60 /* WebSocketProto.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = WebSocketProto.swift; sourceTree = "<group>"; };
+		F53572DE8534FDE9A2AAD79287420493 /* NSUserDefaults+OWS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSUserDefaults+OWS.m"; sourceTree = "<group>"; };
+		F5AD67A595FB3558457F2AE0C457686A /* OWSRecipientIdentity.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSRecipientIdentity.h; sourceTree = "<group>"; };
 		F5CACD4CA683D4052249738B3070A151 /* Pods-SignalMessaging.app store release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SignalMessaging.app store release.xcconfig"; sourceTree = "<group>"; };
 		F5D98967397CEB06BBB1E2E1EA5421F7 /* YapRowidSet.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = YapRowidSet.mm; path = YapDatabase/Internal/YapRowidSet.mm; sourceTree = "<group>"; };
-		F5DBC54477F173CE4322BB2A8F0AB556 /* OWSMessageManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSMessageManager.m; sourceTree = "<group>"; };
+		F5EB78F21D70D33731893631B393446A /* TSContactThread.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSContactThread.h; sourceTree = "<group>"; };
+		F5FEB05DA0271D6D699F9834190A80CC /* TSYapDatabaseObject.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TSYapDatabaseObject.m; sourceTree = "<group>"; };
+		F631165837D7A47024E20D3BBC907F54 /* OWSDisappearingMessagesFinder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSDisappearingMessagesFinder.m; sourceTree = "<group>"; };
+		F70103724A492A4F2EFF4E65C1581CC2 /* TSConstants.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TSConstants.h; path = SignalServiceKit/src/TSConstants.h; sourceTree = "<group>"; };
 		F731A4D9F1B91F1896E2B80C5B27B89C /* SQLCipher.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SQLCipher.xcconfig; sourceTree = "<group>"; };
 		F73BD94F9399045E45E781E780B0200F /* EXTScope.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = EXTScope.m; path = Mantle/extobjc/EXTScope.m; sourceTree = "<group>"; };
 		F77C5090AF4F1C01B5115A471A18DD3A /* NSLayoutConstraint+PureLayout.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSLayoutConstraint+PureLayout.h"; path = "PureLayout/PureLayout/NSLayoutConstraint+PureLayout.h"; sourceTree = "<group>"; };
-		F795CF3B44E50F8222DC1F93AF5F10B7 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE; sourceTree = "<group>"; };
 		F7D2F98745AB0D3EC0541D0B43291F3F /* UnknownFieldSet.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = UnknownFieldSet.m; path = src/runtime/Classes/UnknownFieldSet.m; sourceTree = "<group>"; };
 		F8000CB787F7B34A0780F8E70CA171B9 /* SAMKeychain.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = SAMKeychain.framework; path = SAMKeychain.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F80626A1BB358C89765A992290FDCF54 /* YapDatabaseManualViewPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseManualViewPrivate.h; path = YapDatabase/Extensions/ManualView/Internal/YapDatabaseManualViewPrivate.h; sourceTree = "<group>"; };
+		F82C03BE3A38809D84332838ADEDF498 /* OWSHTTPSecurityPolicy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSHTTPSecurityPolicy.m; sourceTree = "<group>"; };
 		F84C4AE4CC62366DEB51C1F3B48490EC /* NameMap.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NameMap.swift; path = Sources/SwiftProtobuf/NameMap.swift; sourceTree = "<group>"; };
+		F852818CC06239D0EA84A4295BBBAB01 /* OWSStorage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSStorage.m; sourceTree = "<group>"; };
+		F894D9963098757627DDF5E3E75F8A86 /* TSThread.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSThread.h; sourceTree = "<group>"; };
 		F8A43DEFD7910C76C7C8D8C02DA3E17E /* YapDatabaseViewState.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseViewState.h; path = YapDatabase/Extensions/View/Internal/YapDatabaseViewState.h; sourceTree = "<group>"; };
 		F8AA1B5487251DBFCB9A411FBB697046 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		F917564E8B9090F99417C2D5C20CA198 /* SignalIOS.pb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SignalIOS.pb.swift; sourceTree = "<group>"; };
 		F92CED7048463A6F5E0116484FCCA937 /* YYSpriteSheetImage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YYSpriteSheetImage.m; path = YYImage/YYSpriteSheetImage.m; sourceTree = "<group>"; };
-		F95F5A4B60AAD90BCCA06EC786EC1D99 /* OWSReadReceiptsForLinkedDevicesMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSReadReceiptsForLinkedDevicesMessage.m; sourceTree = "<group>"; };
+		F93CAFFEA7531FCF100E403A1951C848 /* OWS2FAManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWS2FAManager.m; sourceTree = "<group>"; };
 		F967506C521FA1B67DEF942AC727AEEC /* YapDatabaseView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseView.h; path = YapDatabase/Extensions/View/YapDatabaseView.h; sourceTree = "<group>"; };
-		F997C9D5DEDD97E353F0E383691F358D /* SignalRecipient.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = SignalRecipient.h; sourceTree = "<group>"; };
 		F99D0A4CFA03FB3E83FC4C9B8A0CD9BD /* SignedPreKeyStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SignedPreKeyStore.h; path = AxolotlKit/Classes/State/SignedPreKeyStore.h; sourceTree = "<group>"; };
 		F99F02CD2BA71650E0B010C01FE9D36A /* YapDatabaseViewConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseViewConnection.h; path = YapDatabase/Extensions/View/YapDatabaseViewConnection.h; sourceTree = "<group>"; };
 		F9BC98A15EF755AEE1396B42657D8C62 /* YapDatabaseTransaction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseTransaction.h; path = YapDatabase/YapDatabaseTransaction.h; sourceTree = "<group>"; };
+		F9C8DB45BF6AE855244F8D05D0A083E5 /* OWSEndSessionMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSEndSessionMessage.h; sourceTree = "<group>"; };
 		FA3A02A1FA5AEA8A7493206D69D50CCA /* fe_1.c */ = {isa = PBXFileReference; includeInIndex = 1; name = fe_1.c; path = Sources/ed25519/fe_1.c; sourceTree = "<group>"; };
-		FA52478855E389788B4AACD2BCD40FA0 /* OWSOutgoingCallMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSOutgoingCallMessage.m; sourceTree = "<group>"; };
 		FAB90DA8184CDEEDCD211D17A8CF5425 /* UIActivityIndicatorView+AFNetworking.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIActivityIndicatorView+AFNetworking.m"; path = "UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.m"; sourceTree = "<group>"; };
-		FAEAEB6856E3B8844C3C46F0E6B2C59B /* ContactsUpdater.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = ContactsUpdater.h; sourceTree = "<group>"; };
+		FADDB75AF9469EB1A17E8F19C6F68358 /* OWSOrphanedDataCleaner.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSOrphanedDataCleaner.m; sourceTree = "<group>"; };
 		FB71B40F4AF492637731ED764567BAA0 /* YapDatabase.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabase.h; path = YapDatabase/YapDatabase.h; sourceTree = "<group>"; };
-		FB778C4F4E228CB88E2F034E622B3701 /* OWSDynamicOutgoingMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSDynamicOutgoingMessage.h; sourceTree = "<group>"; };
 		FBA66D890D3AB094A867B1E7FF0647B8 /* YapDatabaseQuery.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseQuery.m; path = YapDatabase/Utilities/YapDatabaseQuery.m; sourceTree = "<group>"; };
 		FBF459B490270FBFD334FA6666D8B65C /* MutableExtensionRegistry.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MutableExtensionRegistry.h; path = src/runtime/Classes/MutableExtensionRegistry.h; sourceTree = "<group>"; };
 		FC5661A9AADDC5B0791BEACB9C3658B3 /* AliceAxolotlParameters.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AliceAxolotlParameters.h; path = AxolotlKit/Classes/Ratchet/AliceAxolotlParameters.h; sourceTree = "<group>"; };
-		FC5D2F8081D1C3A447C2B0ED202DBBD8 /* TSAttachmentPointer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSAttachmentPointer.h; sourceTree = "<group>"; };
 		FC6F8529556A99EE8231F9E75158AC8B /* crypt.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = crypt.h; path = SSZipArchive/minizip/crypt.h; sourceTree = "<group>"; };
-		FCAE003CC8BD3EDE7F4F021B1AF4313E /* OWSContactDiscoveryOperation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OWSContactDiscoveryOperation.swift; sourceTree = "<group>"; };
 		FCE0EB314B836CDFD5BB29A1FBFB035E /* DispatchQueue+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DispatchQueue+Promise.swift"; path = "Sources/DispatchQueue+Promise.swift"; sourceTree = "<group>"; };
 		FD0C96CAD3F3DED9DC4CDB0D674346C3 /* crypto_int32.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = crypto_int32.h; path = Sources/ed25519/nacl_includes/crypto_int32.h; sourceTree = "<group>"; };
 		FD1AC5E703790FE139F696E4BAE6D363 /* fe_pow22523.c */ = {isa = PBXFileReference; includeInIndex = 1; name = fe_pow22523.c; path = Sources/ed25519/fe_pow22523.c; sourceTree = "<group>"; };
 		FD62A329B5763C49C1857247C3C13286 /* YapDatabaseConnectionConfig.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseConnectionConfig.h; path = YapDatabase/Utilities/YapDatabaseConnectionConfig.h; sourceTree = "<group>"; };
 		FD7E37E7E21D608D95141FC24B9868E3 /* DDLegacyMacros.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDLegacyMacros.h; path = Classes/DDLegacyMacros.h; sourceTree = "<group>"; };
-		FDDED161BBA28B05C60D591B00C1CABD /* GTSR3.crt */ = {isa = PBXFileReference; includeInIndex = 1; name = GTSR3.crt; path = SignalServiceKit/Resources/Certificates/GTSR3.crt; sourceTree = "<group>"; };
+		FD871833164197A9A3CE673BB748D76A /* ias-root.cer */ = {isa = PBXFileReference; includeInIndex = 1; name = "ias-root.cer"; path = "SignalServiceKit/Resources/Certificates/ias-root.cer"; sourceTree = "<group>"; };
 		FE028EDC6304AFA2D685B9C4438FB067 /* YapDatabaseViewMappings.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseViewMappings.h; path = YapDatabase/Extensions/View/Utilities/YapDatabaseViewMappings.h; sourceTree = "<group>"; };
 		FE4CC3C4FF9C044A56B155A376DD87C2 /* JSONDecoder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONDecoder.swift; path = Sources/SwiftProtobuf/JSONDecoder.swift; sourceTree = "<group>"; };
-		FE63F06FDD5F986F599CAC83217CF114 /* OWSCallHangupMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSCallHangupMessage.m; sourceTree = "<group>"; };
 		FE83BFA08A3C68D505CC22799933A60A /* DDFileLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDFileLogger.m; path = Classes/DDFileLogger.m; sourceTree = "<group>"; };
 		FE986A80A90BEDCB0372B05F126BDDD2 /* YapDatabaseRTreeIndex.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YapDatabaseRTreeIndex.m; path = YapDatabase/Extensions/RTreeIndex/YapDatabaseRTreeIndex.m; sourceTree = "<group>"; };
+		FED37B52C8A4ED417A16FDAAA3AF48EE /* OWSOutgoingCallMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSOutgoingCallMessage.m; sourceTree = "<group>"; };
 		FEDEDC51244258F8F411EBA3A080F9FD /* Ed25519.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Ed25519.h; path = Classes/Ed25519.h; sourceTree = "<group>"; };
-		FF01C653BD9261B44E266AFDD85171A9 /* OWSOperation.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSOperation.m; sourceTree = "<group>"; };
 		FF18DC7AA2F59E69A850D457F7BE3E58 /* ge_msub.c */ = {isa = PBXFileReference; includeInIndex = 1; name = ge_msub.c; path = Sources/ed25519/ge_msub.c; sourceTree = "<group>"; };
-		FF96CEAF553A48DACDCF11F36956C4B2 /* OWSQueues.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSQueues.h; sourceTree = "<group>"; };
-		FF9B0AA2DA538FF97D300865E07DFCD5 /* TSDatabaseSecondaryIndexes.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TSDatabaseSecondaryIndexes.h; sourceTree = "<group>"; };
 		FFACDE4587A56147AE90283B292E5CF7 /* NSDictionary+MTLMappingAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSDictionary+MTLMappingAdditions.m"; path = "Mantle/NSDictionary+MTLMappingAdditions.m"; sourceTree = "<group>"; };
 		FFBA2BAB7664BF6BA1E14A706E6C11BA /* YapDatabaseManualViewConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseManualViewConnection.h; path = YapDatabase/Extensions/ManualView/YapDatabaseManualViewConnection.h; sourceTree = "<group>"; };
-		FFC2F96F6D7667A25A3D8577437A1C5D /* OWSOrphanedDataCleaner.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OWSOrphanedDataCleaner.m; sourceTree = "<group>"; };
 		FFCF6B724F02B01AA2AF222A53A9D79D /* GeneratedMessageBuilder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GeneratedMessageBuilder.h; path = src/runtime/Classes/GeneratedMessageBuilder.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -3635,30 +3631,6 @@
 			name = SQLCipher;
 			sourceTree = "<group>";
 		};
-		073BC3A97E69F87C120C9D471975ABA9 /* Security */ = {
-			isa = PBXGroup;
-			children = (
-				A64B6B5023C4F443BF4C27EF5071759C /* ECKeyPair+OWSPrivateKey.h */,
-				A9653287DC20D7EA4577C7169551EFF8 /* ECKeyPair+OWSPrivateKey.m */,
-				B747C5B68A7C6451B2CDDA6BB3364302 /* OWSFingerprint.h */,
-				73F665EF8D7A04269662295F3E8CB665 /* OWSFingerprint.m */,
-				AD882D52995294914A2C716BA1147D18 /* OWSFingerprintBuilder.h */,
-				A7C17CFEA9DB29F2608A1E58DF19E93E /* OWSFingerprintBuilder.m */,
-				1DAC82DCD23177935F515A7707FC2D0F /* OWSFingerprintProtos.pb.h */,
-				00F684F2BF62BC9279EE67BEDEA7672B /* OWSFingerprintProtos.pb.m */,
-				F07702B47EB4881E2F25D6E50AF5F655 /* OWSHTTPSecurityPolicy.h */,
-				C4038DB00C5382E26B4F41A442873113 /* OWSHTTPSecurityPolicy.m */,
-				D1494E5E7E6AA837EB49C24716193819 /* OWSRecipientIdentity.h */,
-				D522B055E7FB86F4AAF4EAD21A4C58CD /* OWSRecipientIdentity.m */,
-				EF39586E4B7979F5E65EBF0A06F5FD89 /* OWSWebsocketSecurityPolicy.h */,
-				50806551F77ED533C85531F6EB834F68 /* OWSWebsocketSecurityPolicy.m */,
-				5809310D98297861F6E8BE541F165338 /* SecurityUtils.h */,
-				B480A1222618D41343C61A82E0C2825F /* SecurityUtils.m */,
-			);
-			name = Security;
-			path = SignalServiceKit/src/Security;
-			sourceTree = "<group>";
-		};
 		07F8653F11F84A47AEC56FBB9050DF56 /* Foundation */ = {
 			isa = PBXGroup;
 			children = (
@@ -3744,14 +3716,21 @@
 			name = View;
 			sourceTree = "<group>";
 		};
-		0FA171282082602A3D900A9A46DB8219 /* Pod */ = {
+		0F385FFCD5997C9D993CA389355EF507 /* Network */ = {
 			isa = PBXGroup;
 			children = (
-				F795CF3B44E50F8222DC1F93AF5F10B7 /* LICENSE */,
-				1E0E6E614604F551953E4C389576D32D /* README.md */,
-				8A81425D524026D531372DA79BF8225C /* SignalServiceKit.podspec */,
+				36B153DC65DDD85B5C92A24D684258E1 /* OutageDetection.swift */,
+				8983A9244E7A8958274B465B616A0E6A /* OWSCensorshipConfiguration.h */,
+				B596CEBFF2A9DE1428FFCDE27FD8F8CC /* OWSCensorshipConfiguration.m */,
+				9FD4AD52560AA074075BA847B65353E6 /* OWSCountryMetadata.h */,
+				307E4232F3401FFBDFB804FB90C8498E /* OWSCountryMetadata.m */,
+				3B4051483AA77EF00D608277AADBA40D /* OWSSignalService.h */,
+				017561A12FF4B06A240722521B53D247 /* OWSSignalService.m */,
+				E0B1C295ED3647C18475CA92FCDAC813 /* API */,
+				2FEB1DA820657D76ABBE2B76DCBB9674 /* WebSockets */,
 			);
-			name = Pod;
+			name = Network;
+			path = SignalServiceKit/src/Network;
 			sourceTree = "<group>";
 		};
 		0FA80FB5A137EC48E94A3FA2F2ADA670 /* extobjc */ = {
@@ -3817,11 +3796,30 @@
 		10AB3466F9309A9085C4E58E665BC846 /* Development Pods */ = {
 			isa = PBXGroup;
 			children = (
-				1B01BD7371A2626A4A15093B643B5402 /* SignalServiceKit */,
+				5242F93BA94B1D1540FD441811297FE9 /* SignalServiceKit */,
 			);
 			name = "Development Pods";
 			sourceTree = "<group>";
 		};
+		11B11C65E02E1AD0BA27DF3619B586F3 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				1E046CB740EAF9BDB893F46140765E4B /* DigiCertGlobalRootG2.crt */,
+				7E2D4510147555CF056136635AB6D26F /* DigiCertSHA2HighAssuranceServerCA.crt */,
+				578265E19CDCB21B90963B66A3FE2014 /* GIAG2.crt */,
+				404DCC447395895E59573656CDD3DF66 /* GSR2.crt */,
+				F33535F61A45AB839CD158E9A9B6528A /* GSR4.crt */,
+				7C3B30752D5B5C64D30AFD11E30C778B /* GTSR1.crt */,
+				C0ECD69E2A2BAA46B1D5417C89310E05 /* GTSR2.crt */,
+				885F8FAC1A5530851EDB8D8045D36AC4 /* GTSR3.crt */,
+				07C5DD4B2C9FEF3772A5E20E55F3E8C3 /* GTSR4.crt */,
+				FD871833164197A9A3CE673BB748D76A /* ias-root.cer */,
+				5BE61ACAA0FF24C273C6E099BF1583F0 /* SFSRootCAG2.crt */,
+				26F44995B18E1A0CC8374021C2391F06 /* textsecure.cer */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
 		164E26D233030ACDA8CC912DEEC39FEE /* Support Files */ = {
 			isa = PBXGroup;
 			children = (
@@ -3836,30 +3834,18 @@
 			path = "../Target Support Files/AFNetworking";
 			sourceTree = "<group>";
 		};
-		1B01BD7371A2626A4A15093B643B5402 /* SignalServiceKit */ = {
+		19DFB03BF379C1EAB752C7325D4C1269 /* Account */ = {
 			isa = PBXGroup;
 			children = (
-				E01805482847BDFDBD65E417790CFD23 /* SignalServiceKit.h */,
-				25443B9D114F96B12799F36BAA459580 /* TextSecureKitEnv.h */,
-				439E21C375E6B238C1CD62A80ECD3FDF /* TextSecureKitEnv.m */,
-				D43BA48BA07AD42F049FF7D3FEC8040C /* TSConstants.h */,
-				1991891CE4CE82997AA070F377C6A60A /* TSPrefix.h */,
-				60D10E30E6EA1222ED675198F1D95074 /* Account */,
-				515DBA4025A36CF9AF33A0188ACC9A56 /* Contacts */,
-				84A6414C4F8E47476DA163384C7266C6 /* Devices */,
-				20E169523B8316201B4ACD6527495434 /* Messages */,
-				C6C946B0A2CF32BBD250FDB072962354 /* Network */,
-				0FA171282082602A3D900A9A46DB8219 /* Pod */,
-				80B6F85D327020582C7EC74618FA3018 /* Protocols */,
-				4099D2323D3A18B85589CDEC7CBC6514 /* Protos */,
-				87128433C5BFEA2C72DB30392D6F1841 /* Resources */,
-				073BC3A97E69F87C120C9D471975ABA9 /* Security */,
-				CF5EEB079034098527BE1C9669868BDE /* Storage */,
-				5ACA0694F40C9DD9822670E9A9EDD365 /* Support Files */,
-				25F15C4EB11DFAB982CAFB84C6E80187 /* Util */,
+				2E8D8AAF5EF97D9ECA0C1F1A12ABF338 /* TSAccountManager.h */,
+				809155732CEF30E37A57A4F2D001BD99 /* TSAccountManager.m */,
+				21C69349E95262BD57B6DB987E62E49C /* TSAttributes.h */,
+				A04F52856FCC4437AA59675217FC6B59 /* TSAttributes.m */,
+				8596D56936F338EED57C695E71A744C7 /* TSPreKeyManager.h */,
+				794136C6F2F8DD4DBA9F087AA98C64C3 /* TSPreKeyManager.m */,
 			);
-			name = SignalServiceKit;
-			path = ..;
+			name = Account;
+			path = SignalServiceKit/src/Account;
 			sourceTree = "<group>";
 		};
 		1BE60949F551B65FF71D523F161C40EB /* FilteredView */ = {
@@ -3878,6 +3864,28 @@
 			name = FilteredView;
 			sourceTree = "<group>";
 		};
+		1D14ED95725234A499B7714E3FC92DFC /* DeviceSyncing */ = {
+			isa = PBXGroup;
+			children = (
+				B9E278B855144B95A2081BB20F1E694F /* OWSIncomingSentMessageTranscript.h */,
+				CCD4F31BBCD27F02A92A807D0C67DC34 /* OWSIncomingSentMessageTranscript.m */,
+				3E52850FB6B2F6F284145096D525CA36 /* OWSOutgoingSentMessageTranscript.h */,
+				0BEF5B7DABDB72BA36AA54768D47DB05 /* OWSOutgoingSentMessageTranscript.m */,
+				28DFCE33E3FF5E367C031ACA9F896B0F /* OWSOutgoingSyncMessage.h */,
+				935A6E93A1236B5472592FB4D0F44440 /* OWSOutgoingSyncMessage.m */,
+				5EF96254992E503E99BBC7960DAD69F4 /* OWSSyncConfigurationMessage.h */,
+				92334274784D5B1694F34230F94BDC54 /* OWSSyncConfigurationMessage.m */,
+				305C16C8A5DA904F952EF4E1D302B0B5 /* OWSSyncContactsMessage.h */,
+				15094B59E422013114FA67DAA403E607 /* OWSSyncContactsMessage.m */,
+				256789598406ADCC06FF53FB980E6264 /* OWSSyncGroupsMessage.h */,
+				4FC6240CDA2B7E8CCBF9ECD4AFE09E7D /* OWSSyncGroupsMessage.m */,
+				F184ABE7028E5812A3E2A77B1B0A1D83 /* OWSSyncGroupsRequestMessage.h */,
+				E789403C585B4F0654DF297F1C0E769D /* OWSSyncGroupsRequestMessage.m */,
+			);
+			name = DeviceSyncing;
+			path = DeviceSyncing;
+			sourceTree = "<group>";
+		};
 		1FFABD87652FEE4EFEE41548FFC2124C /* Resources */ = {
 			isa = PBXGroup;
 			children = (
@@ -3886,79 +3894,87 @@
 			name = Resources;
 			sourceTree = "<group>";
 		};
-		20E169523B8316201B4ACD6527495434 /* Messages */ = {
+		2051D307FA03166D11141342E6C958B7 /* Util */ = {
 			isa = PBXGroup;
 			children = (
-				582B779C6C34FE371EF9D8E8E01A4BBB /* OWSAddToContactsOfferMessage.h */,
-				555451B2AB55080B3997746AA4D1749A /* OWSAddToContactsOfferMessage.m */,
-				28697770DC11938B05080C4DA4A7AA8A /* OWSAddToProfileWhitelistOfferMessage.h */,
-				13D00E0CA2AFF30038986AEACE1897D4 /* OWSAddToProfileWhitelistOfferMessage.m */,
-				948D91AF9838058941F0904F9F1DF8D9 /* OWSBatchMessageProcessor.h */,
-				18CAD5016000E54B88C26B672CFADFCF /* OWSBatchMessageProcessor.m */,
-				8497BB329BACD8AABA0212A2A134D91E /* OWSBlockingManager.h */,
-				AA2B07F87BCF71573F1ED93156CFCA4C /* OWSBlockingManager.m */,
-				7C77D42EFF7BC38E8AEEEA77EC8FB4B6 /* OWSCallAnswerMessage.h */,
-				9846585A727D27C7CD8156256A03DC68 /* OWSCallAnswerMessage.m */,
-				664812D70D6CA8EB7B221D694E153628 /* OWSCallBusyMessage.h */,
-				A3ADAD6AA4C431B46728C206AB0292B5 /* OWSCallBusyMessage.m */,
-				A87D16A250C07731609A188AA7837CAE /* OWSCallHangupMessage.h */,
-				FE63F06FDD5F986F599CAC83217CF114 /* OWSCallHangupMessage.m */,
-				D27036F11A73CFF04719DE21EA403D2E /* OWSCallIceUpdateMessage.h */,
-				83461F5F8585B3BF15202D01BE781E3D /* OWSCallIceUpdateMessage.m */,
-				B70282588C815066CFA577E06E12AC22 /* OWSCallOfferMessage.h */,
-				E93FBC7412CDFFCFB0A43673D24A74E6 /* OWSCallOfferMessage.m */,
-				C64097879454AF28094C433B3270F4BA /* OWSDisappearingMessagesFinder.h */,
-				F3658CAD6984DF1F320843F2685A2B5C /* OWSDisappearingMessagesFinder.m */,
-				5DC5D34B67FE1683471267C45631E8D2 /* OWSDisappearingMessagesJob.h */,
-				8136E50AAB1B286EB6C43DDEF17C006C /* OWSDisappearingMessagesJob.m */,
-				E22B8BEA04345035EAE1048940DB39AB /* OWSFailedAttachmentDownloadsJob.h */,
-				9D35708074542E5B1B94EE8DB1F909F5 /* OWSFailedAttachmentDownloadsJob.m */,
-				78EF4F2362E4AAB604616FC4DB2ABFBF /* OWSFailedMessagesJob.h */,
-				D02D704BD489EE312522B49B3A80658B /* OWSFailedMessagesJob.m */,
-				369A29176C6B3D4FFA8D54739DE7CC0F /* OWSIdentityManager.h */,
-				15F2DC51513BE6376A4ACC63D42267BF /* OWSIdentityManager.m */,
-				E790FFD630BE46B12350C469D1BF9B04 /* OWSIncompleteCallsJob.h */,
-				6B96A139B687FCCC4F3C3A1800CAAAA2 /* OWSIncompleteCallsJob.m */,
-				0D5A902A15173DC16F0108AC9153D5BE /* OWSMessageDecrypter.h */,
-				42D768F59E01262E53D84035AA52BC6A /* OWSMessageDecrypter.m */,
-				671636927A748208D988BC51C8EAAF19 /* OWSMessageHandler.h */,
-				2E39AC9A5A23D49F8811A91E9CA4BE16 /* OWSMessageHandler.m */,
-				BC00444A687003EDA96AE7F5EE6D820D /* OWSMessageManager.h */,
-				F5DBC54477F173CE4322BB2A8F0AB556 /* OWSMessageManager.m */,
-				C2D38312B925794428A3BB94D8BFFC4A /* OWSMessageReceiver.h */,
-				705809ADC5CBDF8B4A575D5D0EEDDF9E /* OWSMessageReceiver.m */,
-				9C1112D2596C69C76939456ED1C79E66 /* OWSMessageSender.h */,
-				13E47872A04C6E7720A1B9A0B4624B37 /* OWSMessageSender.m */,
-				6B89DD3853AE975BDE86D0DEA6C0EED0 /* OWSMessageServiceParams.h */,
-				4DEA9A213F89A980259A9040616C857D /* OWSMessageServiceParams.m */,
-				526B756DDB3CA96A92B7EC85367B0A1B /* OWSMessageUtils.h */,
-				39746EDEB77B7BD826D6C93C9AEF4B42 /* OWSMessageUtils.m */,
-				1346FDE91DDA9B5B68E19C684816F4E7 /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.h */,
-				DF28247262E9BBB702C4C4CFED1D1A40 /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.m */,
-				C2ABEA8D2B6C2178AF07899A274BCCF5 /* OWSOutgoingCallMessage.h */,
-				FA52478855E389788B4AACD2BCD40FA0 /* OWSOutgoingCallMessage.m */,
-				5438334DD5215BAAEECE8AF15B34E4CC /* OWSOutgoingNullMessage.h */,
-				AA66A7D411F6CF3F10DCFFD51EB7BE49 /* OWSOutgoingNullMessage.m */,
-				A35845F6C7205D135D658157E14E7823 /* OWSProfileKeyMessage.h */,
-				44D4F8F189065B5F92D8B2A7F49C7D44 /* OWSProfileKeyMessage.m */,
-				A57F5765F3EDD6F5E9C81CA19317947B /* OWSReadReceiptManager.h */,
-				45D5924C45AB7A0036D734A888A181AA /* OWSReadReceiptManager.m */,
-				BED91F6DA8CD15F04C3C7D4C1F46CD84 /* OWSReadTracking.h */,
-				DB703A1B16D16E5987F7EBD484E31A66 /* OWSUnknownContactBlockOfferMessage.h */,
-				A611AD40294C79AB0BDA872EF21D6EC3 /* OWSUnknownContactBlockOfferMessage.m */,
-				73857E17FE2EEE9E85B1D6E51334F25A /* PreKeyBundle+jsonDict.h */,
-				46A50534032487C63B8D57D9360748B1 /* PreKeyBundle+jsonDict.m */,
-				5C48A257E1CA1568D911376470DD9F1E /* TSCall.h */,
-				E9195C958F6BA7FB29538724DE01EE95 /* TSCall.m */,
-				558A800007BDBB3F5A2B48C8469F7337 /* TSGroupModel.h */,
-				C38D26455FB633E8962A251659E27CD6 /* TSGroupModel.m */,
-				90D701678F56F1E6569C64637DD6CBDD /* Attachments */,
-				5A7BDB7637E04EB543CC79FFB8EA77D7 /* DeviceSyncing */,
-				9197194A99F6A7715F40562CBD198C8C /* Interactions */,
-				B3C2776E1214FA7CBD8622E6AE0ADA76 /* InvalidKeyMessages */,
+				9227BCDB8E9050F9F326EDD1009BF45E /* AppContext.h */,
+				1EB4E8B77B94E69E1B181446EC8D2A20 /* AppContext.m */,
+				BB47E0CB75572AC8F82A63BFC9EA487F /* AppReadiness.h */,
+				BB6557D2C8E0B566296A5B3300F692A3 /* AppReadiness.m */,
+				0EE57475FFAB9AC9FB8E1F19E2EF016F /* AppVersion.h */,
+				7F62F1643E0C1F4EBF830813DF26835C /* AppVersion.m */,
+				8BB1F13B725960979F8BB79ECE8DDFEC /* ByteParser.h */,
+				128D37053476000A49275D61A30894FE /* ByteParser.m */,
+				87BF49C75D773E100EB1EC5CB9001B74 /* Cryptography.h */,
+				B5CC430919A3E517A006286B87D65EE7 /* Cryptography.m */,
+				5D2F271352A41D918B5E48011C203A1F /* DataSource.h */,
+				3E992D4725D49631CE910EFB9CC5F178 /* DataSource.m */,
+				5D46F08A069A867125B21A80CF9FB6EF /* FunctionalUtil.h */,
+				D0E470848E72E1826D838312F73F504A /* FunctionalUtil.m */,
+				0C1DAF4114664C34F6CD9A0504353175 /* iOSVersions.h */,
+				9C5F696C3848D7A6FDD2E1C22961F701 /* MIMETypeUtil.h */,
+				A1DA21EE699577A70136604E99C5561C /* MIMETypeUtil.m */,
+				3DCF0BAB5C770833C718276E246B2CAB /* NSArray+OWS.h */,
+				C8B2EE64D6F657C5B0CF0123690D6831 /* NSArray+OWS.m */,
+				A8E59DF59A912A9235A4191A5A92AEED /* NSData+Base64.h */,
+				518AD2F9804CAB60B809061ABAB3F3B8 /* NSData+Base64.m */,
+				22FD0DBAF9E5385DBDE7E9EA0E9F52FB /* NSData+Image.h */,
+				68685C031AB882FE093199F555BDC393 /* NSData+Image.m */,
+				A95D32138D90C34FDC3F017D2A9773DD /* NSData+messagePadding.h */,
+				6614862981908D10969B74135DD1D40D /* NSData+messagePadding.m */,
+				3B4699F3EE3FDAFA50EAD5283FD586F4 /* NSData+OWS.h */,
+				0E612E08D8064A4A8D38D832EBCC2B45 /* NSData+OWS.m */,
+				E5B1F47515199B7D49B7B2AA134CEC42 /* NSDate+OWS.h */,
+				045AB9359A54A83587F6B9E02FA09ED7 /* NSDate+OWS.mm */,
+				9DBDD55E20879C384DD61CD631F718AC /* NSError+MessageSending.h */,
+				35CE2F9AA16964EE6FADAF5537299D32 /* NSError+MessageSending.m */,
+				584A8DAD5F48D106520353FC13391C40 /* NSNotificationCenter+OWS.h */,
+				18063A6F2C02DF18E3ED8EF5AAFC2938 /* NSNotificationCenter+OWS.m */,
+				DD3D525EF6D7FDFE1727C2BF5ED81D65 /* NSObject+OWS.h */,
+				209AF5EE9DA1C70A1F7EC6441373A8C7 /* NSObject+OWS.m */,
+				9D57CC4C5F182FA4F8BDC853AD3239D1 /* NSString+SSK.h */,
+				7DF161EF1F5AF9F1B3C0EF7F66028DDA /* NSString+SSK.m */,
+				04A99890F54D86C5277C925554089928 /* NSTimer+OWS.h */,
+				446170C5A737E474E75D597E48D67CCD /* NSTimer+OWS.m */,
+				C6BBD211883D04DA7B250F0DC15F8457 /* NSURLSessionDataTask+StatusCode.h */,
+				34320BDBD45225021843DAE8BBBF69F1 /* NSURLSessionDataTask+StatusCode.m */,
+				4BCC1A80A46B04B2CB6232972B4A0678 /* NSUserDefaults+OWS.h */,
+				F53572DE8534FDE9A2AAD79287420493 /* NSUserDefaults+OWS.m */,
+				CB7890D6B1B8D31D1F853CC076468B4C /* OWS2FAManager.h */,
+				F93CAFFEA7531FCF100E403A1951C848 /* OWS2FAManager.m */,
+				9C8E6EA45C0F033AC766F4172BCB11C1 /* OWSAnalytics.h */,
+				7A1FCCF9AC11B5E83A3D5900BCB7C928 /* OWSAnalytics.m */,
+				CA10129A8A25EA149DA170C7393DB7E1 /* OWSAnalyticsEvents.h */,
+				813EC8F6346C15A6A9C8ACD65E5317E4 /* OWSAnalyticsEvents.m */,
+				0669B00F60EECF0F0DB05ED59F927DF8 /* OWSAsserts.h */,
+				D3B1B1EF05BD38BB43EFBB3DABFF90FD /* OWSAsserts.m */,
+				0EC5C462F0679A6B1DD6512A4E6DAB97 /* OWSBackgroundTask.h */,
+				7355830E51ECC78EAE38388E1E9F3C11 /* OWSBackgroundTask.m */,
+				5EE8EADAFE2AC26C8AABC875EBCC5FC7 /* OWSBackupFragment.h */,
+				428E0B790047699ECA52FC1B8B2D504C /* OWSBackupFragment.m */,
+				DFE5EB3520EAF5808BC9E0A6DA6B1503 /* OWSDispatch.h */,
+				97A0F57A8AB2F431DA78837377073BAA /* OWSDispatch.m */,
+				1BA90CAF907A0DD4E4B6A4723083B9AE /* OWSError.h */,
+				034C6CF96E3C5DA5214BFBC7C1170B15 /* OWSError.m */,
+				5DEFCEFB4647B8A978C734AD37F16E04 /* OWSFileSystem.h */,
+				241FE9D8086B95D1CA2E43FB695F91B7 /* OWSFileSystem.m */,
+				774C8CAFBAFBAD82D94101A57B5777C6 /* OWSLogger.h */,
+				343B93F86FDDA869FDA6BAE5DECEDA3B /* OWSLogger.m */,
+				DCEC3703933E8076FB3916B7952915BE /* OWSOperation.h */,
+				69C2E2B87783B3041AE236F21A028814 /* OWSOperation.m */,
+				E24600DAB2B39B420164E063454366FC /* OWSQueues.h */,
+				B06E0C4A729577AF4B6715808B7506CA /* OWSSwiftUtils.swift */,
+				6D7D3EBA67783088039E08A98B5ACF32 /* ParamParser.swift */,
+				28FB771656DD9B1F0EA3A857C341F41D /* Promise+retainUntilComplete.swift */,
+				1E5DE337300507BB63838B25F13B3D29 /* Threading.h */,
+				13022CFE2DC6A6C22E5665E80419DFE0 /* Threading.m */,
+				CF0597A9A4511323E43F39E923756EAA /* UIImage+OWS.h */,
+				7F735985656EE5B82E9A59291A91532A /* UIImage+OWS.m */,
+				66C94825C32FAFA2D19CB436143834D3 /* WeakTimer.swift */,
+				ED9AB101CA2A222FB48FC0983EA83681 /* constraints */,
 			);
-			name = Messages;
-			path = SignalServiceKit/src/Messages;
+			name = Util;
+			path = SignalServiceKit/src/Util;
 			sourceTree = "<group>";
 		};
 		23BF68CE7AF480D78B71EA3B2DA3FD00 /* Support Files */ = {
@@ -3975,89 +3991,6 @@
 			path = "../Target Support Files/HKDFKit";
 			sourceTree = "<group>";
 		};
-		25F15C4EB11DFAB982CAFB84C6E80187 /* Util */ = {
-			isa = PBXGroup;
-			children = (
-				1703DBEA9A0F5BF2E6FDDABB1606D23F /* AppContext.h */,
-				A77FC4E92E7ECB8CC3DAFA4A605E6EEB /* AppContext.m */,
-				707712E875C75BE61CF9ACF5AFED28D6 /* AppReadiness.h */,
-				37977B5CA3E96822F5727D53C13B4C57 /* AppReadiness.m */,
-				8F6AFA30514B9C30CE70C6D091EE7982 /* AppVersion.h */,
-				CF5C46EEC133BA0ECA03B04BD210685A /* AppVersion.m */,
-				2CED919651EFE0027B1950434246D9C0 /* ByteParser.h */,
-				89045AD5563770A8C168A08A0B4972E2 /* ByteParser.m */,
-				2BC1545E958169B2E23925FEB6365EE2 /* Cryptography.h */,
-				44CCF7AB7638EA1E4483DDFAB53DF077 /* Cryptography.m */,
-				AC6D9C363A20C0E37DC236C365AE7D03 /* DataSource.h */,
-				D6A9E1D862BE5EE8F6C176DD8BD97CDF /* DataSource.m */,
-				B62293EF5E91E1CDF187A64F88092D36 /* FunctionalUtil.h */,
-				254E906D11E7714E9CB9DA8E818B64FB /* FunctionalUtil.m */,
-				326CFF270B63021CF220CE534ABA46A6 /* iOSVersions.h */,
-				E0D423E15BF7026DEB0566965610B3B8 /* MIMETypeUtil.h */,
-				B294575969E66B07ACFB2674C1A98375 /* MIMETypeUtil.m */,
-				85A55A417805D3D06E3B2F3F85C3F717 /* NSArray+OWS.h */,
-				1454D71A7773D6D9B63A441A06FC4818 /* NSArray+OWS.m */,
-				4FB7B89FEBC47E2B880EAE57CED8CE47 /* NSData+Base64.h */,
-				2E5EEC04E0850DF3DE9F802944314107 /* NSData+Base64.m */,
-				D96708651683272BDF510A982045755A /* NSData+Image.h */,
-				E1DC366A85C9D9DE16B5295DB1633FFD /* NSData+Image.m */,
-				63ECED1929426DE001DE0F179FCE4207 /* NSData+messagePadding.h */,
-				C9D4985C424C72BB37C86E7E9B94F89C /* NSData+messagePadding.m */,
-				340643BD1BFC9A5A6E6CF39344EEC514 /* NSData+OWS.h */,
-				451D4CBD6551E643DAE8CD949A2941C6 /* NSData+OWS.m */,
-				49DF6BC24395FC978B59E20CA45AD8A1 /* NSDate+OWS.h */,
-				ED06BCDF9223725A6F8DF2E462EDBE9F /* NSDate+OWS.mm */,
-				63219847586296EA9FF7EED0294D3895 /* NSError+MessageSending.h */,
-				298381EB8EAC1709104D74910D55D413 /* NSError+MessageSending.m */,
-				30CC1556309A95CCAE5FE9383F6FF7D0 /* NSNotificationCenter+OWS.h */,
-				9E25B2851CF74C5DB51508E40EBAC96B /* NSNotificationCenter+OWS.m */,
-				AC602C0278DCABEE68225B9C59961987 /* NSObject+OWS.h */,
-				813C6D0BEC1DDEA3B1A5AEFDE59E478F /* NSObject+OWS.m */,
-				B4965DA1D17633A8F76C1168BE750652 /* NSString+SSK.h */,
-				5861C72E1A3086FC33DA6AE4D33A672D /* NSString+SSK.m */,
-				78445B986114E16E196E63B08A0BFEF7 /* NSTimer+OWS.h */,
-				5133EAB0DCEF514E3C478D6EB5F054E2 /* NSTimer+OWS.m */,
-				73DC0262C563D66828DF7EF33BAA922E /* NSURLSessionDataTask+StatusCode.h */,
-				2DDFB51C2F07FCC5B553270036D45A95 /* NSURLSessionDataTask+StatusCode.m */,
-				A141AA872CB6BD74274E5F236FE8179C /* NSUserDefaults+OWS.h */,
-				C8AFB2C4A0FCBCCD6C5F40A7E568393D /* NSUserDefaults+OWS.m */,
-				6F802507C7327CB2AD041164C4ED1181 /* OWS2FAManager.h */,
-				518BCD1FD6BCC27CBB30F777A972D70F /* OWS2FAManager.m */,
-				9F9E2E29CB6BA3D25A211F319AD08B35 /* OWSAnalytics.h */,
-				3FB3D34FE02E9B8E97721AB15E3D7A92 /* OWSAnalytics.m */,
-				77E7BC5893B697095E9E6F30B35B057C /* OWSAnalyticsEvents.h */,
-				6347F3776BC9CDBCBFFE5613A3155CB5 /* OWSAnalyticsEvents.m */,
-				77A6474B2713E1851F707240DD972CC4 /* OWSAsserts.h */,
-				D52AF4EFBB0F656E8E213CB407938549 /* OWSAsserts.m */,
-				E78021C341F490C8C508A22AADDB03CF /* OWSBackgroundTask.h */,
-				D2DAC06623851F526BCA37E518BF94B6 /* OWSBackgroundTask.m */,
-				E56669DA81F7018732B8268061ED6618 /* OWSBackupFragment.h */,
-				C8C41B93281D1BBE5185648A996590D1 /* OWSBackupFragment.m */,
-				0893BE6D85C604B0A2D7FAC56FDFB5DF /* OWSDispatch.h */,
-				356D8727507334DCA8E7D6BAC1398D86 /* OWSDispatch.m */,
-				8AB4AE89FA16B4E41D43A85F3B41A0E0 /* OWSError.h */,
-				2112A472BBE6AAE99A0E4D7333BABD3D /* OWSError.m */,
-				9FCFAADBBB3452010B8C2CF8BF482F2F /* OWSFileSystem.h */,
-				56086BB87093FE7D3B0D6DE9ECA898C6 /* OWSFileSystem.m */,
-				8202F2DDE39977A6FD4A46DF772483E8 /* OWSLogger.h */,
-				7051BA719B3C071098AFD4F2AF41A4DC /* OWSLogger.m */,
-				322267C8FAE8A3E23CF77D75611B933C /* OWSOperation.h */,
-				FF01C653BD9261B44E266AFDD85171A9 /* OWSOperation.m */,
-				FF96CEAF553A48DACDCF11F36956C4B2 /* OWSQueues.h */,
-				B46F91D5B8C54FD4BB7CA312D9204B1E /* OWSSwiftUtils.swift */,
-				E92A1505D72661FB46FA29D07128E134 /* ParamParser.swift */,
-				4512F9816C9763DC21FA4D90D48C17D9 /* Promise+retainUntilComplete.swift */,
-				4CD7BE7CB8812EA8ED02ABD3AFFFB8E2 /* Threading.h */,
-				6A2B3D0C31B6C60E3B9B84830A638268 /* Threading.m */,
-				BDD81A343551770E69146E2D460CD20F /* UIImage+OWS.h */,
-				497B1EF9135C160BCDC8DB53AB5B66B1 /* UIImage+OWS.m */,
-				ADEFB780F5009781A090E569DB299286 /* WeakTimer.swift */,
-				C2381EEE7F6EEAD101DBE3E7F01DFC07 /* constraints */,
-			);
-			name = Util;
-			path = SignalServiceKit/src/Util;
-			sourceTree = "<group>";
-		};
 		2B4849DD7C90AF104D5A2725B6AFF7E1 /* SearchResultsView */ = {
 			isa = PBXGroup;
 			children = (
@@ -4091,6 +4024,111 @@
 			path = "../Target Support Files/ATAppUpdater";
 			sourceTree = "<group>";
 		};
+		2C4B9C84A488A61EF2760C15D75D9535 /* Messages */ = {
+			isa = PBXGroup;
+			children = (
+				877F2388D703248A79AA31A182A58DE3 /* OWSAddToContactsOfferMessage.h */,
+				29A16A57E1907EEB80D30E1259D5A851 /* OWSAddToContactsOfferMessage.m */,
+				5D44F05E1707CC0EC9576D19A44F326D /* OWSAddToProfileWhitelistOfferMessage.h */,
+				6D7EA1AFCC0D848328F57D5E37E83863 /* OWSAddToProfileWhitelistOfferMessage.m */,
+				463CEA6154BD03513017B94855150988 /* OWSBatchMessageProcessor.h */,
+				DEC48287E6CBFC8A07383E195B69F88A /* OWSBatchMessageProcessor.m */,
+				9CE4158E0B5B8A498C3EB536733E9A5D /* OWSBlockingManager.h */,
+				3F1101D6A8E30AA339C6EF1FFBD639F9 /* OWSBlockingManager.m */,
+				625F22A62AD1F4294CCBD4788D1E590E /* OWSCallAnswerMessage.h */,
+				24820FEAEC1BA8EB9D17C25A3BD9DCFA /* OWSCallAnswerMessage.m */,
+				3CAB9F597D0F505B7092B1BA97A3BBFC /* OWSCallBusyMessage.h */,
+				BC6BB378E808FACCC665A106A33F4615 /* OWSCallBusyMessage.m */,
+				970F486137849B5CC94D40DF254C0C82 /* OWSCallHangupMessage.h */,
+				479F36C9AE0FA0880B9E5EC24FD19E7E /* OWSCallHangupMessage.m */,
+				C0BE95DF7A601EE23E349D2E08AEF1D5 /* OWSCallIceUpdateMessage.h */,
+				321B0046904E5ECC79D317F3484187E9 /* OWSCallIceUpdateMessage.m */,
+				F1E1A67E521174E69AA91B59B4F5C819 /* OWSCallOfferMessage.h */,
+				4A31B6E0D741B89D59D34FEA442BD104 /* OWSCallOfferMessage.m */,
+				03FF8730D027CF37A57EA4643A2560BE /* OWSDisappearingMessagesFinder.h */,
+				F631165837D7A47024E20D3BBC907F54 /* OWSDisappearingMessagesFinder.m */,
+				7BB37D56F94E93AEE1AEC8F2151B8FDC /* OWSDisappearingMessagesJob.h */,
+				F12D43BB9185A4094D6EB57A2F8DF8F5 /* OWSDisappearingMessagesJob.m */,
+				189DE6D20F64C6815969E86A03790FD2 /* OWSFailedAttachmentDownloadsJob.h */,
+				030DF529C31A24D2B5169866C68051E7 /* OWSFailedAttachmentDownloadsJob.m */,
+				E73B001A4AA833F35857843F9E632342 /* OWSFailedMessagesJob.h */,
+				363F37E250119A0541255418CB9F4FF4 /* OWSFailedMessagesJob.m */,
+				08575BC5C7EE825352C80CCA3F5EA9CF /* OWSIdentityManager.h */,
+				4647B51C5238D60EE7150931EF1F819A /* OWSIdentityManager.m */,
+				755F4D66318447D2529B9977B94AFA13 /* OWSIncompleteCallsJob.h */,
+				B8FA1C39CD90A08A728D5392075FAF01 /* OWSIncompleteCallsJob.m */,
+				781B270B44609A9A881A527DE6DC46A0 /* OWSMessageDecrypter.h */,
+				707B7FDFD627103E558D86393C73C78C /* OWSMessageDecrypter.m */,
+				B390F841F9CDC0BE583E391284ACDD14 /* OWSMessageHandler.h */,
+				28D0078EFA22A52F53BD480A86BCA2AA /* OWSMessageHandler.m */,
+				26336F0FFAF2C7AD027373753BEE9E2F /* OWSMessageManager.h */,
+				22C14B755CB9F693EAE950700239D783 /* OWSMessageManager.m */,
+				F1A58CB77101BC6642181196DC1718D4 /* OWSMessageReceiver.h */,
+				AE1C049FE1FC8213362E219A5FCECB93 /* OWSMessageReceiver.m */,
+				97BA9310FF66D97373376434D6AE1E8C /* OWSMessageSender.h */,
+				1A2679778C5BE6AE902DA386273F6124 /* OWSMessageSender.m */,
+				2D4A607733EEFABC0BBE85CB65AFBEE8 /* OWSMessageServiceParams.h */,
+				81AAD4A523194D142CAFBD3BD5D37A3A /* OWSMessageServiceParams.m */,
+				0AE6D5721DEBDB68FC360AD29ADB46D4 /* OWSMessageUtils.h */,
+				BE76AB5FFB6311B4A9F77BE3C03F6928 /* OWSMessageUtils.m */,
+				CD3771419E86ED6A25144F856CA50EFF /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.h */,
+				C7E88C37B63D1B5450CC492FA86BAD77 /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.m */,
+				6B302ED12C45E43DA9DBD0ADB5410A18 /* OWSOutgoingCallMessage.h */,
+				FED37B52C8A4ED417A16FDAAA3AF48EE /* OWSOutgoingCallMessage.m */,
+				D65AC8D1DC2EAD8A432FB3DEF26E1495 /* OWSOutgoingNullMessage.h */,
+				34CEC047500668E56EF60397E90122D1 /* OWSOutgoingNullMessage.m */,
+				3E878EFC29205FA4982A6F25F1F0A281 /* OWSProfileKeyMessage.h */,
+				2314AFF0182C4B396F6231B2EA5D451D /* OWSProfileKeyMessage.m */,
+				108535065E178B57C9C38DD6D50E730F /* OWSReadReceiptManager.h */,
+				8A9DBB62FAACF4C06EA366B612644716 /* OWSReadReceiptManager.m */,
+				27465E08E4AFFC03931ACBADC61C277D /* OWSReadTracking.h */,
+				D25366A7C3DD93AE19D0F90B138C7FF4 /* OWSUnknownContactBlockOfferMessage.h */,
+				668B495FE40701A1A357AE4442642BE4 /* OWSUnknownContactBlockOfferMessage.m */,
+				31C2C72487AC3C95637445C0E9D1C720 /* PreKeyBundle+jsonDict.h */,
+				0E3567A0248C1930F1CF875E793C0E84 /* PreKeyBundle+jsonDict.m */,
+				D9051A47AD0D7B7D8A8E7B000179B195 /* TSCall.h */,
+				DB2431D19257F23B2DB55E825A85ED64 /* TSCall.m */,
+				3E33A7A815DB08E7B205A4293550EFEF /* TSGroupModel.h */,
+				1D05B6121CE66B51D2F095419730910F /* TSGroupModel.m */,
+				A470E0C58CBBBA05256FE9F0F71FA7DA /* Attachments */,
+				1D14ED95725234A499B7714E3FC92DFC /* DeviceSyncing */,
+				43E027E45F75C8CF8906F93B2DCC89A2 /* Interactions */,
+				64FF89EB2733EBA40CA3696D18A565DE /* InvalidKeyMessages */,
+			);
+			name = Messages;
+			path = SignalServiceKit/src/Messages;
+			sourceTree = "<group>";
+		};
+		2FEB1DA820657D76ABBE2B76DCBB9674 /* WebSockets */ = {
+			isa = PBXGroup;
+			children = (
+				C8DC041280F2D718B5BCEF334AEBAA54 /* TSSocketManager.h */,
+				C92573B019E11BD3AF43675A65C38B8F /* TSSocketManager.m */,
+				01E40C234C86974BBEB5036C13C0F74E /* WebSocketResources.pb.h */,
+				7E81D71E6383CDC4AD5BF7BC218D2BF8 /* WebSocketResources.pb.m */,
+			);
+			name = WebSockets;
+			path = WebSockets;
+			sourceTree = "<group>";
+		};
+		355ED715EF79E8EB695FCD7EDEC773FB /* AxolotlStore */ = {
+			isa = PBXGroup;
+			children = (
+				5636307CB3BD384DD6F7153CAE75583D /* OWSPrimaryStorage+Calling.h */,
+				3B2D8ABED50562D5C1617DFFA248E3DE /* OWSPrimaryStorage+Calling.m */,
+				D6A6CEEFA6861466743377992FB297EC /* OWSPrimaryStorage+keyFromIntLong.h */,
+				1FD1B6FB2C340B761F4A4BB4BF303500 /* OWSPrimaryStorage+keyFromIntLong.m */,
+				D227353D51A5527255638EC37578ECBE /* OWSPrimaryStorage+PreKeyStore.h */,
+				CF65E6F0B6C3E6BB301FB8312A27046C /* OWSPrimaryStorage+PreKeyStore.m */,
+				C024A4D0C3AA1DDA449AF3D5305F7798 /* OWSPrimaryStorage+SessionStore.h */,
+				2E60FD9C63C3DD8D13835DAC24A9B4B6 /* OWSPrimaryStorage+SessionStore.m */,
+				01774CB3C3CEA2D81316D45375550178 /* OWSPrimaryStorage+SignedPreKeyStore.h */,
+				C62FD32DA9CE379D1B9EBAF216C3C4E6 /* OWSPrimaryStorage+SignedPreKeyStore.m */,
+			);
+			name = AxolotlStore;
+			path = AxolotlStore;
+			sourceTree = "<group>";
+		};
 		35A36E5260E3CFED9E7CCEA937F4660B /* CloudKit */ = {
 			isa = PBXGroup;
 			children = (
@@ -4164,15 +4202,6 @@
 			path = "Target Support Files/Pods-SignalMessaging";
 			sourceTree = "<group>";
 		};
-		4099D2323D3A18B85589CDEC7CBC6514 /* Protos */ = {
-			isa = PBXGroup;
-			children = (
-				50F1E8D5A23FF73E3E7ECA0F22DB8FEC /* Generated */,
-			);
-			name = Protos;
-			path = SignalServiceKit/src/Protos;
-			sourceTree = "<group>";
-		};
 		42A891501E53D9BCD4AD1E92F3C295F0 /* ActionManager */ = {
 			isa = PBXGroup;
 			children = (
@@ -4193,6 +4222,42 @@
 			name = ActionManager;
 			sourceTree = "<group>";
 		};
+		43E027E45F75C8CF8906F93B2DCC89A2 /* Interactions */ = {
+			isa = PBXGroup;
+			children = (
+				F4D7A91B7DCEC1C62C061D2FFB52DC9B /* OWSContact.h */,
+				90B697318E4B747966BE4C4C7209EE59 /* OWSContact.m */,
+				59A8C2B91F7A27A7351A00B64F929426 /* OWSContact+Private.h */,
+				33EE1D9EFC506BD11D92D311B7A17605 /* OWSDisappearingConfigurationUpdateInfoMessage.h */,
+				75615607A30B7B3FD6494C042AB4A514 /* OWSDisappearingConfigurationUpdateInfoMessage.m */,
+				02A2355B55CB44268238F576778CB0AA /* OWSDisappearingMessagesConfigurationMessage.h */,
+				F29E9178FB17E5BB0F3BCB9E38D6CDE3 /* OWSDisappearingMessagesConfigurationMessage.m */,
+				5C1FDB629802B17D436910F53EACEDAC /* OWSDynamicOutgoingMessage.h */,
+				09C019F39B6EBBD012F28E2DA16AD9D4 /* OWSDynamicOutgoingMessage.m */,
+				F9C8DB45BF6AE855244F8D05D0A083E5 /* OWSEndSessionMessage.h */,
+				5B09227097DDAECE2A8B1AA2E0ACBE29 /* OWSEndSessionMessage.m */,
+				667BE2FFA46DDB79406BA7EA91CCBF14 /* OWSVerificationStateChangeMessage.h */,
+				B8B932F27B6A1D9027A7DE34B77A3704 /* OWSVerificationStateChangeMessage.m */,
+				5F66366D88E53DBCC785272FE883F9DB /* TSErrorMessage.h */,
+				F34269F2ADFFC4B0B79038AD0DFDD1FD /* TSErrorMessage.m */,
+				E273C9583DC2C29CBA32159C9F8C1EB1 /* TSErrorMessage_privateConstructor.h */,
+				CBF741E0ACA119EAD241DB55E063666C /* TSIncomingMessage.h */,
+				8E6B399DDB41985E9A1EBD7C60FB0304 /* TSIncomingMessage.m */,
+				76C2BDDBAD98DF988B4A0D15803DDB81 /* TSInfoMessage.h */,
+				862376E2432440456445CE750F156E5B /* TSInfoMessage.m */,
+				D979CD8342646B5E176C5783C85C65A7 /* TSInteraction.h */,
+				94BB41AB92AC6BE28C4528FA5679C04C /* TSInteraction.m */,
+				0E0EE7409103C1ED2F41E9A5B38FAC57 /* TSMessage.h */,
+				C64C2ED6C40054485F42A621DD591A2E /* TSMessage.m */,
+				F352E29A82EF0AACA2B860ADAEDEAD07 /* TSOutgoingMessage.h */,
+				E87D5362E8901814BF4F34E852A60FB7 /* TSOutgoingMessage.m */,
+				11E2FEDC58CEB859369D62186C99DAE9 /* TSQuotedMessage.h */,
+				00DEE21CEC8BE12BA9D980FD46AD79D1 /* TSQuotedMessage.m */,
+			);
+			name = Interactions;
+			path = Interactions;
+			sourceTree = "<group>";
+		};
 		4609983E40706B015EDA8A9EC4AB3254 /* Support Files */ = {
 			isa = PBXGroup;
 			children = (
@@ -4342,56 +4407,30 @@
 			path = "../Target Support Files/SwiftProtobuf";
 			sourceTree = "<group>";
 		};
-		50F1E8D5A23FF73E3E7ECA0F22DB8FEC /* Generated */ = {
+		5242F93BA94B1D1540FD441811297FE9 /* SignalServiceKit */ = {
 			isa = PBXGroup;
 			children = (
-				61B2A5170ED563DFF028C123435FD716 /* Fingerprint.pb.swift */,
-				AC812AF6B4EC91F9F83930F603B6B705 /* FingerprintProto.swift */,
-				A4F02C901AD78CE66D2E47057CD07E4E /* OWSSignaliOSProtos.pb.h */,
-				C2F962A2A0360E3980FB6E741AF67E66 /* OWSSignaliOSProtos.pb.m */,
-				5782C8AD593C2A5FFFB1F0A0C6009F12 /* Provisioning.pb.swift */,
-				C891B28F552BEE086699519DD3A6B0B6 /* ProvisioningProto.swift */,
-				95D6EB48C19F87617D31BB4D7A903EC1 /* SignalIOS.pb.swift */,
-				2692E535E5CA9C710B86AF032F218C07 /* SignalIOSProto.swift */,
-				3FB8EB8BEC8798551CC5172E602A27A3 /* SignalService.pb.swift */,
-				E3AEE00FE231E7FAF4EC500F5B271E64 /* SSKProto.swift */,
-				1F1B862DB505A4ADF14454CDF4831E39 /* WebSocketProto.swift */,
-				480C82E67D45E2721A7B4F25C877AE5A /* WebSocketResources.pb.swift */,
+				692956630524AF3CEBC88509A73E1496 /* SignalServiceKit.h */,
+				B8C905E6DEF334DD49AFAEE885D14A18 /* TextSecureKitEnv.h */,
+				ADEC441F01338CB4BA847F06A59FD1C5 /* TextSecureKitEnv.m */,
+				F70103724A492A4F2EFF4E65C1581CC2 /* TSConstants.h */,
+				275758C11772E395A44B710876719E1B /* TSPrefix.h */,
+				19DFB03BF379C1EAB752C7325D4C1269 /* Account */,
+				F6A975AC0A65C5D588ECC0E9272FA7C7 /* Contacts */,
+				8B37CE5BDD53E1EE7715BB3013E1FD20 /* Devices */,
+				2C4B9C84A488A61EF2760C15D75D9535 /* Messages */,
+				0F385FFCD5997C9D993CA389355EF507 /* Network */,
+				9033700130D20257A2A7B024292B0EAF /* Pod */,
+				A677DA78568EA9E2880B115F7EDD2121 /* Protocols */,
+				DC6CE0FE7F2CE46CD70D1A49EBF27A82 /* Protos */,
+				11B11C65E02E1AD0BA27DF3619B586F3 /* Resources */,
+				95FBE19ED6C0E53E35565053A74ED469 /* Security */,
+				E6611A7C9DFB875F446665E50131B687 /* Storage */,
+				580226D7800579F3ACBA9DCAB312133D /* Support Files */,
+				2051D307FA03166D11141342E6C958B7 /* Util */,
 			);
-			name = Generated;
-			path = Generated;
-			sourceTree = "<group>";
-		};
-		515DBA4025A36CF9AF33A0188ACC9A56 /* Contacts */ = {
-			isa = PBXGroup;
-			children = (
-				9D90302EB77FE7E507D376650D74EEE9 /* CDSQuote.h */,
-				8B19412213EDD2F55EC4D9B70DD56520 /* CDSQuote.m */,
-				E84FA178FAEB325B13D0CF5DD22C1827 /* CDSSigningCertificate.h */,
-				9CFCCE99DA01B65CAC0F59FECC94358C /* CDSSigningCertificate.m */,
-				143012388BF28FE5C2E878BC7FDBB8D5 /* Contact.h */,
-				4BD4FDDCD380EE461D15EE8D91C5FA18 /* Contact.m */,
-				D7F8DBF22CB59736275B94144C2DF749 /* ContactDiscoveryService.h */,
-				9F8891ABD159FF4F06DE4F081519363E /* ContactDiscoveryService.m */,
-				FAEAEB6856E3B8844C3C46F0E6B2C59B /* ContactsUpdater.h */,
-				D94539D8ED1E8B1199C1C6DD71D04630 /* ContactsUpdater.m */,
-				FCAE003CC8BD3EDE7F4F021B1AF4313E /* OWSContactDiscoveryOperation.swift */,
-				410487ABA793C297696A3589A5C3B1CE /* OWSDisappearingMessagesConfiguration.h */,
-				BB3436A861110E3D49FAEE5CC6B063DA /* OWSDisappearingMessagesConfiguration.m */,
-				4D037E019256FF34FD57C8BDB1B5A936 /* PhoneNumber.h */,
-				436D11384E6EDA27D0C37F8E5F8425A6 /* PhoneNumber.m */,
-				465843CEA74E01979F5BE46BD49650E7 /* PhoneNumberUtil.h */,
-				64A86B40372887E6A178EB245CCCA3CF /* PhoneNumberUtil.m */,
-				35375BF7DB9184D6A3BE0DE8E555CF91 /* SignalAccount.h */,
-				B81AE76BE4A2311A5D18790B3D322988 /* SignalAccount.m */,
-				F997C9D5DEDD97E353F0E383691F358D /* SignalRecipient.h */,
-				E2AAC5E69421FF1640869EF39CF950FD /* SignalRecipient.m */,
-				C4A9992ED6AB42966333730EB2E076E8 /* TSThread.h */,
-				E66543AA0B4464305389E6FA5304EBA1 /* TSThread.m */,
-				ECDA7BF05CFE201B2AB8F9A003699553 /* Threads */,
-			);
-			name = Contacts;
-			path = SignalServiceKit/src/Contacts;
+			name = SignalServiceKit;
+			path = ..;
 			sourceTree = "<group>";
 		};
 		55CEB4234F27C5A98F4B4A831B0376A9 /* Support Files */ = {
@@ -4419,6 +4458,20 @@
 			path = CocoaLumberjack;
 			sourceTree = "<group>";
 		};
+		580226D7800579F3ACBA9DCAB312133D /* Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				A15D33811AE49388DE14D31D1387B71D /* Info.plist */,
+				AA05AF9333FB9712B7FF4505C0A78AB9 /* SignalServiceKit.modulemap */,
+				DE9012C08AC3C6684E4D082158D849D9 /* SignalServiceKit.xcconfig */,
+				B69B6FE11B0D9FCB40AC28C630D1B5DC /* SignalServiceKit-dummy.m */,
+				2B9204B8BBA3BBCE755C41306CD2FA7B /* SignalServiceKit-prefix.pch */,
+				11173F7510904C73FE5849F7ADE936DC /* SignalServiceKit-umbrella.h */,
+			);
+			name = "Support Files";
+			path = "Pods/Target Support Files/SignalServiceKit";
+			sourceTree = "<group>";
+		};
 		58426FF1257CE3C9A8D42F5DFDDDAD06 /* Reachability */ = {
 			isa = PBXGroup;
 			children = (
@@ -4442,28 +4495,6 @@
 			path = SAMKeychain;
 			sourceTree = "<group>";
 		};
-		5A7BDB7637E04EB543CC79FFB8EA77D7 /* DeviceSyncing */ = {
-			isa = PBXGroup;
-			children = (
-				70B23604CBB92E768E9DF3074DBBBBD4 /* OWSIncomingSentMessageTranscript.h */,
-				2303CA6990F1E28279E472A356BDA152 /* OWSIncomingSentMessageTranscript.m */,
-				0F6F2CABBFA7D399CADE3773AA7965AF /* OWSOutgoingSentMessageTranscript.h */,
-				05D3581A8EB82D1E33590FCED5FDB25C /* OWSOutgoingSentMessageTranscript.m */,
-				B2246C0044CD8CAEBF4E2903FBAA75CA /* OWSOutgoingSyncMessage.h */,
-				E9BA554A07FD4C0AAEDD2599860A92BD /* OWSOutgoingSyncMessage.m */,
-				0590F2ECDF0D648DF868733D68529126 /* OWSSyncConfigurationMessage.h */,
-				53537CC518F87545C5569BC6D967597A /* OWSSyncConfigurationMessage.m */,
-				3A159DCD42E4205B519C7EDB6DEDE44F /* OWSSyncContactsMessage.h */,
-				93C5196F929F75446D886C9231827DC5 /* OWSSyncContactsMessage.m */,
-				25574B943397B4E28609CB86C4AD2945 /* OWSSyncGroupsMessage.h */,
-				454E1F5A6285CF7E2947C0D0F679DD30 /* OWSSyncGroupsMessage.m */,
-				ECA492D371F9EA340746FBEA65472C36 /* OWSSyncGroupsRequestMessage.h */,
-				E467C5C6FEA93E7BAF2CA5B464B6FB3C /* OWSSyncGroupsRequestMessage.m */,
-			);
-			name = DeviceSyncing;
-			path = DeviceSyncing;
-			sourceTree = "<group>";
-		};
 		5ABDBD295B56433D5C0D3058F3AB2884 /* Support Files */ = {
 			isa = PBXGroup;
 			children = (
@@ -4478,32 +4509,6 @@
 			path = "../Target Support Files/AxolotlKit";
 			sourceTree = "<group>";
 		};
-		5ACA0694F40C9DD9822670E9A9EDD365 /* Support Files */ = {
-			isa = PBXGroup;
-			children = (
-				4DADCA8A9439E946682C0A7A4F7BE8B9 /* Info.plist */,
-				E91FD0007CAE74D404197B6C71EE9C26 /* SignalServiceKit.modulemap */,
-				4E604A0F1CEA90BA2047FA996437D191 /* SignalServiceKit.xcconfig */,
-				18AAEA50A548D1F99A222B5181B3CC5D /* SignalServiceKit-dummy.m */,
-				A6EDF4B1B1A46EAF10365007E10BFD5B /* SignalServiceKit-prefix.pch */,
-				C847716500ADD439B3934452E92C60BA /* SignalServiceKit-umbrella.h */,
-			);
-			name = "Support Files";
-			path = "Pods/Target Support Files/SignalServiceKit";
-			sourceTree = "<group>";
-		};
-		5B49187B8C2F3E56B62FBE7C676D7B37 /* WebSockets */ = {
-			isa = PBXGroup;
-			children = (
-				DDB9F1CFF6A905DF2817B6040514574F /* TSSocketManager.h */,
-				761670D100BC70DA0A556FA4ED0C8DAB /* TSSocketManager.m */,
-				B8AF60FF53D28195286F2509AD3AFFC5 /* WebSocketResources.pb.h */,
-				19FDE6AD20A254D140595A3A42BF9006 /* WebSocketResources.pb.m */,
-			);
-			name = WebSockets;
-			path = WebSockets;
-			sourceTree = "<group>";
-		};
 		5F4B25EC1CB16F9B5B5D1DCD6EACB824 /* Mantle */ = {
 			isa = PBXGroup;
 			children = (
@@ -4543,20 +4548,6 @@
 			path = Mantle;
 			sourceTree = "<group>";
 		};
-		60D10E30E6EA1222ED675198F1D95074 /* Account */ = {
-			isa = PBXGroup;
-			children = (
-				B2008E36DEA55E0C3D794B9E8A2C39BF /* TSAccountManager.h */,
-				63BE10587C16F8C2D95BF62FC2D3FAB4 /* TSAccountManager.m */,
-				EAD746CCF71A77D00EB2BC594E1C8394 /* TSAttributes.h */,
-				253DDFBCDD9A370C005E357AFBB0CE0D /* TSAttributes.m */,
-				4DA2F10FFA8315F84DA5F1C048262D7B /* TSPreKeyManager.h */,
-				C99872F33DCEC174C60682096A58D305 /* TSPreKeyManager.m */,
-			);
-			name = Account;
-			path = SignalServiceKit/src/Account;
-			sourceTree = "<group>";
-		};
 		61F67E66F190831CED4BDA4C5A934E71 /* UIKit */ = {
 			isa = PBXGroup;
 			children = (
@@ -4584,6 +4575,20 @@
 			name = UIKit;
 			sourceTree = "<group>";
 		};
+		64FF89EB2733EBA40CA3696D18A565DE /* InvalidKeyMessages */ = {
+			isa = PBXGroup;
+			children = (
+				BDC0B949D09ECD450295DAA9D48F7179 /* TSInvalidIdentityKeyErrorMessage.h */,
+				735FDD9EDC8E24E26A2D7EC10E9A386F /* TSInvalidIdentityKeyErrorMessage.m */,
+				BA39197A244B39F627DEAD8E6032D707 /* TSInvalidIdentityKeyReceivingErrorMessage.h */,
+				D3C100E70B26E998089D0B2F0694B999 /* TSInvalidIdentityKeyReceivingErrorMessage.m */,
+				30C0065E9D22C04882D5F769C4EC99B7 /* TSInvalidIdentityKeySendingErrorMessage.h */,
+				A4E10BBC87EB46F2B88426422F8AFED9 /* TSInvalidIdentityKeySendingErrorMessage.m */,
+			);
+			name = InvalidKeyMessages;
+			path = InvalidKeyMessages;
+			sourceTree = "<group>";
+		};
 		663F74D717991FB7D5FFEFF598A9E3E0 /* ConnectionProxy */ = {
 			isa = PBXGroup;
 			children = (
@@ -4672,6 +4677,18 @@
 			name = Default;
 			sourceTree = "<group>";
 		};
+		6F769A05E1888ABA16AE2278E5B2F2CC /* Threads */ = {
+			isa = PBXGroup;
+			children = (
+				F5EB78F21D70D33731893631B393446A /* TSContactThread.h */,
+				B9DB4A6FCBD42EC3737D0730D500E442 /* TSContactThread.m */,
+				ACF9C8E73A5EB01307AF2E96B74261A1 /* TSGroupThread.h */,
+				C821D636DA7F75D2248A5C07538E046A /* TSGroupThread.m */,
+			);
+			name = Threads;
+			path = Threads;
+			sourceTree = "<group>";
+		};
 		6F7B189133EB6629E71F84E1FB0F6D03 /* AFNetworking */ = {
 			isa = PBXGroup;
 			children = (
@@ -4869,18 +4886,24 @@
 			path = "../Target Support Files/Curve25519Kit";
 			sourceTree = "<group>";
 		};
-		80B6F85D327020582C7EC74618FA3018 /* Protocols */ = {
+		7F7045FAEEA5051F3B6E8D9E9945BE38 /* Generated */ = {
 			isa = PBXGroup;
 			children = (
-				6850373BFA4D42B88CD1977838174B12 /* ContactsManagerProtocol.h */,
-				3A7FA2DAC71D1A8FCBE62535A68090D2 /* NotificationsProtocol.h */,
-				71CA26BA65F1AD248A00BB73E72FD28D /* OWSCallMessageHandler.h */,
-				F0E7DE343118333D3B22ACBA9D27E0E5 /* ProfileManagerProtocol.h */,
-				E4E58832B5059FA04AFEE9FD01BE6F6B /* ProtoUtils.h */,
-				9F7860E43CBAF938C820D385D27B6235 /* ProtoUtils.m */,
+				5AC2895E920313C18311659E3A45B1A1 /* Fingerprint.pb.swift */,
+				C090C9385E2A11FA3B4CD4A9AE2336C6 /* FingerprintProto.swift */,
+				45961EB04D858EF9E9FA00D322CFFFEF /* OWSSignaliOSProtos.pb.h */,
+				6740843C68EF6A758AD3BB898B43B642 /* OWSSignaliOSProtos.pb.m */,
+				4F50577B42C115B0D097EA2B44915659 /* Provisioning.pb.swift */,
+				B5045049F1E808F3792B6EDA18A38117 /* ProvisioningProto.swift */,
+				F917564E8B9090F99417C2D5C20CA198 /* SignalIOS.pb.swift */,
+				38FD00281DCF6EC49D11D6B4CEE7CFC2 /* SignalIOSProto.swift */,
+				985CA3F14126C98F6533E725992B5D76 /* SignalService.pb.swift */,
+				03DE0A8DB101ABAC2836342BAB30DAAB /* SSKProto.swift */,
+				F51EEA8A6A450EE11416380C7C307A60 /* WebSocketProto.swift */,
+				1C4140E0CBA44E20AC58F7158C0851FE /* WebSocketResources.pb.swift */,
 			);
-			name = Protocols;
-			path = SignalServiceKit/src/Protocols;
+			name = Generated;
+			path = Generated;
 			sourceTree = "<group>";
 		};
 		815C3C1D21430B357ABFA499EEA9387F /* Security */ = {
@@ -4922,42 +4945,6 @@
 			name = AutoView;
 			sourceTree = "<group>";
 		};
-		84A6414C4F8E47476DA163384C7266C6 /* Devices */ = {
-			isa = PBXGroup;
-			children = (
-				8EDEEB3EFA77F9B6CAD65DE7B437A136 /* OWSBlockedPhoneNumbersMessage.h */,
-				89BA43D6F6C0C218BB790C138E8C20EC /* OWSBlockedPhoneNumbersMessage.m */,
-				401172D3CF99F0A1377F7F00B3353537 /* OWSChunkedOutputStream.h */,
-				16119562EDE8116A7042455A8EA8EA59 /* OWSChunkedOutputStream.m */,
-				31D43F990CC92E2B9030CA2DC76D5B96 /* OWSContactsOutputStream.h */,
-				AFC86810E9AA895404160BAE2FACA1BD /* OWSContactsOutputStream.m */,
-				43CF70AFBF22B0BAC9826C6C756BF35E /* OWSDevice.h */,
-				071A24F786F3D0511D98EDC9DE7579BE /* OWSDevice.m */,
-				116DF0F36D875D67E7ACACD7E5FA0879 /* OWSDeviceProvisioner.h */,
-				B41698C194A322CF24D5E3E5ED4C3A4E /* OWSDeviceProvisioner.m */,
-				AF1054BB0D5E9DF6B0DCD555B8A9EAC9 /* OWSGroupsOutputStream.h */,
-				A6F40EEFAAF8F62D0666354EB7049DBD /* OWSGroupsOutputStream.m */,
-				2BD06D084BDB6216F368FC5E6891321A /* OWSLinkedDeviceReadReceipt.h */,
-				6A49CA58C91BE2291C745C9267111880 /* OWSLinkedDeviceReadReceipt.m */,
-				3FC67C430811D1CD33EE910999097A05 /* OWSProvisioningCipher.h */,
-				6498259A8345D105C40A8D8B45830702 /* OWSProvisioningCipher.m */,
-				62FF1FA43FCA2616C0E4938C25A19668 /* OWSProvisioningMessage.h */,
-				2AB3DAC052A77B5856D71095FDDC2466 /* OWSProvisioningMessage.m */,
-				69AA404A4E3440AB1C85B079BAB045CE /* OWSProvisioningProtos.pb.h */,
-				53D4E79C0C87D89EE12710431F26CA80 /* OWSProvisioningProtos.pb.m */,
-				E58CE09CB4F7301622AFB5079FFFED28 /* OWSReadReceiptsForLinkedDevicesMessage.h */,
-				F95F5A4B60AAD90BCCA06EC786EC1D99 /* OWSReadReceiptsForLinkedDevicesMessage.m */,
-				4D7161078EA205A9DFC583892B89A496 /* OWSReadReceiptsForSenderMessage.h */,
-				7B42151CB1C32FAD2027C773B0AF2EAA /* OWSReadReceiptsForSenderMessage.m */,
-				71AEB98EB20C0E652A2D3FB55DE3CED8 /* OWSRecordTranscriptJob.h */,
-				19D657432FF0DA968475B8EB757BDEFF /* OWSRecordTranscriptJob.m */,
-				785701B05281DC2C7CCAF1D39BD2275B /* OWSVerificationStateSyncMessage.h */,
-				8BA7FCDDC664795F7CB4F2417AA62DC6 /* OWSVerificationStateSyncMessage.m */,
-			);
-			name = Devices;
-			path = SignalServiceKit/src/Devices;
-			sourceTree = "<group>";
-		};
 		8643BE414FD47609A2D6CB683492B9EB /* iOS */ = {
 			isa = PBXGroup;
 			children = (
@@ -4978,25 +4965,6 @@
 			name = iOS;
 			sourceTree = "<group>";
 		};
-		87128433C5BFEA2C72DB30392D6F1841 /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				2FFE7C173700FAC6BF5A82E93F7BF4DE /* DigiCertGlobalRootG2.crt */,
-				D8E89DC82ED0C9D6FEE56F28D89B515C /* DigiCertSHA2HighAssuranceServerCA.crt */,
-				5747E92F0E0958A10A4E0B1301079A3E /* GIAG2.crt */,
-				C075CB74306186930823FD7B24B4B3E4 /* GSR2.crt */,
-				82DF67E166EE8390B11DF63F8C9A1ED3 /* GSR4.crt */,
-				01D0CFDB40677718FDAA37DCDE93325E /* GTSR1.crt */,
-				36C4BBE27A42C3AD53C4EA5D52EA827C /* GTSR2.crt */,
-				FDDED161BBA28B05C60D591B00C1CABD /* GTSR3.crt */,
-				C4984B9072AF2012DED196B7A67C195B /* GTSR4.crt */,
-				B60201AB93CB0DF5D19C28BDB0E38E2E /* ias-root.cer */,
-				E32338AF00492DCBD7322D7A9CCE3EAD /* SFSRootCAG2.crt */,
-				BCF2316B1AADDCBE5CD553C6EE306731 /* textsecure.cer */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
 		87C2018128005CF326349644611D5640 /* NSURLSession */ = {
 			isa = PBXGroup;
 			children = (
@@ -5056,6 +5024,42 @@
 			path = "../Target Support Files/Reachability";
 			sourceTree = "<group>";
 		};
+		8B37CE5BDD53E1EE7715BB3013E1FD20 /* Devices */ = {
+			isa = PBXGroup;
+			children = (
+				BF5EEF1FE3E053C50ECB2A79007C27E7 /* OWSBlockedPhoneNumbersMessage.h */,
+				94318ACB0DBDD8B0DF438B44C8A188F7 /* OWSBlockedPhoneNumbersMessage.m */,
+				7D65FEF188CC38C681038CA1F82D0992 /* OWSChunkedOutputStream.h */,
+				EEBCA7E9F47282065363153607C22B90 /* OWSChunkedOutputStream.m */,
+				0C1100D1C77081B6A87D71D7074C08AE /* OWSContactsOutputStream.h */,
+				D20B78B9C87B63BF0384EFB4A11FAEB0 /* OWSContactsOutputStream.m */,
+				9CF8CA70AFCE1E20BB888202545113BD /* OWSDevice.h */,
+				3313B915D87FEF48D617EA911E54C68C /* OWSDevice.m */,
+				52BC0A97AB00A64FAA0D8F589561EC9B /* OWSDeviceProvisioner.h */,
+				3BECC8E964198B02DB57C987F58A17C4 /* OWSDeviceProvisioner.m */,
+				1FE49B49ACB2C1DCEBC101D4D34FF0BF /* OWSGroupsOutputStream.h */,
+				9CD0833E0959E4EDE391EEAA903F0282 /* OWSGroupsOutputStream.m */,
+				D69F2EA09BDA1752D88D422D45056B33 /* OWSLinkedDeviceReadReceipt.h */,
+				BE94B6096122158DB37998FAC9A3DADD /* OWSLinkedDeviceReadReceipt.m */,
+				52984339A6E4D693C28000B638BE0D62 /* OWSProvisioningCipher.h */,
+				2C33A516659A62D5D21FED3187BD834C /* OWSProvisioningCipher.m */,
+				15CCA882AC659567D9114760FEC3FB51 /* OWSProvisioningMessage.h */,
+				C680BB13CBF4519CD87BDD68A522D631 /* OWSProvisioningMessage.m */,
+				CB4648F164AB27CBC5E6109CB4D9C908 /* OWSProvisioningProtos.pb.h */,
+				40FD9A7F6B8D6AF6CDEA1642D31E2DCB /* OWSProvisioningProtos.pb.m */,
+				A4AD44D7FF393559747026068FBBF5F5 /* OWSReadReceiptsForLinkedDevicesMessage.h */,
+				C513ED51764AD18FE8B2E5FFFD78D1AB /* OWSReadReceiptsForLinkedDevicesMessage.m */,
+				2EC9AC61F184C5919DED4173C580AE29 /* OWSReadReceiptsForSenderMessage.h */,
+				3DB86DF799664A75985F7EFD5C21CB1F /* OWSReadReceiptsForSenderMessage.m */,
+				075BCB0FBBEB977829D52154B3F814D4 /* OWSRecordTranscriptJob.h */,
+				7E40448A477BBC81012377EABEEAD545 /* OWSRecordTranscriptJob.m */,
+				A1615AB834F4F871AF448283DDD24416 /* OWSVerificationStateSyncMessage.h */,
+				00E070AA7725CBE3600052A76288DEC6 /* OWSVerificationStateSyncMessage.m */,
+			);
+			name = Devices;
+			path = SignalServiceKit/src/Devices;
+			sourceTree = "<group>";
+		};
 		8C134E281DC017F1FF8740EE1D05DD6C /* Support Files */ = {
 			isa = PBXGroup;
 			children = (
@@ -5088,56 +5092,36 @@
 			path = "Target Support Files/Pods-SignalShareExtension";
 			sourceTree = "<group>";
 		};
-		90D701678F56F1E6569C64637DD6CBDD /* Attachments */ = {
+		9033700130D20257A2A7B024292B0EAF /* Pod */ = {
 			isa = PBXGroup;
 			children = (
-				A0EA4D65B523AE03FBDA66DDF8893A70 /* OWSAttachmentsProcessor.h */,
-				25B437DF8B726AF9B65CEA2BB1046C7F /* OWSAttachmentsProcessor.m */,
-				438A2EAE9B8A3C839DA31EB88C7B27EA /* TSAttachment.h */,
-				7910FDC5329DE47AD5C2115EE6A6EF25 /* TSAttachment.m */,
-				FC5D2F8081D1C3A447C2B0ED202DBBD8 /* TSAttachmentPointer.h */,
-				9D0E1FAFB33224B3CBF6C84C2F61D2F2 /* TSAttachmentPointer.m */,
-				3B34CEBE4B5FBDAD2F52C8732D82FE05 /* TSAttachmentStream.h */,
-				466DD73B6EF54D1E3A297D1982CD568A /* TSAttachmentStream.m */,
+				3F62878B4141B3CD6FDD578031E2D4CB /* LICENSE */,
+				E5E11DD79746162A76EDFA5E97CB1E03 /* README.md */,
+				CD95741466D49D3C73BAEBE0564F5B1D /* SignalServiceKit.podspec */,
 			);
-			name = Attachments;
-			path = Attachments;
+			name = Pod;
 			sourceTree = "<group>";
 		};
-		9197194A99F6A7715F40562CBD198C8C /* Interactions */ = {
+		95FBE19ED6C0E53E35565053A74ED469 /* Security */ = {
 			isa = PBXGroup;
 			children = (
-				DEE0C6A7D9826BDB00B7253207581ED0 /* OWSContact.h */,
-				485F3AA27F05542213B759678894DD65 /* OWSContact.m */,
-				C3E4631DDCCA58353A3C8A2D5BB9F730 /* OWSContact+Private.h */,
-				42DF8E20B9CE4D5AD0A024BC70CC4171 /* OWSDisappearingConfigurationUpdateInfoMessage.h */,
-				735A97CE7A9FD9E316C3F3165D7324B1 /* OWSDisappearingConfigurationUpdateInfoMessage.m */,
-				AB583B11EEFA4314CC7C2B58705B4C00 /* OWSDisappearingMessagesConfigurationMessage.h */,
-				7D2CB7969F38990667E34BAF41EBB5F8 /* OWSDisappearingMessagesConfigurationMessage.m */,
-				FB778C4F4E228CB88E2F034E622B3701 /* OWSDynamicOutgoingMessage.h */,
-				9CAEFFAD5C051996FD4A2CDCA7284468 /* OWSDynamicOutgoingMessage.m */,
-				72A53CD530014009065DF21E9ED6B13A /* OWSEndSessionMessage.h */,
-				30E2E7E8D6EFE651F74FE88E9C1019AA /* OWSEndSessionMessage.m */,
-				011D35AA5E13775DDE30470FE5D73061 /* OWSVerificationStateChangeMessage.h */,
-				6C3297C3BDB694E5170CB86022B19C91 /* OWSVerificationStateChangeMessage.m */,
-				AA2DED23BB0CCDE2DE725F56D0EF2C45 /* TSErrorMessage.h */,
-				B6C0EC5FE802FA902719989B5E8D3DE1 /* TSErrorMessage.m */,
-				7EFE9E609E98AB145B88AF3EDB34D13A /* TSErrorMessage_privateConstructor.h */,
-				3601F8693B8A4E0649F983E40AD10D0C /* TSIncomingMessage.h */,
-				DCD639FACDCFD9A611FC6258C4DFBABA /* TSIncomingMessage.m */,
-				37686D25E62539FAE9D225B5D4FB739B /* TSInfoMessage.h */,
-				39D272162B10D1D246C891716C301050 /* TSInfoMessage.m */,
-				56FD0E58C8D3D380E38FE87BF818E9AD /* TSInteraction.h */,
-				65CBFC6E442A781940EA11E91DD64945 /* TSInteraction.m */,
-				C34574B2BFD4CCEE88AA9979DF847E61 /* TSMessage.h */,
-				3A353239A2F5DB1F69EA1B8F137345E1 /* TSMessage.m */,
-				7E784B0EF1C2895C277A9417E6D6A98D /* TSOutgoingMessage.h */,
-				EFF908A4B1F0A1E839C08BD7A0DEAA93 /* TSOutgoingMessage.m */,
-				6FAC6A25E6B4FBCEF95B56E03D65B3EF /* TSQuotedMessage.h */,
-				DC23E5955F92D5EA0A4656115D6860A0 /* TSQuotedMessage.m */,
+				86B1CF688CA9ACAB8D09FCA6B0F38457 /* OWSFingerprint.h */,
+				5BC374CC89C11921D965544CC3EBD925 /* OWSFingerprint.m */,
+				C903E89B6E77C4981F352D4BBCF3B439 /* OWSFingerprintBuilder.h */,
+				1B180AAF39ED2C9E2A4D1E10B4800069 /* OWSFingerprintBuilder.m */,
+				92B7627F8AFB212AF3A25D78AE413159 /* OWSFingerprintProtos.pb.h */,
+				48631D16A587B7EFFBFF67CBB3629408 /* OWSFingerprintProtos.pb.m */,
+				E92C5F13CE74C286B4D24FC95B186EB6 /* OWSHTTPSecurityPolicy.h */,
+				F82C03BE3A38809D84332838ADEDF498 /* OWSHTTPSecurityPolicy.m */,
+				F5AD67A595FB3558457F2AE0C457686A /* OWSRecipientIdentity.h */,
+				4ED3FD155B5F224FABF6E0AAD19563DF /* OWSRecipientIdentity.m */,
+				B49A98FB3349B090ABFD0C5FE42C1CF1 /* OWSWebsocketSecurityPolicy.h */,
+				668A8F1450DB61F6EA8B1218B4026518 /* OWSWebsocketSecurityPolicy.m */,
+				51AF55B7C39EAB3AC22B43681B8609B4 /* SecurityUtils.h */,
+				C0C9610E40AC6E7207697D426289ED1C /* SecurityUtils.m */,
 			);
-			name = Interactions;
-			path = Interactions;
+			name = Security;
+			path = SignalServiceKit/src/Security;
 			sourceTree = "<group>";
 		};
 		97266F8AAECC58C46AB8CED82DDFDFFC /* Core */ = {
@@ -5227,6 +5211,22 @@
 			path = "../Target Support Files/Mantle";
 			sourceTree = "<group>";
 		};
+		A470E0C58CBBBA05256FE9F0F71FA7DA /* Attachments */ = {
+			isa = PBXGroup;
+			children = (
+				7968CD81F6A34A2DC0191AACE786180C /* OWSAttachmentsProcessor.h */,
+				1E0887D1B87E05582FBE4CA4CA00972C /* OWSAttachmentsProcessor.m */,
+				59BE0B79DD2BDF47E562F4400ECEA78E /* TSAttachment.h */,
+				96A346553B74C1AEC888318DE5E225CD /* TSAttachment.m */,
+				AD6EFC8A6835A1CC299DC723A188189A /* TSAttachmentPointer.h */,
+				4741C03ECE1076FF3C74BF73143B5AD5 /* TSAttachmentPointer.m */,
+				CFA3358BD58C158674758A5230FC3487 /* TSAttachmentStream.h */,
+				399C2B6FA2154176F51ACD8D9F977ED4 /* TSAttachmentStream.m */,
+			);
+			name = Attachments;
+			path = Attachments;
+			sourceTree = "<group>";
+		};
 		A62141C8DEF47390C0A09794CC74709A /* RTreeIndex */ = {
 			isa = PBXGroup;
 			children = (
@@ -5264,27 +5264,27 @@
 			name = Core;
 			sourceTree = "<group>";
 		};
-		AC4D0860432E9344209306803A92D507 /* common */ = {
+		A677DA78568EA9E2880B115F7EDD2121 /* Protocols */ = {
 			isa = PBXGroup;
 			children = (
-				856ECA21405E9E5161D8561EF5389252 /* sqlite3.c */,
-				08385FDC553C15ECE85BAD14EF3B69BF /* sqlite3.h */,
+				F066CD14BDBA37DB3F1F61F437D52691 /* ContactsManagerProtocol.h */,
+				E012A326CE29792E70C3E6414B69EF68 /* NotificationsProtocol.h */,
+				0665528B8730D95E85F703E211410D0D /* OWSCallMessageHandler.h */,
+				904CAE7574122FD8A57A7E9DEA6F822F /* ProfileManagerProtocol.h */,
+				5C1B520DF4E722D5A3231CAF734C1B53 /* ProtoUtils.h */,
+				4FBB76A2E328893494AB8E86040BAAB8 /* ProtoUtils.m */,
 			);
-			name = common;
+			name = Protocols;
+			path = SignalServiceKit/src/Protocols;
 			sourceTree = "<group>";
 		};
-		B3C2776E1214FA7CBD8622E6AE0ADA76 /* InvalidKeyMessages */ = {
+		AC4D0860432E9344209306803A92D507 /* common */ = {
 			isa = PBXGroup;
 			children = (
-				2B638BDECF5D316EF7F431DE67D84E85 /* TSInvalidIdentityKeyErrorMessage.h */,
-				0681BEB193DB2AA2AB110E8E458CC526 /* TSInvalidIdentityKeyErrorMessage.m */,
-				A496EBFA8C9973C409412FF9A40AF9DC /* TSInvalidIdentityKeyReceivingErrorMessage.h */,
-				2AEE7E66C149200F15EC690C1C9404ED /* TSInvalidIdentityKeyReceivingErrorMessage.m */,
-				B92B15C5566263821494E521EE9C46D5 /* TSInvalidIdentityKeySendingErrorMessage.h */,
-				656399B286CBFE0BA7872590D3AA2120 /* TSInvalidIdentityKeySendingErrorMessage.m */,
+				856ECA21405E9E5161D8561EF5389252 /* sqlite3.c */,
+				08385FDC553C15ECE85BAD14EF3B69BF /* sqlite3.h */,
 			);
-			name = InvalidKeyMessages;
-			path = InvalidKeyMessages;
+			name = common;
 			sourceTree = "<group>";
 		};
 		B44E8888C5EFC09974CDE18EA7B8973D /* Support Files */ = {
@@ -5312,20 +5312,6 @@
 			name = "Targets Support Files";
 			sourceTree = "<group>";
 		};
-		BB4E7B70B98E8C16D2AD35965EC14B5E /* Requests */ = {
-			isa = PBXGroup;
-			children = (
-				E3F22CB9803008FADD9639BC97114A51 /* OWSRequestFactory.h */,
-				A487CF1EAF4EC94EBC80CE340CE7C534 /* OWSRequestFactory.m */,
-				1C5D240EEF5FEED6CAE55979325F401B /* TSRequest.h */,
-				55EC669F573AFAA552EE349C11000ECC /* TSRequest.m */,
-				D03C1CF11242891CAE73865ED5A08A3F /* TSVerifyCodeRequest.h */,
-				3370C5DE00549F1EA220B5DAF6E4B239 /* TSVerifyCodeRequest.m */,
-			);
-			name = Requests;
-			path = Requests;
-			sourceTree = "<group>";
-		};
 		BE406AAF80962763113A54243434E47A /* HKDFKit */ = {
 			isa = PBXGroup;
 			children = (
@@ -5337,29 +5323,28 @@
 			path = HKDFKit;
 			sourceTree = "<group>";
 		};
-		C0C21FD78029B21A7235ADD8F61F353C /* YapDatabase */ = {
+		BE9AAD000B9790C9A905B329D5AFF981 /* Requests */ = {
 			isa = PBXGroup;
 			children = (
-				0697CF5D027037C385D888E18481B546 /* SQLCipher */,
-				DF86BA1D1960D37C5D0F66FFFE63B6E7 /* Support Files */,
+				16C1D94BCB4011F6D9C0E98F070C29EB /* OWSRequestFactory.h */,
+				9BBB20B9098E2F91A52B0B89124B2928 /* OWSRequestFactory.m */,
+				BF5F5F7F1E0ED6E3A2178EAE80A9230C /* TSRequest.h */,
+				C0733F441FB33CFC0D663540EBBCA4E2 /* TSRequest.m */,
+				211039AE24332F4F5941D5AC23BA97E3 /* TSVerifyCodeRequest.h */,
+				2AF21CE2B7841024D1A43E87A2BE745B /* TSVerifyCodeRequest.m */,
 			);
-			name = YapDatabase;
-			path = YapDatabase;
+			name = Requests;
+			path = Requests;
 			sourceTree = "<group>";
 		};
-		C2381EEE7F6EEAD101DBE3E7F01DFC07 /* constraints */ = {
+		C0C21FD78029B21A7235ADD8F61F353C /* YapDatabase */ = {
 			isa = PBXGroup;
 			children = (
-				CF541899CD99BD9E93346BEEE05B0207 /* BadArgument.h */,
-				9E24F9FE67F842E2E47876EAEF3C6E99 /* BadArgument.m */,
-				7CC87D5880B9AC57FA1D1269A3EEFF50 /* BadState.h */,
-				14041F632026C15678C02C297476122F /* BadState.m */,
-				A453F23AFFFA251571C575247A9C8D1D /* Constraints.h */,
-				03647357328B0A361BAF3E1ACDD7232E /* OperationFailed.h */,
-				4C17CB70C354F25AC18C50F1AFB44196 /* OperationFailed.m */,
+				0697CF5D027037C385D888E18481B546 /* SQLCipher */,
+				DF86BA1D1960D37C5D0F66FFFE63B6E7 /* Support Files */,
 			);
-			name = constraints;
-			path = constraints;
+			name = YapDatabase;
+			path = YapDatabase;
 			sourceTree = "<group>";
 		};
 		C36C86C8D103C93721CCB6A0FF6528D4 /* Products */ = {
@@ -5393,23 +5378,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		C6C946B0A2CF32BBD250FDB072962354 /* Network */ = {
-			isa = PBXGroup;
-			children = (
-				133F7E3CD8898265280F1EB58D25B8D6 /* OutageDetection.swift */,
-				0F02A6C1613BADC6AFFA81311DBE70BA /* OWSCensorshipConfiguration.h */,
-				852D31442A4E131E065F61228DA28B01 /* OWSCensorshipConfiguration.m */,
-				273D6EEE91733F02C6213AE3C54D010D /* OWSCountryMetadata.h */,
-				41028999D598531A11F32FBD6AC8F717 /* OWSCountryMetadata.m */,
-				7B92FF1BE766287BE51D12075DDD5A85 /* OWSSignalService.h */,
-				4A7F67482256F97E420138E046B95CC5 /* OWSSignalService.m */,
-				E7B0CB3D2E7131C61C246D8E65707D5D /* API */,
-				5B49187B8C2F3E56B62FBE7C676D7B37 /* WebSockets */,
-			);
-			name = Network;
-			path = SignalServiceKit/src/Network;
-			sourceTree = "<group>";
-		};
 		CCA79B770326FAD5D7FD5956189C3748 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -5433,41 +5401,6 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		CF5EEB079034098527BE1C9669868BDE /* Storage */ = {
-			isa = PBXGroup;
-			children = (
-				5D9846201C785B61728B211C05628CEF /* FullTextSearchFinder.swift */,
-				D57C9F093B0E1330E17B8AF4012C08F9 /* OWSIncomingMessageFinder.h */,
-				A709113FFDE1696939ADC6ED2F242CAB /* OWSIncomingMessageFinder.m */,
-				A707D5D3851554FCAC1FCDBFA851AC7C /* OWSMediaGalleryFinder.h */,
-				95968E175C0D1E96EDCF62BFEB525F81 /* OWSMediaGalleryFinder.m */,
-				474139684597BDDE56CC1172E80506CE /* OWSOrphanedDataCleaner.h */,
-				FFC2F96F6D7667A25A3D8577437A1C5D /* OWSOrphanedDataCleaner.m */,
-				5778C30A7602E812BA5237405C742332 /* OWSPrimaryStorage.h */,
-				9D9C973951FD75AF4D4E70AF220A0352 /* OWSPrimaryStorage.m */,
-				BDB3FA54232098D6ECF79133DB208B6A /* OWSPrimaryStorage+messageIDs.h */,
-				A7A12EDFEAED233351F9FD9867B59406 /* OWSPrimaryStorage+messageIDs.m */,
-				17B12C9E83E87ABC85206B959FE49305 /* OWSStorage.h */,
-				6EFC0C12074D6D5CB634343717E1416C /* OWSStorage.m */,
-				4CAEA36AEEF712AD191C55AFF26527A2 /* OWSStorage+Subclass.h */,
-				FF9B0AA2DA538FF97D300865E07DFCD5 /* TSDatabaseSecondaryIndexes.h */,
-				F0401DB050A9995150C3A9A283E36255 /* TSDatabaseSecondaryIndexes.m */,
-				E11BC8DD95DB855E1DFB83981AD9B2A6 /* TSDatabaseView.h */,
-				5C1D179CAEAA44BD8ED56FFEE2BA1DA7 /* TSDatabaseView.m */,
-				590142FDA1A26D9743A642A36DF3DB83 /* TSStorageHeaders.h */,
-				049977A61A3482B3CAE1C68A4D173906 /* TSStorageKeys.h */,
-				4C0F37DBB8A316131C822ED9E95FEAFB /* TSYapDatabaseObject.h */,
-				BC5A9F0F600558C737EE5920E6073297 /* TSYapDatabaseObject.m */,
-				21BCEE340F37BE33F7E2B4D26C3AE9AC /* YapDatabaseConnection+OWS.h */,
-				0851EB2881FFFB02C4F2CCA6EDFCF93A /* YapDatabaseConnection+OWS.m */,
-				A9CF62217C10E39A43772424BF83F2C8 /* YapDatabaseTransaction+OWS.h */,
-				EDA5B5EAAFB689D1C9599607950682B1 /* YapDatabaseTransaction+OWS.m */,
-				FB2E483A1E1000C4BFC57C72071A9BB2 /* AxolotlStore */,
-			);
-			name = Storage;
-			path = SignalServiceKit/src/Storage;
-			sourceTree = "<group>";
-		};
 		D1CC5B7E341AF029FC9576C88B5DA7D2 /* CrossProcessNotification */ = {
 			isa = PBXGroup;
 			children = (
@@ -5534,6 +5467,15 @@
 			path = "Target Support Files/Pods-Signal";
 			sourceTree = "<group>";
 		};
+		DC6CE0FE7F2CE46CD70D1A49EBF27A82 /* Protos */ = {
+			isa = PBXGroup;
+			children = (
+				7F7045FAEEA5051F3B6E8D9E9945BE38 /* Generated */,
+			);
+			name = Protos;
+			path = SignalServiceKit/src/Protos;
+			sourceTree = "<group>";
+		};
 		DF86BA1D1960D37C5D0F66FFFE63B6E7 /* Support Files */ = {
 			isa = PBXGroup;
 			children = (
@@ -5548,6 +5490,27 @@
 			path = "../Target Support Files/YapDatabase";
 			sourceTree = "<group>";
 		};
+		E0B1C295ED3647C18475CA92FCDAC813 /* API */ = {
+			isa = PBXGroup;
+			children = (
+				02E053A2EF6C986454673EEF8C40DA00 /* OWSDeviceProvisioningCodeService.h */,
+				64E48DD9B041524A85C8676AF2579397 /* OWSDeviceProvisioningCodeService.m */,
+				B4A9FCA8A5D22505E86EB851F171C428 /* OWSDeviceProvisioningService.h */,
+				8510288CFF00F6C00D0034A3B1833EEB /* OWSDeviceProvisioningService.m */,
+				CA446E27EF7B254698B5B24595A7381E /* OWSDevicesService.h */,
+				B9AD63DC8216282BFDC5A98D4AD28A71 /* OWSDevicesService.m */,
+				02C90CE65864E3BF9C298E3E3341B68D /* OWSRequestBuilder.h */,
+				819FC807BADF319C386A31D0D94DC641 /* OWSRequestBuilder.m */,
+				B490C198DACABB332BF11BC3A5A04149 /* OWSUploadOperation.h */,
+				E200940278B8060F500F8AF6BF807F45 /* OWSUploadOperation.m */,
+				90083AF766FB0F3777FF574CF6170AA8 /* TSNetworkManager.h */,
+				CE955D7EADCE58F5C564E0DAB6BD40FD /* TSNetworkManager.m */,
+				BE9AAD000B9790C9A905B329D5AFF981 /* Requests */,
+			);
+			name = API;
+			path = API;
+			sourceTree = "<group>";
+		};
 		E2057B26C9741806A1DDA93F9EEAFA96 /* ProtocolBuffers */ = {
 			isa = PBXGroup;
 			children = (
@@ -5621,25 +5584,39 @@
 			path = "../Target Support Files/SAMKeychain";
 			sourceTree = "<group>";
 		};
-		E7B0CB3D2E7131C61C246D8E65707D5D /* API */ = {
+		E6611A7C9DFB875F446665E50131B687 /* Storage */ = {
 			isa = PBXGroup;
 			children = (
-				5E9206D889A80072F30B09C0BD4486AF /* OWSDeviceProvisioningCodeService.h */,
-				596BA942A04863C384A205870D94A458 /* OWSDeviceProvisioningCodeService.m */,
-				C00943CF0CE912037DC1303592C3F090 /* OWSDeviceProvisioningService.h */,
-				89559634B6EA113D2F13062AA595E1E5 /* OWSDeviceProvisioningService.m */,
-				2581EEA096AB2BC76E01B2F4582A338C /* OWSDevicesService.h */,
-				5F3BBAB32BF70C93B1520883E3FA90D6 /* OWSDevicesService.m */,
-				A95C83DEB57AB884D861C72F716672C4 /* OWSRequestBuilder.h */,
-				3CB6173B704474AA5B9F76ECFD145ECE /* OWSRequestBuilder.m */,
-				0D274AC50EDA43AB16EB9E0C02B6EA74 /* OWSUploadOperation.h */,
-				F32D85BD5DDA763EECB28D71CD58A714 /* OWSUploadOperation.m */,
-				5AEF39334EBE6F2564F416834C985882 /* TSNetworkManager.h */,
-				E955941CCE942810C61FD9A2E8FF8E67 /* TSNetworkManager.m */,
-				BB4E7B70B98E8C16D2AD35965EC14B5E /* Requests */,
+				A28B0AC50D19FE9CDC7D27FD852E5546 /* FullTextSearchFinder.swift */,
+				9F3E2BF7B01183DB55C1DA4D57440D3A /* OWSIncomingMessageFinder.h */,
+				1130089E2997880F8E70C17EE38EE08E /* OWSIncomingMessageFinder.m */,
+				341D6C26F8B718F82D62436807A19672 /* OWSMediaGalleryFinder.h */,
+				DA0BAF72542D6AF52046D854959D02F9 /* OWSMediaGalleryFinder.m */,
+				BF9E7C59CAB1D19FBD0380C4D716E611 /* OWSOrphanedDataCleaner.h */,
+				FADDB75AF9469EB1A17E8F19C6F68358 /* OWSOrphanedDataCleaner.m */,
+				0E4790A1194FF7CCBE21424D6A2CB910 /* OWSPrimaryStorage.h */,
+				2941F73C7187C240ABAEEFC9E525BE75 /* OWSPrimaryStorage.m */,
+				050C5BD66C5355ADF0D1300C6872B205 /* OWSPrimaryStorage+messageIDs.h */,
+				212AC1E81BCDD6EE825B47928CDEA1A0 /* OWSPrimaryStorage+messageIDs.m */,
+				BA87CFE16BA12115EFCC9A6CFE0DED6F /* OWSStorage.h */,
+				F852818CC06239D0EA84A4295BBBAB01 /* OWSStorage.m */,
+				3F58622245F60AD7ABC5E616F55EF5CE /* OWSStorage+Subclass.h */,
+				220F55C8952F2D743BCCB5BF0147BC98 /* TSDatabaseSecondaryIndexes.h */,
+				5F0036C3E76DAC19CBDD93B2DF72BE37 /* TSDatabaseSecondaryIndexes.m */,
+				0FEC740C8B759C02D968CC7336DEE2B0 /* TSDatabaseView.h */,
+				B726CF216E4408AED51CC534AFA9DDF5 /* TSDatabaseView.m */,
+				16FF98FF19AC89DB42ED08B105BC6871 /* TSStorageHeaders.h */,
+				1E32D54FF306AF2DC89825CFD58AD92D /* TSStorageKeys.h */,
+				53ACBFDD2057FEE90EB48C548F3D241A /* TSYapDatabaseObject.h */,
+				F5FEB05DA0271D6D699F9834190A80CC /* TSYapDatabaseObject.m */,
+				E7D1A1F4812DDE995833A4D744372003 /* YapDatabaseConnection+OWS.h */,
+				EE6235D75398964CE39AEA142A33F650 /* YapDatabaseConnection+OWS.m */,
+				79070E01325F5103A367E1BFA31F45EE /* YapDatabaseTransaction+OWS.h */,
+				25C84FBCAED4F3C8AFEE046BCDD82B51 /* YapDatabaseTransaction+OWS.m */,
+				355ED715EF79E8EB695FCD7EDEC773FB /* AxolotlStore */,
 			);
-			name = API;
-			path = API;
+			name = Storage;
+			path = SignalServiceKit/src/Storage;
 			sourceTree = "<group>";
 		};
 		EB0F9BCA99EECE656C0F5F1CCF59461B /* SQLCipher */ = {
@@ -5720,18 +5697,6 @@
 			path = AxolotlKit;
 			sourceTree = "<group>";
 		};
-		ECDA7BF05CFE201B2AB8F9A003699553 /* Threads */ = {
-			isa = PBXGroup;
-			children = (
-				2F58D37D4BDF2486C3BF0B7676855A93 /* TSContactThread.h */,
-				23F85498867F332662D14F6D7C5827EB /* TSContactThread.m */,
-				24CADA6D839FDEF156EB1035E3EC4E6E /* TSGroupThread.h */,
-				117A0660BD80E51E091800DE92CA3DD4 /* TSGroupThread.m */,
-			);
-			name = Threads;
-			path = Threads;
-			sourceTree = "<group>";
-		};
 		ED19EDAC95638D96FA1FF73F6A0E5C94 /* Support Files */ = {
 			isa = PBXGroup;
 			children = (
@@ -5746,6 +5711,21 @@
 			path = "../Target Support Files/SocketRocket";
 			sourceTree = "<group>";
 		};
+		ED9AB101CA2A222FB48FC0983EA83681 /* constraints */ = {
+			isa = PBXGroup;
+			children = (
+				DD69B9600F1759408BD75489DAE2D018 /* BadArgument.h */,
+				06FBFA32CA1E18016849C8C5029BFDE2 /* BadArgument.m */,
+				94D3FDD1A240DA373FD7448379474C8F /* BadState.h */,
+				A7D98573FB3580784DFD794FAEAFB37D /* BadState.m */,
+				5BC84436AE84D186EAE7AC43D61F12BF /* Constraints.h */,
+				1A478C0101962F7CA5F8C9FE3698B7B5 /* OperationFailed.h */,
+				A52E14A402BB0FB86A2538D29D757A2B /* OperationFailed.m */,
+			);
+			name = constraints;
+			path = constraints;
+			sourceTree = "<group>";
+		};
 		F31772B1694EE8CAF3567B65A69F8E13 /* UIKit */ = {
 			isa = PBXGroup;
 			children = (
@@ -5782,6 +5762,38 @@
 			name = QuartzCore;
 			sourceTree = "<group>";
 		};
+		F6A975AC0A65C5D588ECC0E9272FA7C7 /* Contacts */ = {
+			isa = PBXGroup;
+			children = (
+				4E0A93AD18C590C809854A1B3B673A15 /* CDSQuote.h */,
+				3E4C2A558E1E7336049D2FB36D3F5E02 /* CDSQuote.m */,
+				9B078DCC08E40583ACE23FEE36865E4F /* CDSSigningCertificate.h */,
+				AC722862EA7AF7EACCD5042E9C902DEC /* CDSSigningCertificate.m */,
+				A37F0B194D0E86E1BC2B5929244BB76A /* Contact.h */,
+				ECBCF498FBA6BE6188F79D816CA6DA7C /* Contact.m */,
+				EC7760E743DF17A8A5845A57C2B344EE /* ContactDiscoveryService.h */,
+				6B73ED546D055DC71A46F6A3D55BF70F /* ContactDiscoveryService.m */,
+				1E02E665D7C7027636B3BE8101A8B0E1 /* ContactsUpdater.h */,
+				4CBE7B611AC88ECF0F2EC970F8BF4E6B /* ContactsUpdater.m */,
+				110E4D37ED1F1B528714027AD69F6B66 /* OWSContactDiscoveryOperation.swift */,
+				4C4DE8F9E1F66FC5E7696463BF0E09B2 /* OWSDisappearingMessagesConfiguration.h */,
+				055585882912CD58F6CFDA165AA21DF9 /* OWSDisappearingMessagesConfiguration.m */,
+				346781ED13B1A983297FC6C504C8E48D /* PhoneNumber.h */,
+				7A32C0BE5E1782FE67C2496B688571C3 /* PhoneNumber.m */,
+				D01311A043347D8D707F7AE821B70A1D /* PhoneNumberUtil.h */,
+				7C9C1D812BF9553D5D1AD34CB2CDA776 /* PhoneNumberUtil.m */,
+				0E62FC4F5F7B3442992FD334B4F63EAB /* SignalAccount.h */,
+				3EA2FE71CD3C1908CF22DE3D4B53688A /* SignalAccount.m */,
+				3D75DFE0828B6F9097CDE2160F09558B /* SignalRecipient.h */,
+				C9D8F7328692DDAECB3C9A5DA5FFF986 /* SignalRecipient.m */,
+				F894D9963098757627DDF5E3E75F8A86 /* TSThread.h */,
+				DD40A60C385F1B815CFB839B843A3817 /* TSThread.m */,
+				6F769A05E1888ABA16AE2278E5B2F2CC /* Threads */,
+			);
+			name = Contacts;
+			path = SignalServiceKit/src/Contacts;
+			sourceTree = "<group>";
+		};
 		F7B5EF9E78E5321C69A8F75CF8FD0A90 /* libPhoneNumber-iOS */ = {
 			isa = PBXGroup;
 			children = (
@@ -5821,24 +5833,6 @@
 			path = Reachability;
 			sourceTree = "<group>";
 		};
-		FB2E483A1E1000C4BFC57C72071A9BB2 /* AxolotlStore */ = {
-			isa = PBXGroup;
-			children = (
-				F2D5B4D0133313535D6E881A8EA2E927 /* OWSPrimaryStorage+Calling.h */,
-				98FDCB4A2CCB6F90470E8679CC6AA9CF /* OWSPrimaryStorage+Calling.m */,
-				9C4DE47C5240AD6AAF4C1FE1D0E4185A /* OWSPrimaryStorage+keyFromIntLong.h */,
-				5573F9308BEB1B394E4ED42441475DDA /* OWSPrimaryStorage+keyFromIntLong.m */,
-				DB8F8FD087C469E4BE81701CF105FDD9 /* OWSPrimaryStorage+PreKeyStore.h */,
-				6D2E29FE87F8717373345CE805D9E478 /* OWSPrimaryStorage+PreKeyStore.m */,
-				A7C33853369DEEFAEA8587875B1862E2 /* OWSPrimaryStorage+SessionStore.h */,
-				CCE52D3EE9359F24F1D52E04F88D74E1 /* OWSPrimaryStorage+SessionStore.m */,
-				BE49237E59FC2346E987BB5106FB75E4 /* OWSPrimaryStorage+SignedPreKeyStore.h */,
-				67D3A2928796AC9C4BF3DC24173CF23E /* OWSPrimaryStorage+SignedPreKeyStore.m */,
-			);
-			name = AxolotlStore;
-			path = AxolotlStore;
-			sourceTree = "<group>";
-		};
 		FF38C017958434DEBE2D22C13AB7EA63 /* Curve25519Kit */ = {
 			isa = PBXGroup;
 			children = (
@@ -6017,6 +6011,195 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		2CF0804ADBAA2CF80417C16CFF5F7CCD /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				CC42B8A36C974BC4CAC78788800478A4 /* AppContext.h in Headers */,
+				DAA0FD496AC241A69A2025319A109CD0 /* AppReadiness.h in Headers */,
+				1EE02C5574CEC22ED5E69F2B1B6DF56B /* AppVersion.h in Headers */,
+				9307418D26AD9A5DF7F3B2CCC0437606 /* BadArgument.h in Headers */,
+				9C9FDDE6F30D60862C1ECB6919B180D2 /* BadState.h in Headers */,
+				F52E88AA6880DD6B0CD34356D36ACF01 /* ByteParser.h in Headers */,
+				DF12479A3DC793964E95B3766BA27631 /* CDSQuote.h in Headers */,
+				4BAA73BD1FAC68527DA346CB4D3CDEBD /* CDSSigningCertificate.h in Headers */,
+				B53DAB23ACA5978CDB929F42A4A9AFC2 /* Constraints.h in Headers */,
+				3FA291CE41A49FA653872FE9655F30C8 /* Contact.h in Headers */,
+				22B6000CEF9964185CC7363158ABFD94 /* ContactDiscoveryService.h in Headers */,
+				197FD848E91BA7BF730BECF0DA3C4AE6 /* ContactsManagerProtocol.h in Headers */,
+				601A02387A9FDC47532185F8B16E8E52 /* ContactsUpdater.h in Headers */,
+				C2A2C3250DA08CA17C8A526509FCA57C /* Cryptography.h in Headers */,
+				7C994C79084C83B80642D3AAC19C4D7A /* DataSource.h in Headers */,
+				D0DE42616C86042D41BAE3A48BC91ED2 /* FunctionalUtil.h in Headers */,
+				E198EC07B6C2772FBAA58FB38392D285 /* iOSVersions.h in Headers */,
+				4283A12D4E884F5925A3EB41523A8B35 /* MIMETypeUtil.h in Headers */,
+				2A066797D8331F7411184BC5FDC5DF42 /* NotificationsProtocol.h in Headers */,
+				87FBF9F27C40129FBD88F0B219603703 /* NSArray+OWS.h in Headers */,
+				DCF185CF7D5ABCFDA247C2A5B2DCC294 /* NSData+Base64.h in Headers */,
+				370C21F6421CF6C249292C91FC0F16CC /* NSData+Image.h in Headers */,
+				DAD5A308B07003D058404D0EFE9F70EE /* NSData+messagePadding.h in Headers */,
+				CF46629D5B41114E70BE516B298F25E0 /* NSData+OWS.h in Headers */,
+				8FEB29CFBE65CB5B3FE295CA8283514E /* NSDate+OWS.h in Headers */,
+				BE6D8AB0C42D6167260F382B6D8508F6 /* NSError+MessageSending.h in Headers */,
+				6EDBF4AE23C5CD20857B4C66054CEDA7 /* NSNotificationCenter+OWS.h in Headers */,
+				4796B5413A15192223E413B0503D6757 /* NSObject+OWS.h in Headers */,
+				0C13A68D99179A0466FE18B4AF2F54F3 /* NSString+SSK.h in Headers */,
+				5297DB97C30C69F03D7E822546372D1A /* NSTimer+OWS.h in Headers */,
+				714A8EA16D75EBA6AAF298B7C8C4DAE6 /* NSURLSessionDataTask+StatusCode.h in Headers */,
+				AD88582347A871F9CCA297D97F02A034 /* NSUserDefaults+OWS.h in Headers */,
+				76D08F40854288DB09BED64D6CB4AF78 /* OperationFailed.h in Headers */,
+				3F30B884E824E4353F73A4FF27BDD621 /* OWS2FAManager.h in Headers */,
+				B9CD2540E5EA5EF6218F61C9F1AF8126 /* OWSAddToContactsOfferMessage.h in Headers */,
+				A37AE6C2E6F65FCA424C91FB8642ADF9 /* OWSAddToProfileWhitelistOfferMessage.h in Headers */,
+				F30CD5EAF844BAD87E236E031FCD19E3 /* OWSAnalytics.h in Headers */,
+				1A386638FA3C4E7EDD29435989695C30 /* OWSAnalyticsEvents.h in Headers */,
+				223776A7E76E155D77E8A62A43B8255E /* OWSAsserts.h in Headers */,
+				903D5DDA99C931BC9447ED4EEA7596C8 /* OWSAttachmentsProcessor.h in Headers */,
+				A115F945801FA0690DF2EAFCAF38D492 /* OWSBackgroundTask.h in Headers */,
+				523C0239C042A40A6C0D2623BCA8DC82 /* OWSBackupFragment.h in Headers */,
+				0AE554035429A337D5DB0CC7D0487791 /* OWSBatchMessageProcessor.h in Headers */,
+				0BBD3E165A3F57DDA46FE6C785773301 /* OWSBlockedPhoneNumbersMessage.h in Headers */,
+				F6573D07E709549325E44657BB7FA9A0 /* OWSBlockingManager.h in Headers */,
+				1F8A2B8315D1605501AC0F9CF8AA312D /* OWSCallAnswerMessage.h in Headers */,
+				FD87AD05DF14B2BCEAD5FD4AEF0E4857 /* OWSCallBusyMessage.h in Headers */,
+				1EA51EA19ED7D7C18DDEE083CCC18CEB /* OWSCallHangupMessage.h in Headers */,
+				056D3C14C83DFE5FB4C016DAB42B81C8 /* OWSCallIceUpdateMessage.h in Headers */,
+				DC53D0997BA403D1B50310DE8F8A7663 /* OWSCallMessageHandler.h in Headers */,
+				0A9E0CCFB6381CD9096F5A5B0A938A61 /* OWSCallOfferMessage.h in Headers */,
+				01C1169DD8C1F6C135A614164D8AC815 /* OWSCensorshipConfiguration.h in Headers */,
+				2DEF0950E3FBAEDAA9AA1D6EDB91E371 /* OWSChunkedOutputStream.h in Headers */,
+				A853C14898257817656C954CE1B6062B /* OWSContact+Private.h in Headers */,
+				99FB882923BD09FADEA7B0249D0C2BE8 /* OWSContact.h in Headers */,
+				8B25E2483107F36794B9CA43910BFC37 /* OWSContactsOutputStream.h in Headers */,
+				25B0A7DE82DD25CDCA9F04302CE49955 /* OWSCountryMetadata.h in Headers */,
+				60AE3A894ED9E6A7A628877A47431930 /* OWSDevice.h in Headers */,
+				FA5E3F795E9BB5CEB703AD7F8785A9F2 /* OWSDeviceProvisioner.h in Headers */,
+				2C91E6B8A23C9FB7A6A77FBCB6D47FC0 /* OWSDeviceProvisioningCodeService.h in Headers */,
+				6967A0BD5C0F703A4F08A8547F065820 /* OWSDeviceProvisioningService.h in Headers */,
+				49009713252395535054FE14CF975385 /* OWSDevicesService.h in Headers */,
+				5F37AFD87F32BF4B8E957A40954E3859 /* OWSDisappearingConfigurationUpdateInfoMessage.h in Headers */,
+				99387BDA2D8774B314C4EBF46E8DDCC6 /* OWSDisappearingMessagesConfiguration.h in Headers */,
+				E722B831D9F1039FF4341B681DAC16D0 /* OWSDisappearingMessagesConfigurationMessage.h in Headers */,
+				B18E94FE0A18A3FF2E8EE6030E4D2D1B /* OWSDisappearingMessagesFinder.h in Headers */,
+				66D0E551776FCABEA5A6C7B71B2A62AA /* OWSDisappearingMessagesJob.h in Headers */,
+				AABAFE796818EE63721CBFE4425C8139 /* OWSDispatch.h in Headers */,
+				643848939D8313BAD907395975B23F0B /* OWSDynamicOutgoingMessage.h in Headers */,
+				5CFFE31F48167A951C10FA1A48824205 /* OWSEndSessionMessage.h in Headers */,
+				44ECBCDD914C58C657E90C93DC8934DB /* OWSError.h in Headers */,
+				F8832EF5A75A2169D1F6D0B94F99C7AB /* OWSFailedAttachmentDownloadsJob.h in Headers */,
+				DE8CBA206B364542C9CF89A9A7E200B4 /* OWSFailedMessagesJob.h in Headers */,
+				FCCD0B15DDD01348D80EC15415006C3C /* OWSFileSystem.h in Headers */,
+				0CCE6ABF1C57BB7C4522002C8770E49C /* OWSFingerprint.h in Headers */,
+				CEB2397858B5DBDC7CA28F8403588BC8 /* OWSFingerprintBuilder.h in Headers */,
+				AED75221D538054DBD4D0CE8E7B2F116 /* OWSFingerprintProtos.pb.h in Headers */,
+				F569F243C04B9E1E38C6A05AD349C785 /* OWSGroupsOutputStream.h in Headers */,
+				E9C36991DE63D27BC3BAEBD20FC9649A /* OWSHTTPSecurityPolicy.h in Headers */,
+				974D9D5D2C4AC2274CC6E6928F15DF94 /* OWSIdentityManager.h in Headers */,
+				6E98BA12610F3AC908A633B94CCCCF03 /* OWSIncomingMessageFinder.h in Headers */,
+				123DB95EE3A97028F55747D61DE726F7 /* OWSIncomingSentMessageTranscript.h in Headers */,
+				33684D237CBBFEF2F58116D6702D3431 /* OWSIncompleteCallsJob.h in Headers */,
+				196CBDC0621780B1EC1C22AB49D70DCA /* OWSLinkedDeviceReadReceipt.h in Headers */,
+				14F3DD56F45C6E3CB80B1519B2746D70 /* OWSLogger.h in Headers */,
+				9CDAF4A4BC7E6DCCA2F8F648512E9F46 /* OWSMediaGalleryFinder.h in Headers */,
+				CBAD07A60A22129AB9B99687C9078D4A /* OWSMessageDecrypter.h in Headers */,
+				B76B1462B1240899C4CBF9E32DB013F8 /* OWSMessageHandler.h in Headers */,
+				7DA9194AA322B84A7977CA3687D40E13 /* OWSMessageManager.h in Headers */,
+				18CD5F8CC1BA24FF6BF293991C31D9F3 /* OWSMessageReceiver.h in Headers */,
+				60A8881423EF00DF5FBCB3E8C9EA645B /* OWSMessageSender.h in Headers */,
+				6FB5AD2720457FB142B3467256808D56 /* OWSMessageServiceParams.h in Headers */,
+				05F1478D0F86EA520380CBA0A2364EAF /* OWSMessageUtils.h in Headers */,
+				B8E09B3970DE6BFFD0E03517667B695D /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.h in Headers */,
+				E8441465709FBFCEE2A7C8B39C8826FC /* OWSOperation.h in Headers */,
+				94099D36AA4E722159E8097C0F29EF78 /* OWSOrphanedDataCleaner.h in Headers */,
+				8173FD329C5DB57C969BD9EFC8FE0752 /* OWSOutgoingCallMessage.h in Headers */,
+				0D19B56A4B92832FB7A8AF187DAB702B /* OWSOutgoingNullMessage.h in Headers */,
+				244136EA4897FAC8D05CD8B31BEC645D /* OWSOutgoingSentMessageTranscript.h in Headers */,
+				0D2F15A055DA05010CD88E33C4641602 /* OWSOutgoingSyncMessage.h in Headers */,
+				B318C8B8A37F1CA564504D4F92B86CB7 /* OWSPrimaryStorage+Calling.h in Headers */,
+				FA043C9D515B70978289DE6F8C4BC5F6 /* OWSPrimaryStorage+keyFromIntLong.h in Headers */,
+				21529A43D9E1FEC435C0FA3FB317FBE8 /* OWSPrimaryStorage+messageIDs.h in Headers */,
+				65E4B0D0A2DD444FECBD9F98CB2B8F15 /* OWSPrimaryStorage+PreKeyStore.h in Headers */,
+				D8BA4125ED319F168038E0A334E0DDA0 /* OWSPrimaryStorage+SessionStore.h in Headers */,
+				A225FE6E084E96315EE31AD0452D4F23 /* OWSPrimaryStorage+SignedPreKeyStore.h in Headers */,
+				A5CAF3BF5BC02B5558631BE7E3179C9B /* OWSPrimaryStorage.h in Headers */,
+				F89BFF4216EC2968954F46AE18048BC6 /* OWSProfileKeyMessage.h in Headers */,
+				E9EE95A157126EE35B4CA03B999B662B /* OWSProvisioningCipher.h in Headers */,
+				D7AEE0DF4CC2212AFA32D2F64EF744A4 /* OWSProvisioningMessage.h in Headers */,
+				2676C386089D2C839AAC976267DED7CA /* OWSProvisioningProtos.pb.h in Headers */,
+				49853C65F804E62CBA9AB54523578836 /* OWSQueues.h in Headers */,
+				8F938FAEB8CFB08628707FD652ACBEC3 /* OWSReadReceiptManager.h in Headers */,
+				5C53755FDB67E922A42DCE15232DAF06 /* OWSReadReceiptsForLinkedDevicesMessage.h in Headers */,
+				D64AEE05276CDC15A7953565BC8A4E29 /* OWSReadReceiptsForSenderMessage.h in Headers */,
+				6E1BD51EB5BDB422DE653E8952D9117C /* OWSReadTracking.h in Headers */,
+				B3323CB9E38A27B528361F320E1A57B9 /* OWSRecipientIdentity.h in Headers */,
+				976FEC9BD2B713F86B3FA4347AA743B9 /* OWSRecordTranscriptJob.h in Headers */,
+				C7D65E35CCD77375CA937D89C2879D01 /* OWSRequestBuilder.h in Headers */,
+				831207DF37E7115A9550778F2ABED217 /* OWSRequestFactory.h in Headers */,
+				44BD872643692D3D22C7BEF47380C489 /* OWSSignaliOSProtos.pb.h in Headers */,
+				372F843093CB54CA17BE33622E0D764B /* OWSSignalService.h in Headers */,
+				A9FCAEDB2B563EB15907597F729CE3B1 /* OWSStorage+Subclass.h in Headers */,
+				3838ED18EE40C8EA958791DBA4BC8CA1 /* OWSStorage.h in Headers */,
+				A66E3A518771BA8F86CDEAA76130CC68 /* OWSSyncConfigurationMessage.h in Headers */,
+				FAACB1048B0094C8E257EF2C5C9613E8 /* OWSSyncContactsMessage.h in Headers */,
+				46403D4C79109AC3D26914A84ADE09E7 /* OWSSyncGroupsMessage.h in Headers */,
+				795914C13C7AA09D6E576DAD902A89BE /* OWSSyncGroupsRequestMessage.h in Headers */,
+				A82AF8AAF8C430B270113DD1D7C87900 /* OWSUnknownContactBlockOfferMessage.h in Headers */,
+				C04D5CBCF81E052FD3E3FF20A406B909 /* OWSUploadOperation.h in Headers */,
+				8AA6C06080DA2A89ED6593C221F4D2F0 /* OWSVerificationStateChangeMessage.h in Headers */,
+				CFBDF709CF29970870C2F523F8DB7544 /* OWSVerificationStateSyncMessage.h in Headers */,
+				BF347ADCE0F16BFFF7686E126F14B8A3 /* OWSWebsocketSecurityPolicy.h in Headers */,
+				0A74650E6778C52E81AAFAA896F2D7C4 /* PhoneNumber.h in Headers */,
+				D75AADC9D318773428B5E82C5E31D45F /* PhoneNumberUtil.h in Headers */,
+				B72F54534E45DC11E90265F571B71F39 /* PreKeyBundle+jsonDict.h in Headers */,
+				702A9335A04729081DC450D8DF0A4C4A /* ProfileManagerProtocol.h in Headers */,
+				58997BF580BA939866FABB9B966AE053 /* ProtoUtils.h in Headers */,
+				4E222280F837494D42927BE510C1F8DB /* SecurityUtils.h in Headers */,
+				97760AABB746C6EAE7A65B35438B8786 /* SignalAccount.h in Headers */,
+				B5F3AAA32118251EF39C9E49B1D1EF16 /* SignalRecipient.h in Headers */,
+				87E28F237E4A23B8FFE2AC43F933CDA4 /* SignalServiceKit-umbrella.h in Headers */,
+				096CEB407A630935590C808DFBD51CC2 /* SignalServiceKit.h in Headers */,
+				E3383E05F5AF7095FCC0DEEC67AFA5C7 /* TextSecureKitEnv.h in Headers */,
+				E513F334E395002BFCD001AD7517C54A /* Threading.h in Headers */,
+				C46CC2F4E9392A3CC516D52097AA19FC /* TSAccountManager.h in Headers */,
+				B628990C9CF03B3FA0B3FE2DCCE22B70 /* TSAttachment.h in Headers */,
+				8B8EA86BE84303FB864B5051238F8C9A /* TSAttachmentPointer.h in Headers */,
+				146D78041C4D6012FDE5FBAD935EE362 /* TSAttachmentStream.h in Headers */,
+				C29718F23C9C0A27B2DEF9CF595C352F /* TSAttributes.h in Headers */,
+				8038CD9E595B613E3BFD6A194E886826 /* TSCall.h in Headers */,
+				97797EFC9FB055AED5EFA49BAC778903 /* TSConstants.h in Headers */,
+				DED306381B9FBF27B35C4602F012F0E4 /* TSContactThread.h in Headers */,
+				0B3DA98D9BAAE2728C8446E0D2E6A12B /* TSDatabaseSecondaryIndexes.h in Headers */,
+				60750A03FFF4EE71C56DBC52EAD3E6D5 /* TSDatabaseView.h in Headers */,
+				7F6211784E9655D3B7EFD02D05521136 /* TSErrorMessage.h in Headers */,
+				C844A17832872ECE46633C0EA8972DF4 /* TSErrorMessage_privateConstructor.h in Headers */,
+				FC3A53BB7DA42EBD44E5E79325CF26F9 /* TSGroupModel.h in Headers */,
+				492054D772AA54BBCFD6822619FE2391 /* TSGroupThread.h in Headers */,
+				658D3A79CF01BE1FCAB6460E11F883AF /* TSIncomingMessage.h in Headers */,
+				D24782CE02E803880F677024246BC094 /* TSInfoMessage.h in Headers */,
+				7D2F565D1006D94F530CF6A2348EC248 /* TSInteraction.h in Headers */,
+				4097A1A3E5D42D3C36F7AD5B5A557BA9 /* TSInvalidIdentityKeyErrorMessage.h in Headers */,
+				271560D65F888C1614D84F9EF345E03C /* TSInvalidIdentityKeyReceivingErrorMessage.h in Headers */,
+				BF00117C8AC2DEA9B45672821C7FACA3 /* TSInvalidIdentityKeySendingErrorMessage.h in Headers */,
+				724912E1158D2FBB76476353DCA209A8 /* TSMessage.h in Headers */,
+				465882F2E8F5C079C2AB9052224A4813 /* TSNetworkManager.h in Headers */,
+				DDB7B14BCB63D0FC18C9A158C224A01B /* TSOutgoingMessage.h in Headers */,
+				A6FD8FB5A21FD8CAABF9F005645FDE69 /* TSPrefix.h in Headers */,
+				4EB25AA14F21EF9BC46812179ACDD8A1 /* TSPreKeyManager.h in Headers */,
+				EDEC9645F24B1D661F7A2DF6F8EFB396 /* TSQuotedMessage.h in Headers */,
+				E19AF60BF45B0D8A26F8D3ECF8F82CF6 /* TSRequest.h in Headers */,
+				1D5619CF0C021FECABCE6832DD72F9E9 /* TSSocketManager.h in Headers */,
+				58A84F1117ACE256BA920778E21BE7B8 /* TSStorageHeaders.h in Headers */,
+				A0492FC1066EAF62ADD0341890871997 /* TSStorageKeys.h in Headers */,
+				21A72618E4A6BC87EA26FD066550F05B /* TSThread.h in Headers */,
+				45D25FEEDF7D326C76B24B8FDF05581B /* TSVerifyCodeRequest.h in Headers */,
+				8FD9C20CED0277EA56157EB209C756AE /* TSYapDatabaseObject.h in Headers */,
+				32D7E175ADC9075CF0679F82026924F3 /* UIImage+OWS.h in Headers */,
+				5616A4DCB0721E8FBB520B559F87FD4D /* WebSocketResources.pb.h in Headers */,
+				3B485CE6D2EBD5DC42D15EDCD390D503 /* YapDatabaseConnection+OWS.h in Headers */,
+				47FB3C3C7FAC4BAE69F483941C467AE1 /* YapDatabaseTransaction+OWS.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		39047FFC9E65FC71E78F80859D232042 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -6163,196 +6346,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		63DD1E5291563B7B8F2CE98D96961D42 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				B54E8B4FE395E0B6F6FD2ACF33F3D894 /* AppContext.h in Headers */,
-				30DB037D786A04F40373A90B1AAFD1B6 /* AppReadiness.h in Headers */,
-				C4F7EDFB1FBE60000BAFB870E641949A /* AppVersion.h in Headers */,
-				42E4001D9A63A4408C6935C78355DF2C /* BadArgument.h in Headers */,
-				8BD52DFE8458CFD8504FC86A2A47F29C /* BadState.h in Headers */,
-				951F2E9500AAE5D071F00834B7F186B0 /* ByteParser.h in Headers */,
-				2B05629964F7E7C0371A0B2B19BFB169 /* CDSQuote.h in Headers */,
-				68C0C74F838BF63DAB075F0D6FC16550 /* CDSSigningCertificate.h in Headers */,
-				E26A87A5F6C77605CEC06CB20A213A0C /* Constraints.h in Headers */,
-				8DD76DFB54ED462F6ECB2D25D8940691 /* Contact.h in Headers */,
-				385E8F7B3F65001787554A5E399267DC /* ContactDiscoveryService.h in Headers */,
-				3132DE9142191F4D42FD4EB340901F88 /* ContactsManagerProtocol.h in Headers */,
-				AE3C20630E7135EBF0C0F7139EAB8B92 /* ContactsUpdater.h in Headers */,
-				F94E4DF0183E21C9C28FC8426E981953 /* Cryptography.h in Headers */,
-				4C4902B1635D8CE8935D44A0E7E1357A /* DataSource.h in Headers */,
-				DA5D3DA27EE07B653176E60537E8FC18 /* ECKeyPair+OWSPrivateKey.h in Headers */,
-				E635A53A01A2C53FE219A30AF8AA09CA /* FunctionalUtil.h in Headers */,
-				17EBFB72CBE6228E07C01579B02B494A /* iOSVersions.h in Headers */,
-				18551828EE3DD38F3E4155B8AF1083A7 /* MIMETypeUtil.h in Headers */,
-				8A6B95C1A5B411D224A4206BC7209213 /* NotificationsProtocol.h in Headers */,
-				B5ADA65CD2C5770E342AB14DDFEE6CDB /* NSArray+OWS.h in Headers */,
-				F97DE8E44DD0EDCD33470C64D6B868B9 /* NSData+Base64.h in Headers */,
-				B38AE90436CB6FD6987F5F49074AE5A1 /* NSData+Image.h in Headers */,
-				54FBB24E4A4D954E877A6670E901681D /* NSData+messagePadding.h in Headers */,
-				9B1CEEBCC6863C2DD3698088943DF67E /* NSData+OWS.h in Headers */,
-				FD9B86DF9E27E3D094FE8EB0F8535FE9 /* NSDate+OWS.h in Headers */,
-				C514C66F6872CF0B5C234FE190DE6C16 /* NSError+MessageSending.h in Headers */,
-				277D68AB9E1202A9B2A8F0FBBB377395 /* NSNotificationCenter+OWS.h in Headers */,
-				F231AD114E3F1FA99E0D45B23E1EC3CE /* NSObject+OWS.h in Headers */,
-				84D15652A195195D764D0E9EA043C3B4 /* NSString+SSK.h in Headers */,
-				F5E7DED5999EE1F57A4791A05802F94F /* NSTimer+OWS.h in Headers */,
-				116E1CAACE7E48946AFC75BEB68110AB /* NSURLSessionDataTask+StatusCode.h in Headers */,
-				B92C263BBFE1E0FB2FB12949A2F7B144 /* NSUserDefaults+OWS.h in Headers */,
-				3E3A83BC0420C894A935DB56944D0D12 /* OperationFailed.h in Headers */,
-				B95B568D7A5A9ADAAFB99DCF2B054333 /* OWS2FAManager.h in Headers */,
-				63D2A8C94F0DA982240E3BAB1EA68736 /* OWSAddToContactsOfferMessage.h in Headers */,
-				2D2433F7540C62C90E03551CEB32F975 /* OWSAddToProfileWhitelistOfferMessage.h in Headers */,
-				3E5E47D3406597B3A2855FCED212F325 /* OWSAnalytics.h in Headers */,
-				8F9C5B55FA254DDECB0946B506C5D5AC /* OWSAnalyticsEvents.h in Headers */,
-				A1CEC5A564912867C8C997F350F68E1D /* OWSAsserts.h in Headers */,
-				D819D9E81FFD0766B642E403948EAF0B /* OWSAttachmentsProcessor.h in Headers */,
-				14BDB14767B35D63374BE76B546FB1D3 /* OWSBackgroundTask.h in Headers */,
-				A8FDF006B059C14DA37258D7A2EDC82D /* OWSBackupFragment.h in Headers */,
-				B7A89473D6237133EE21D7F0EE5836C3 /* OWSBatchMessageProcessor.h in Headers */,
-				934649A51D676013B5720668CE1D03FD /* OWSBlockedPhoneNumbersMessage.h in Headers */,
-				04FEC5C1D207DB11A4D7434CF4F7F009 /* OWSBlockingManager.h in Headers */,
-				844A9E048E9FAE362C988981F6FC3238 /* OWSCallAnswerMessage.h in Headers */,
-				BC37227E7FBCD4D58B626966C1747796 /* OWSCallBusyMessage.h in Headers */,
-				281C14E843FEA7D454CEBE2BCE0C00C3 /* OWSCallHangupMessage.h in Headers */,
-				AC2BDAC8F82548CB763F6CD441F91CAB /* OWSCallIceUpdateMessage.h in Headers */,
-				5DFD95F75E04E13C5F90DF2A9EB30934 /* OWSCallMessageHandler.h in Headers */,
-				A847CB668967B026D2C969A055D20E39 /* OWSCallOfferMessage.h in Headers */,
-				8EE8DF3F50ACE5F4B45C111C378644C3 /* OWSCensorshipConfiguration.h in Headers */,
-				1B1B003C325F1B93A96CEADDCE9C2FBF /* OWSChunkedOutputStream.h in Headers */,
-				7A33F72B5F270A2B7538D36159BBCBF5 /* OWSContact+Private.h in Headers */,
-				7C10B038162E916AD9C02351C7613799 /* OWSContact.h in Headers */,
-				C2357A658D7A658997B83CAF2CDDDF5C /* OWSContactsOutputStream.h in Headers */,
-				0D41852E01885CB88CD09C8F0DA7D5D1 /* OWSCountryMetadata.h in Headers */,
-				A2D10E303A6C7C9D63B023F88145F112 /* OWSDevice.h in Headers */,
-				9D61D1BDCA86F32665EFE2C91BB42FD7 /* OWSDeviceProvisioner.h in Headers */,
-				61ABF1434AA5A0AA2D053A6EBD2CC990 /* OWSDeviceProvisioningCodeService.h in Headers */,
-				294B41E109AFB6E3A6B0EBA53EEA6FD1 /* OWSDeviceProvisioningService.h in Headers */,
-				6740C48B35351CC4397A4DE94D36995C /* OWSDevicesService.h in Headers */,
-				FF8975B924011531FD2B4A6BFB5BA17E /* OWSDisappearingConfigurationUpdateInfoMessage.h in Headers */,
-				F5CC1B026417DE7343B98102EFB755AC /* OWSDisappearingMessagesConfiguration.h in Headers */,
-				95C8181B718CCC3AF16E0EE0E20D4CBB /* OWSDisappearingMessagesConfigurationMessage.h in Headers */,
-				B2945E7E2121A9E497FCC810A4055231 /* OWSDisappearingMessagesFinder.h in Headers */,
-				386F6F176EDA8CBD28F830BDEA839DF7 /* OWSDisappearingMessagesJob.h in Headers */,
-				8A314F56E83BC494C1C95D4A069CFAA4 /* OWSDispatch.h in Headers */,
-				2E8BFA47338D8A58633652C39CA5FDD5 /* OWSDynamicOutgoingMessage.h in Headers */,
-				721090F7A7A09BDA8FC9F70858D92D04 /* OWSEndSessionMessage.h in Headers */,
-				46F3E4C34FEBB15D68A2AA995BB23743 /* OWSError.h in Headers */,
-				24815CE275FC852A6DF5F238D0E63DCB /* OWSFailedAttachmentDownloadsJob.h in Headers */,
-				408387CAAA0C06D2318083AEB789BA2E /* OWSFailedMessagesJob.h in Headers */,
-				C9E6D730143E78C8E9CA2B566689AE8C /* OWSFileSystem.h in Headers */,
-				3474265515C7BCCFB6822E0E00B7675C /* OWSFingerprint.h in Headers */,
-				7B67647154502E0C6F36D396BC9F9FE7 /* OWSFingerprintBuilder.h in Headers */,
-				D79DD75E566EFAE0FA924C7BAF05694F /* OWSFingerprintProtos.pb.h in Headers */,
-				16F513E7D81FD10060449337E095DAA3 /* OWSGroupsOutputStream.h in Headers */,
-				94DC81CB5F60175577367932EC9BAD8B /* OWSHTTPSecurityPolicy.h in Headers */,
-				FCEE98B795C24FCBA2DBA156B535992E /* OWSIdentityManager.h in Headers */,
-				5346E74BF47B9312F3135B85E47FF0C8 /* OWSIncomingMessageFinder.h in Headers */,
-				2CE06F2C8889C7E8CBDA62496F146050 /* OWSIncomingSentMessageTranscript.h in Headers */,
-				04301C92C311799D006A12064D38533F /* OWSIncompleteCallsJob.h in Headers */,
-				53AC4C488F8A8E4EB3B2AA58F15C1EA9 /* OWSLinkedDeviceReadReceipt.h in Headers */,
-				2D0564BF42DF9049E65831F52681CE60 /* OWSLogger.h in Headers */,
-				4D6FB55C2DF28C503B1DEC7018DAFA75 /* OWSMediaGalleryFinder.h in Headers */,
-				9361F15B78129C02DF97BE1991B42803 /* OWSMessageDecrypter.h in Headers */,
-				814355F96CEB7AD7632B7FA083918D7A /* OWSMessageHandler.h in Headers */,
-				00AA78074B28877A5670F073BA4994AD /* OWSMessageManager.h in Headers */,
-				E431EAF5F8E5EEB7DDCF866966197B8F /* OWSMessageReceiver.h in Headers */,
-				FD055FA7827A33017A091F6E787E27B1 /* OWSMessageSender.h in Headers */,
-				57D56EBD54DAE762D6607910E529BE9F /* OWSMessageServiceParams.h in Headers */,
-				E55B79B0E2F1FA48633D76038A6E43E9 /* OWSMessageUtils.h in Headers */,
-				48004D2D8C744A22702D493B1884EF94 /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.h in Headers */,
-				BF36417E39EBF6FD973F698923C1877A /* OWSOperation.h in Headers */,
-				39D86DCC6A12ED27C5D22941E8F45B12 /* OWSOrphanedDataCleaner.h in Headers */,
-				B9D0D61B6B88DC62A52295A9E4A4FA5F /* OWSOutgoingCallMessage.h in Headers */,
-				D4F50A9D8133FB9CA7EA019A3190180B /* OWSOutgoingNullMessage.h in Headers */,
-				21B1D342EF762C68A6A3BA7122D7E19A /* OWSOutgoingSentMessageTranscript.h in Headers */,
-				615ACFBBBC41003AFDCCC09BF44AFA78 /* OWSOutgoingSyncMessage.h in Headers */,
-				1431AF0CF29321792835F9077BFBEAD6 /* OWSPrimaryStorage+Calling.h in Headers */,
-				87DB1266B1B4CD9D4C5E7761AB9A8ECD /* OWSPrimaryStorage+keyFromIntLong.h in Headers */,
-				661A38FF2F1F6A4B7508DB9BE41ED62F /* OWSPrimaryStorage+messageIDs.h in Headers */,
-				B1667050B925E21433A5470E7C356EB4 /* OWSPrimaryStorage+PreKeyStore.h in Headers */,
-				7976A576D805E3338AF7383B51B5217F /* OWSPrimaryStorage+SessionStore.h in Headers */,
-				13459D022DD2952C2DE6D87134765747 /* OWSPrimaryStorage+SignedPreKeyStore.h in Headers */,
-				3166A9044DDE994E275156573732324B /* OWSPrimaryStorage.h in Headers */,
-				B661CEE46251F8A6B4F4E8E007843B13 /* OWSProfileKeyMessage.h in Headers */,
-				76F480E8EE6A61C1CB6D4374C9E4203D /* OWSProvisioningCipher.h in Headers */,
-				2A0370161509136D248B3A8147A39163 /* OWSProvisioningMessage.h in Headers */,
-				475241F55A3D3170DE79AE0517E3D132 /* OWSProvisioningProtos.pb.h in Headers */,
-				65852A8B4C7B77129F5C879AAFE0D416 /* OWSQueues.h in Headers */,
-				8C9C7DC91636FD5431AD782713449FF6 /* OWSReadReceiptManager.h in Headers */,
-				5CFCBA0EC159FC3A3CA5E1D350374252 /* OWSReadReceiptsForLinkedDevicesMessage.h in Headers */,
-				77F78AAF452571FE9BCFD86D075B68DB /* OWSReadReceiptsForSenderMessage.h in Headers */,
-				89D89E4E04D622898C50A422F9B4EF75 /* OWSReadTracking.h in Headers */,
-				1D89B491D8C86072A641819FACFE2C14 /* OWSRecipientIdentity.h in Headers */,
-				69F047C1750C5FD03FDE7D4641C5F2FE /* OWSRecordTranscriptJob.h in Headers */,
-				C439BEF8264AF42FA8910F0D103CE73E /* OWSRequestBuilder.h in Headers */,
-				4CF0E073C04DD2382945EDBE17D44417 /* OWSRequestFactory.h in Headers */,
-				831DF93D2321A56BCC5937AE53F667E5 /* OWSSignaliOSProtos.pb.h in Headers */,
-				C2BC662B54D502CA276C9FDA71E0AB35 /* OWSSignalService.h in Headers */,
-				A69AB5B39F674CBD53CA925247FEEF02 /* OWSStorage+Subclass.h in Headers */,
-				921CF340AB173A4AC3F8378B5BE60C8F /* OWSStorage.h in Headers */,
-				496EBB408614C6755891604BB8A8CF32 /* OWSSyncConfigurationMessage.h in Headers */,
-				47BA85A57E71B76D3E18FF508A181920 /* OWSSyncContactsMessage.h in Headers */,
-				277D6BD6D6B0060F0A71C1B959CC6917 /* OWSSyncGroupsMessage.h in Headers */,
-				F456615B94EC81BC7DABFEA225E1C744 /* OWSSyncGroupsRequestMessage.h in Headers */,
-				EF9B32FEF9FDF83F280AB77FBDBED8F1 /* OWSUnknownContactBlockOfferMessage.h in Headers */,
-				0386FD3A42ED9D452496E675DA3AF906 /* OWSUploadOperation.h in Headers */,
-				84A16FD538C0DAFDBCA0EAA466B59409 /* OWSVerificationStateChangeMessage.h in Headers */,
-				5842BDF93A7BB0C27D415C573A33AA6D /* OWSVerificationStateSyncMessage.h in Headers */,
-				0C12A2D3102E7698074D04D041169C26 /* OWSWebsocketSecurityPolicy.h in Headers */,
-				24279A70B1F6E9D9F9F7E6BC18509108 /* PhoneNumber.h in Headers */,
-				4C87CE6D073919DEBDDD9207BAC70014 /* PhoneNumberUtil.h in Headers */,
-				5814A4D9BC2E1FEAEC0B5768CECF7F02 /* PreKeyBundle+jsonDict.h in Headers */,
-				871F930A3D350A33DE46C0A9086B2724 /* ProfileManagerProtocol.h in Headers */,
-				6C62CA43997D14C9BF40CC135FAF39CD /* ProtoUtils.h in Headers */,
-				583D340F9483D3B61F5A8659E23020D4 /* SecurityUtils.h in Headers */,
-				5C9EF2E62BB4C232C4026852603A7282 /* SignalAccount.h in Headers */,
-				AEAF90882BFDD4D27034B86DCA59CE97 /* SignalRecipient.h in Headers */,
-				2BB8D9BF9BAB7C015CA3C668DC5E05EB /* SignalServiceKit-umbrella.h in Headers */,
-				25BD6FC86FA8D1ECE2E1EA42C4724849 /* SignalServiceKit.h in Headers */,
-				F1DF064149E7808F491225D0F7521951 /* TextSecureKitEnv.h in Headers */,
-				B5E614083E4185C366AB92B357CD15E3 /* Threading.h in Headers */,
-				55DAB0CAF43836A51C423B2BD7332F48 /* TSAccountManager.h in Headers */,
-				BF330B3D5D075F4B3A91FE45E44A2BEC /* TSAttachment.h in Headers */,
-				CB0834C034E477151DF4753547FE6051 /* TSAttachmentPointer.h in Headers */,
-				EEF5F4DE6F3D598796D0932916BE8810 /* TSAttachmentStream.h in Headers */,
-				B2806C7B789CA2C5F046909568E774B5 /* TSAttributes.h in Headers */,
-				C178DD53A67D6078550CA213848E105C /* TSCall.h in Headers */,
-				51794D03AEF4F7AED1939A0A9BFC2CB5 /* TSConstants.h in Headers */,
-				358B1EE9EAF7C6B23A2B5C5661459501 /* TSContactThread.h in Headers */,
-				8D0EC9B064D545F3EE9DC24DAB5566B0 /* TSDatabaseSecondaryIndexes.h in Headers */,
-				BDFD0A96E426136FCAB7226882A43EA1 /* TSDatabaseView.h in Headers */,
-				3E891CD3E55A5321FDCC799F64A1F242 /* TSErrorMessage.h in Headers */,
-				5B00C3E34A5E8A0760FD56414E3809E5 /* TSErrorMessage_privateConstructor.h in Headers */,
-				4DFBF5F26814B33E7E4561B07D9E0B3C /* TSGroupModel.h in Headers */,
-				B0B51B5A45CBF96E7E93A747E7495134 /* TSGroupThread.h in Headers */,
-				E9F4CF1E9E5EE3B13BBCAB34836DD1BD /* TSIncomingMessage.h in Headers */,
-				B90C9D3F40F87DC315C5832B6D236C2F /* TSInfoMessage.h in Headers */,
-				41CBE9C46D4982BF870AC68438AF5573 /* TSInteraction.h in Headers */,
-				E18FEFFF752A9F69C96839A2AE0A76F9 /* TSInvalidIdentityKeyErrorMessage.h in Headers */,
-				788CFE584B4F2EE435EE33A9D1B31A64 /* TSInvalidIdentityKeyReceivingErrorMessage.h in Headers */,
-				6406EB149C8642DADDE82ED42DBCD891 /* TSInvalidIdentityKeySendingErrorMessage.h in Headers */,
-				A58DE693F584C5FC6800596F370CF0D2 /* TSMessage.h in Headers */,
-				A5656058857EF233CD39E8115ACC072C /* TSNetworkManager.h in Headers */,
-				D1F3BD7DFAB133E8B378BFA4EB6685A0 /* TSOutgoingMessage.h in Headers */,
-				23816C05795EC5476F512E36FE7DB0C1 /* TSPrefix.h in Headers */,
-				ED75DB430BD3D1BC63666050EEC7E962 /* TSPreKeyManager.h in Headers */,
-				AE2DE8052382282E0E6456AF156D3957 /* TSQuotedMessage.h in Headers */,
-				E53E099B94D321042CD76CCD97E1E194 /* TSRequest.h in Headers */,
-				280EB6BFA09F434555B9B554D0FE33D2 /* TSSocketManager.h in Headers */,
-				5B0810130FE3E364B0DDD5CB344B4210 /* TSStorageHeaders.h in Headers */,
-				F96E4EDC7A27E1A9C5340C8F9242C038 /* TSStorageKeys.h in Headers */,
-				3B166996AE66865D449476E9BC5EACD1 /* TSThread.h in Headers */,
-				E563BBE7BC2222449F24123E661E6695 /* TSVerifyCodeRequest.h in Headers */,
-				74E33C106EED05022538BE77A91F2B38 /* TSYapDatabaseObject.h in Headers */,
-				4CB510D538071C8A8A29E7C7D2DC20BC /* UIImage+OWS.h in Headers */,
-				7AEB1558003C87AB6504CA4B112523D0 /* WebSocketResources.pb.h in Headers */,
-				A99D2F83CF46A69FB33E82D3186FDC1F /* YapDatabaseConnection+OWS.h in Headers */,
-				B8ECBE9AF7392A7D662283E559204726 /* YapDatabaseTransaction+OWS.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		66472E93F3D2D82D66DCCD4E03F5687B /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -6699,9 +6692,9 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 6D4B7497D7A86C124D49F0C39967CB38 /* Build configuration list for PBXNativeTarget "SignalServiceKit" */;
 			buildPhases = (
-				A73D64241702CA6BC1BB85833E0F2E68 /* Sources */,
+				85A8EE1341AEC27298B8E1AC6CA6D14F /* Sources */,
 				53D0A4EF9EE791B5126815161D9AF62E /* Frameworks */,
-				63DD1E5291563B7B8F2CE98D96961D42 /* Headers */,
+				2CF0804ADBAA2CF80417C16CFF5F7CCD /* Headers */,
 				67AA7F32B0C7E44EE6630195425D07A5 /* Resources */,
 			);
 			buildRules = (
@@ -7581,6 +7574,196 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		85A8EE1341AEC27298B8E1AC6CA6D14F /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6454AB6859E859DF121A80A0C6DF7405 /* AppContext.m in Sources */,
+				37660CA3AC5EB01E0483B64E0D3F3A09 /* AppReadiness.m in Sources */,
+				25585B9A4B09BD8A6AA7BA8C7DFE7CEA /* AppVersion.m in Sources */,
+				583E8BA7157E9AD4D7784EE93C838E21 /* BadArgument.m in Sources */,
+				8E9DDEC7E98E04B37DBB0EFC762A5B77 /* BadState.m in Sources */,
+				3A4EF20F59483C58205EAB2C12A1F173 /* ByteParser.m in Sources */,
+				FEE30D01CCF6765D5EF0DAA3ADFB4375 /* CDSQuote.m in Sources */,
+				B8F51FA6D40770770275A99BD0BC498B /* CDSSigningCertificate.m in Sources */,
+				CDC01889718A89ABD6E1BB6732601B03 /* Contact.m in Sources */,
+				04CA991424E8B4702D0FE61F65431FA7 /* ContactDiscoveryService.m in Sources */,
+				E042BFF8078ADC112FDF1A4FA784C263 /* ContactsUpdater.m in Sources */,
+				08EB562CE2B4ABAF1A3080EA8B781AB1 /* Cryptography.m in Sources */,
+				4426B1A1681D57C5D161F304AD4BCE16 /* DataSource.m in Sources */,
+				BCF08521E37DE651AE62649F15FD1710 /* Fingerprint.pb.swift in Sources */,
+				7408317C73F690131410FE2512D5E730 /* FingerprintProto.swift in Sources */,
+				CE16360A34502A86A96780E661D8BD2D /* FullTextSearchFinder.swift in Sources */,
+				5E1C507C7C0CE6F60D968AEFA0C94824 /* FunctionalUtil.m in Sources */,
+				3FB4FBBEBCCF067F1F1E911B59A482B5 /* MIMETypeUtil.m in Sources */,
+				1F8D844868C95D393F24A1DF23FF5007 /* NSArray+OWS.m in Sources */,
+				A8C0084E7A35F6A775A5229B24A9991F /* NSData+Base64.m in Sources */,
+				D535015DC6C00BC9E688BA7FC584509B /* NSData+Image.m in Sources */,
+				4C17AC9A41EE34F652A8EBCF10793818 /* NSData+messagePadding.m in Sources */,
+				04E5918CA3C472448BD89454EFF5331B /* NSData+OWS.m in Sources */,
+				7D53898E52C46D151F0DD6302B91A410 /* NSDate+OWS.mm in Sources */,
+				812D3E404B3420AA6C3726421DF2AD9D /* NSError+MessageSending.m in Sources */,
+				BF17DD7397D29A9DBA6BC8D11368CF49 /* NSNotificationCenter+OWS.m in Sources */,
+				DD01A613C566759576081798717D4722 /* NSObject+OWS.m in Sources */,
+				A00C49470F258B093051A8740D8F899D /* NSString+SSK.m in Sources */,
+				D3EB6CA632A1AA4D1284A7620C53F2BC /* NSTimer+OWS.m in Sources */,
+				9A1B3FCD4187450C9616CE7F9B1C8229 /* NSURLSessionDataTask+StatusCode.m in Sources */,
+				121FEA1C35B07CF4323C6F00B5508701 /* NSUserDefaults+OWS.m in Sources */,
+				AC38CCABE75E5A405A845E467409FDE9 /* OperationFailed.m in Sources */,
+				951000A6A33B20F0807F0EE3906439AC /* OutageDetection.swift in Sources */,
+				517D8AD93FC758C152036CC43180288D /* OWS2FAManager.m in Sources */,
+				3DB186F3AE102CD3A64A988E9D0C0378 /* OWSAddToContactsOfferMessage.m in Sources */,
+				1E33934DF7D82AA423BE0257CA05D580 /* OWSAddToProfileWhitelistOfferMessage.m in Sources */,
+				CCC2A7BA4A7918D308539ACA8CAB16E3 /* OWSAnalytics.m in Sources */,
+				D219CC226350EF1CDA9285542DF949BF /* OWSAnalyticsEvents.m in Sources */,
+				3839794F963D116B00857DD53BE2012B /* OWSAsserts.m in Sources */,
+				E6635EA57C628C1D6C5DA2CE6E80F6D1 /* OWSAttachmentsProcessor.m in Sources */,
+				950376FD362FFA38B70961E63B8935B8 /* OWSBackgroundTask.m in Sources */,
+				3AD3445BB1F0C9A7B6D84E8DF04DC979 /* OWSBackupFragment.m in Sources */,
+				7ACE998DD85584FF4CA8EFDD1F16E475 /* OWSBatchMessageProcessor.m in Sources */,
+				90CB14DC2FE28D6E9EC278F8E21512BD /* OWSBlockedPhoneNumbersMessage.m in Sources */,
+				CA4079A4511C395E5F3F7BAFF5924823 /* OWSBlockingManager.m in Sources */,
+				B98D579C3E541B85A0F48A299D61CBA2 /* OWSCallAnswerMessage.m in Sources */,
+				EC1AE6466C17171E8720E5E47951F383 /* OWSCallBusyMessage.m in Sources */,
+				4641A61DDB6FAE271B83CFB978682C99 /* OWSCallHangupMessage.m in Sources */,
+				7796552E1B48722351B133E16200FE7F /* OWSCallIceUpdateMessage.m in Sources */,
+				3FFB0F68FCFBEC35AEA3A98A76B25C34 /* OWSCallOfferMessage.m in Sources */,
+				086CAABCEC22A683D988390BD507842C /* OWSCensorshipConfiguration.m in Sources */,
+				EF45E848A7C8119597A7B457134500CF /* OWSChunkedOutputStream.m in Sources */,
+				97A0BFD8005FBF201FAE91773A21D34D /* OWSContact.m in Sources */,
+				1300DD5C1C64BC4BD479358D46947901 /* OWSContactDiscoveryOperation.swift in Sources */,
+				4011B5FC5EC925290B2CECDC116812CE /* OWSContactsOutputStream.m in Sources */,
+				FCCB5DDD582BA96D8725DFB6BFBC5B0B /* OWSCountryMetadata.m in Sources */,
+				AADAF70579E599C682C8A53233313238 /* OWSDevice.m in Sources */,
+				8B737EDB4A1DDE901E314DA57EB0540D /* OWSDeviceProvisioner.m in Sources */,
+				3BA027A3CE7A3FB7E9EE7B4C9A47B8A1 /* OWSDeviceProvisioningCodeService.m in Sources */,
+				73320B5F42890311CEDF69B6B76EF85A /* OWSDeviceProvisioningService.m in Sources */,
+				C8B6957FBD5E6BB2B6B14315E9FF8030 /* OWSDevicesService.m in Sources */,
+				00C186AB01D49C6D688C4640E401A800 /* OWSDisappearingConfigurationUpdateInfoMessage.m in Sources */,
+				FF09E1E104464C3D2F0A098FF226696A /* OWSDisappearingMessagesConfiguration.m in Sources */,
+				0BC865D27CE41E44FE337540B0EFD7F6 /* OWSDisappearingMessagesConfigurationMessage.m in Sources */,
+				950FA73AF2016E1D37AC8CA640C74232 /* OWSDisappearingMessagesFinder.m in Sources */,
+				B7E65E91C17DE6E313225798863C228B /* OWSDisappearingMessagesJob.m in Sources */,
+				DBAD9E5ED51BBD21F4A205D8B2F60EE8 /* OWSDispatch.m in Sources */,
+				EB7F01289BA2F98D1554FC6A8644777D /* OWSDynamicOutgoingMessage.m in Sources */,
+				88904C204EC85F40F6AFB4F9A9CF5FEE /* OWSEndSessionMessage.m in Sources */,
+				075038F783F261D7020B153B6254265F /* OWSError.m in Sources */,
+				AF599F71CC8689A428123C3F8C618756 /* OWSFailedAttachmentDownloadsJob.m in Sources */,
+				F4F0AEB771F095E8589B417CA3417A67 /* OWSFailedMessagesJob.m in Sources */,
+				8ACC902B38963A156D88F3E7B5C6BAB3 /* OWSFileSystem.m in Sources */,
+				A5EA8900A917764819592383664C887F /* OWSFingerprint.m in Sources */,
+				C40A5B592B47A60463090FA0838363DC /* OWSFingerprintBuilder.m in Sources */,
+				ED9C85BD5FA4217D6F4270D8B9149E1E /* OWSFingerprintProtos.pb.m in Sources */,
+				2B256342AE7668BC0D7BC4EA0886B55D /* OWSGroupsOutputStream.m in Sources */,
+				56FAFFADA51B0B30C61120569FA16AD6 /* OWSHTTPSecurityPolicy.m in Sources */,
+				9FD6333DC727D0686CBC49E51176207F /* OWSIdentityManager.m in Sources */,
+				6AEB100DE2966EC0F01817203677D746 /* OWSIncomingMessageFinder.m in Sources */,
+				9111918E613B904D046BC828B7958ECB /* OWSIncomingSentMessageTranscript.m in Sources */,
+				578B6CCCC54B10DFF2288119EF3ECAA5 /* OWSIncompleteCallsJob.m in Sources */,
+				17D99CF3A6B24D01A8C0C55071D23E1E /* OWSLinkedDeviceReadReceipt.m in Sources */,
+				97F1A9D1C0A726B46EBD3C090FC2E3C7 /* OWSLogger.m in Sources */,
+				36E6BE947A53B1737955CF5CF6CB145B /* OWSMediaGalleryFinder.m in Sources */,
+				377854BC87F0922D5B33682CD973585C /* OWSMessageDecrypter.m in Sources */,
+				E1D30B2AD380BA99E2ADE7BD4F0CF997 /* OWSMessageHandler.m in Sources */,
+				987FBCAF267E94E1FCE01D66B6FA2C9D /* OWSMessageManager.m in Sources */,
+				65BB4150C94346613E55449A0CEBE304 /* OWSMessageReceiver.m in Sources */,
+				F465BEC5B9CA870237E3BBE85F4A8312 /* OWSMessageSender.m in Sources */,
+				03130D64B2E2A21FCF3FE15DD4D22FC2 /* OWSMessageServiceParams.m in Sources */,
+				BB1433D154D6013910AB8C9CF5C6ED2B /* OWSMessageUtils.m in Sources */,
+				983C3ECB2872BC13C3D7F24B8FF66ABD /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.m in Sources */,
+				D1E48EA263ED7871FC9C61654E82BBC0 /* OWSOperation.m in Sources */,
+				7015CC3CAB0BAF8A2D840D44418B066D /* OWSOrphanedDataCleaner.m in Sources */,
+				FC2099B2BA37998ADAC8FF05FF8A7493 /* OWSOutgoingCallMessage.m in Sources */,
+				5407C4B4A14C39FE75C5AEB305AAD914 /* OWSOutgoingNullMessage.m in Sources */,
+				E48658367D485180A1B7A7DF564805B7 /* OWSOutgoingSentMessageTranscript.m in Sources */,
+				0C6DE14C40E79012E98F7A446CC85A86 /* OWSOutgoingSyncMessage.m in Sources */,
+				A58B6FF88FC75C3106428FE286F1C2BA /* OWSPrimaryStorage+Calling.m in Sources */,
+				87C5AE0681100AA2F82971360FD1D338 /* OWSPrimaryStorage+keyFromIntLong.m in Sources */,
+				C8D094C47EF1F87AF52B2F9A85DF8861 /* OWSPrimaryStorage+messageIDs.m in Sources */,
+				530286FD6FCA3BE01E5C38F1F3CF87C0 /* OWSPrimaryStorage+PreKeyStore.m in Sources */,
+				405CD7FA90D286B0B8432F6708AFB703 /* OWSPrimaryStorage+SessionStore.m in Sources */,
+				8698ADB797D32D2162410B33DACAE188 /* OWSPrimaryStorage+SignedPreKeyStore.m in Sources */,
+				8FB620268402F36F5BD3CDD2315A5804 /* OWSPrimaryStorage.m in Sources */,
+				35EE624363891C268061DB67879186F3 /* OWSProfileKeyMessage.m in Sources */,
+				4814FBCBA41C46946D1962953C32622D /* OWSProvisioningCipher.m in Sources */,
+				E27718F3D8DA1373265B0D3AF1AF6A9E /* OWSProvisioningMessage.m in Sources */,
+				876E17FB9761E1256339782997E3F3E0 /* OWSProvisioningProtos.pb.m in Sources */,
+				0A304A0B9EB440B2646EEB60BC1A5E01 /* OWSReadReceiptManager.m in Sources */,
+				C2841D42AD7EFB6B978F0A69C397688B /* OWSReadReceiptsForLinkedDevicesMessage.m in Sources */,
+				177EDD66F53FDF3D5E37883E98DDFFFD /* OWSReadReceiptsForSenderMessage.m in Sources */,
+				F5B26D1FF0E6C7251D907662EC5F9702 /* OWSRecipientIdentity.m in Sources */,
+				8099093C1BF73D0D1D8A97CC4533C515 /* OWSRecordTranscriptJob.m in Sources */,
+				6C551DD8D790F2CE6535D23F62E022BE /* OWSRequestBuilder.m in Sources */,
+				F21A98911E59371A88389B538AF3768D /* OWSRequestFactory.m in Sources */,
+				AE08C170C8314FA8E4DBF6DD051D87C9 /* OWSSignaliOSProtos.pb.m in Sources */,
+				BB954E2B982E48174D4FE1F2ED091926 /* OWSSignalService.m in Sources */,
+				1AED02CFA5962F1FE4F34D8D8F94C52C /* OWSStorage.m in Sources */,
+				8ECA26040650E2C33AF5A16C04C86160 /* OWSSwiftUtils.swift in Sources */,
+				DF5ABE7F4658A98ACBF7F085B4DA6FEC /* OWSSyncConfigurationMessage.m in Sources */,
+				58BFC266997C65808DC455BC60751DC9 /* OWSSyncContactsMessage.m in Sources */,
+				0A203C5AE1A6905FD5B55E84672469E5 /* OWSSyncGroupsMessage.m in Sources */,
+				FB319D4446B96FEA3992BC76772BC9C7 /* OWSSyncGroupsRequestMessage.m in Sources */,
+				A7326E86D4F101A4F4F99590B3D9A55B /* OWSUnknownContactBlockOfferMessage.m in Sources */,
+				857D5E401448A2DEBB94C21ADF05B96B /* OWSUploadOperation.m in Sources */,
+				83DCC2799974CB21ADB480E5E6510C1F /* OWSVerificationStateChangeMessage.m in Sources */,
+				F33C97CBA710AC96D5D750AD018CB07D /* OWSVerificationStateSyncMessage.m in Sources */,
+				72CD33C9174C23C91CA472388CEDB4BC /* OWSWebsocketSecurityPolicy.m in Sources */,
+				2C0FA488608021F39B98B7B7FCB9558A /* ParamParser.swift in Sources */,
+				446291A44646A1ADAD1535C360E793E6 /* PhoneNumber.m in Sources */,
+				CC091D1D00FAF8B1959D228751938568 /* PhoneNumberUtil.m in Sources */,
+				8ABC272166D43DAF8897DA3C218574A0 /* PreKeyBundle+jsonDict.m in Sources */,
+				ACF7B9E1CBC1DD885DF0CAF20B75DEE6 /* Promise+retainUntilComplete.swift in Sources */,
+				C27AD1DB923CD2131A52EEF088C3B697 /* ProtoUtils.m in Sources */,
+				2E3BA28A2A942182F2A44CDF055E650B /* Provisioning.pb.swift in Sources */,
+				53F5F52EA5A2200B6E01724B9C9444B3 /* ProvisioningProto.swift in Sources */,
+				BCC54BEEA5E2B5307839E4038FCE929C /* SecurityUtils.m in Sources */,
+				50836F2BC2C3861E52A43F50711DD71E /* SignalAccount.m in Sources */,
+				DDA8ABB23B6A3D788F292109ACECD85D /* SignalIOS.pb.swift in Sources */,
+				EDCC526D0877A7DD6D7175447CB30CDD /* SignalIOSProto.swift in Sources */,
+				6116615FE6637CFF64965A6C971A89B0 /* SignalRecipient.m in Sources */,
+				C1C31586D21672F311603C99CBC0A22F /* SignalService.pb.swift in Sources */,
+				0D407DD086F5A855FA91F864FE033D8E /* SignalServiceKit-dummy.m in Sources */,
+				E2FFDECA501B553660F9F672689D57E6 /* SSKProto.swift in Sources */,
+				F758F676D995BF4215D7E96467A4AC41 /* TextSecureKitEnv.m in Sources */,
+				151A38D4DA6D9B6228998F3D3C6B44CE /* Threading.m in Sources */,
+				DA93FC7FF012EB343C608D7152778CB9 /* TSAccountManager.m in Sources */,
+				17CBED36E33E7BC333A1CBBC85EAD76D /* TSAttachment.m in Sources */,
+				21BEAEC6A0E20950C6A4C51DA681370B /* TSAttachmentPointer.m in Sources */,
+				BACAB2644C55D917B0F0F4582B6B222E /* TSAttachmentStream.m in Sources */,
+				9F8881EF5902F8037E2DF70E3C2A2CC5 /* TSAttributes.m in Sources */,
+				4482CBE933D05E861810EC3BAD7E6AED /* TSCall.m in Sources */,
+				C097090F94E448AA73DFED60B6731A28 /* TSContactThread.m in Sources */,
+				B812B7E25EBC2D3D8D5418CB00F16093 /* TSDatabaseSecondaryIndexes.m in Sources */,
+				D2C917586CBFFB50E5ADFB6CAA166E0E /* TSDatabaseView.m in Sources */,
+				84AC3D312E46F2BCD2980BF94D3306D5 /* TSErrorMessage.m in Sources */,
+				77AC86C68D048844D45B57161CDECEF4 /* TSGroupModel.m in Sources */,
+				8D95F6A16D59CE8EBBBA51A8B8EDD2DA /* TSGroupThread.m in Sources */,
+				8787B576CC6D4CB84A7F45E03695EF82 /* TSIncomingMessage.m in Sources */,
+				9FBA3E63772879CE34CD476416062740 /* TSInfoMessage.m in Sources */,
+				5B00157A43AB28384F5606F775D39057 /* TSInteraction.m in Sources */,
+				D503F318BF4E413265C9A5CE515504C0 /* TSInvalidIdentityKeyErrorMessage.m in Sources */,
+				FF82409165EDE0BFFA6C6C8814E2528E /* TSInvalidIdentityKeyReceivingErrorMessage.m in Sources */,
+				B20C7913E982B7B1D99546077AAF9B73 /* TSInvalidIdentityKeySendingErrorMessage.m in Sources */,
+				4F8401CE28341BD53CEDDDEAD302BC9D /* TSMessage.m in Sources */,
+				26121BFB47698AADC3233170D32E3D09 /* TSNetworkManager.m in Sources */,
+				503E77BC010279C2662738E6BD1F17F6 /* TSOutgoingMessage.m in Sources */,
+				657AC875F90D8C8C6A71DC8741FDE914 /* TSPreKeyManager.m in Sources */,
+				875835BB23871668D8F3AC7935846FBE /* TSQuotedMessage.m in Sources */,
+				6C6EE4BC2A4FC234F9F6B1FADB6ECE46 /* TSRequest.m in Sources */,
+				314168FBAB3BB836E9A01AF254037066 /* TSSocketManager.m in Sources */,
+				B056E2F116E826BDB99D3B4062DC481C /* TSThread.m in Sources */,
+				8C113A0A74822071C61F6DFEC1E5763B /* TSVerifyCodeRequest.m in Sources */,
+				7B744011A43217BB2D68F24FF6E9A61B /* TSYapDatabaseObject.m in Sources */,
+				AB752F05C595550ED683287759BCF47A /* UIImage+OWS.m in Sources */,
+				918D88816D34CD963A8F970E5CB34281 /* WeakTimer.swift in Sources */,
+				963D98B3F4CA21242AD00512975F5722 /* WebSocketProto.swift in Sources */,
+				2A3CA3FB297694D5F31D8B72DDC1F8A1 /* WebSocketResources.pb.m in Sources */,
+				323D09AC6C729CFAD8BBB31D18BA07FE /* WebSocketResources.pb.swift in Sources */,
+				01F51837E5146791E28A316A97F427E6 /* YapDatabaseConnection+OWS.m in Sources */,
+				454194B36CAB62209CB708E4BC77AEEC /* YapDatabaseTransaction+OWS.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		875D733774B4BC5B1993ECF581D80203 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -7682,197 +7865,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		A73D64241702CA6BC1BB85833E0F2E68 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				0942E27E24A84E9B9AD21B7DEB6384FE /* AppContext.m in Sources */,
-				2706AA01AB3F53F6948934070F7BF9AE /* AppReadiness.m in Sources */,
-				F84D5B66BD4B022A13475C36C0953DD7 /* AppVersion.m in Sources */,
-				EDC4731C46AF4DBAD125134EDD21B1B1 /* BadArgument.m in Sources */,
-				BC872741DDE0DB44ABD6197FE7ACF206 /* BadState.m in Sources */,
-				A8435D7B4A04948E13E7312F5B4A89B5 /* ByteParser.m in Sources */,
-				AF3028A08E356AE70CED4DA9E77490D6 /* CDSQuote.m in Sources */,
-				142D43BCECF102F6503B0A720A4050F1 /* CDSSigningCertificate.m in Sources */,
-				7D26E82AD5045F08FEAD09D9B0C8B24D /* Contact.m in Sources */,
-				DB1AA9B9762BA43FD4225C8D0B91D653 /* ContactDiscoveryService.m in Sources */,
-				19ED94ADCBFED159A7512C14333ED0EC /* ContactsUpdater.m in Sources */,
-				0C34FABE17969022239455253268BBA0 /* Cryptography.m in Sources */,
-				36F5F9DBB4253F451F810586BCAB566F /* DataSource.m in Sources */,
-				6D3DC6C2A0CDB838E0D2BD3193C9EDC3 /* ECKeyPair+OWSPrivateKey.m in Sources */,
-				773471A10F427E98BE7AC40447432A4A /* Fingerprint.pb.swift in Sources */,
-				7AE380D413E2846256F649FF19384BED /* FingerprintProto.swift in Sources */,
-				A1328C70CE1A280CB1C68B7A12C25DF0 /* FullTextSearchFinder.swift in Sources */,
-				1FDC91B42C65E65DB40F90E62AF94AE2 /* FunctionalUtil.m in Sources */,
-				F643776B98D994A68FC1AAE3235B00D3 /* MIMETypeUtil.m in Sources */,
-				1D146963EFBD8C9815D6AC21D4BF3C5C /* NSArray+OWS.m in Sources */,
-				37E94288F793B04887DD4095CB3528DE /* NSData+Base64.m in Sources */,
-				F9D6DC23C68A8FED768274BBF271D0F4 /* NSData+Image.m in Sources */,
-				F2BC48C1DC46B0A081836DDA3BCB5054 /* NSData+messagePadding.m in Sources */,
-				75B9791B0A89F3E0F7F483311CFEA10D /* NSData+OWS.m in Sources */,
-				C567B669F096D79BB72CD5DE7BA25C52 /* NSDate+OWS.mm in Sources */,
-				94850C35B65B97136431F88060AFC0C7 /* NSError+MessageSending.m in Sources */,
-				090EC84338B0B3D382A1D30646FC9EEB /* NSNotificationCenter+OWS.m in Sources */,
-				4C129FA0413F2948FE9BB0F38BCB1FAF /* NSObject+OWS.m in Sources */,
-				341C996B673FCACC3016CB5FD48EDFFF /* NSString+SSK.m in Sources */,
-				2FB54F217E3EA51ABE76318FE09AC442 /* NSTimer+OWS.m in Sources */,
-				6ECC52CBB19481F26B5D7E33B657F9C2 /* NSURLSessionDataTask+StatusCode.m in Sources */,
-				0D2FDD859EF274C54BC701B2A4F919F0 /* NSUserDefaults+OWS.m in Sources */,
-				7F10C612B8A361562A44AD4D1A0C488D /* OperationFailed.m in Sources */,
-				21BDFF25C842AA8F1E444DD054164D36 /* OutageDetection.swift in Sources */,
-				778EEF9F4DAFBF92A61C13735C944266 /* OWS2FAManager.m in Sources */,
-				5B77045A9DD912B9A401D0829F30FBF5 /* OWSAddToContactsOfferMessage.m in Sources */,
-				E125F6DEA27D3C6838A1A132A19323DC /* OWSAddToProfileWhitelistOfferMessage.m in Sources */,
-				026B29663C6D693AFAF87078073B9946 /* OWSAnalytics.m in Sources */,
-				01F21D2659EC01A127A6AE6C1E6E03A9 /* OWSAnalyticsEvents.m in Sources */,
-				D7FC3446848014E2F0DBFC38D81AA88D /* OWSAsserts.m in Sources */,
-				964C134487FDC9AA4178D277E4B5186E /* OWSAttachmentsProcessor.m in Sources */,
-				089C49811990F42564C1CCA43FBAC294 /* OWSBackgroundTask.m in Sources */,
-				5F419A3A43F545FEC5FAFE4C502E3BD5 /* OWSBackupFragment.m in Sources */,
-				3DA6E0278F4A21E900FB5C42B88B3383 /* OWSBatchMessageProcessor.m in Sources */,
-				39CCB95DE73F1C4B97D5A5D5CA46F9D4 /* OWSBlockedPhoneNumbersMessage.m in Sources */,
-				864160A04B36E0DE865DFC679BA32C48 /* OWSBlockingManager.m in Sources */,
-				C6D9ADCAFDDB029D5181F24B4876880A /* OWSCallAnswerMessage.m in Sources */,
-				F7802FC005396F74C79713E76A311F37 /* OWSCallBusyMessage.m in Sources */,
-				418A9DCBB1D60C217E1F8461AB280675 /* OWSCallHangupMessage.m in Sources */,
-				6D07CA8FACB219BE10EB695064209F06 /* OWSCallIceUpdateMessage.m in Sources */,
-				1002DE556C90EADBD41F795AEC2B8807 /* OWSCallOfferMessage.m in Sources */,
-				C838F3D12DB24A33E6940B9433887974 /* OWSCensorshipConfiguration.m in Sources */,
-				121D44564E1C6670EDB4B7BFF17B4713 /* OWSChunkedOutputStream.m in Sources */,
-				6BEF8FE42ED8E55EAB1C8F2A18E86A24 /* OWSContact.m in Sources */,
-				2CD282D108675BBE943417F1A4F1218F /* OWSContactDiscoveryOperation.swift in Sources */,
-				C920BDBDCEC5DC58A868B6D5784D9703 /* OWSContactsOutputStream.m in Sources */,
-				ADD465D40DF15862A90971AB67D6A7F3 /* OWSCountryMetadata.m in Sources */,
-				8C35B779B373244BBED6168B84807A63 /* OWSDevice.m in Sources */,
-				4CC287B142C9BCED2A6CA2DC465D5DDB /* OWSDeviceProvisioner.m in Sources */,
-				82348DF983D0A432BDAE2C1503D3F3E9 /* OWSDeviceProvisioningCodeService.m in Sources */,
-				FCAC62C3291A1161D2FC0F6B6F9D2645 /* OWSDeviceProvisioningService.m in Sources */,
-				A5DCCE9F331D33983C5D09A207DD8879 /* OWSDevicesService.m in Sources */,
-				02CB4CC3AE1461D95735836A904EC331 /* OWSDisappearingConfigurationUpdateInfoMessage.m in Sources */,
-				838B6714929292228C0F75DD6DAEC59D /* OWSDisappearingMessagesConfiguration.m in Sources */,
-				8C4C53C4521803A960515C963CE84FDE /* OWSDisappearingMessagesConfigurationMessage.m in Sources */,
-				5C50FF5D289886F951D1204375E3C12A /* OWSDisappearingMessagesFinder.m in Sources */,
-				24686AA512FAA50BD91997898E1E065D /* OWSDisappearingMessagesJob.m in Sources */,
-				069878A59196CB8D98661A3828DABE39 /* OWSDispatch.m in Sources */,
-				F5094A89FD33EF285E94984B276EC903 /* OWSDynamicOutgoingMessage.m in Sources */,
-				4622D6AE6B151BAF43DAA417923D78DF /* OWSEndSessionMessage.m in Sources */,
-				548A1FBD0804075F36B17946777B9BC5 /* OWSError.m in Sources */,
-				C57219497ABD5B580D953E2F41278139 /* OWSFailedAttachmentDownloadsJob.m in Sources */,
-				2824BB95A5719BB00D3E6DEA1CDA1B58 /* OWSFailedMessagesJob.m in Sources */,
-				FF50FA6AE1B54D511E9B73FF909B3CC5 /* OWSFileSystem.m in Sources */,
-				EA1F86FF7A1DF9330F893CC42F3D8DDB /* OWSFingerprint.m in Sources */,
-				2FD99899DAFA5B60D7DA171BB97D2B56 /* OWSFingerprintBuilder.m in Sources */,
-				A845C1E5FB25FB50CE82E4D51614A7DF /* OWSFingerprintProtos.pb.m in Sources */,
-				82A6A4B916FCD64718EEECE453F48339 /* OWSGroupsOutputStream.m in Sources */,
-				BDCB66686EE69EF63BE03C02D45EE927 /* OWSHTTPSecurityPolicy.m in Sources */,
-				CA8D78DBAC75A8BD63BAE42DE19DCE71 /* OWSIdentityManager.m in Sources */,
-				5DFEDD2B46A362A5DA43112FCCBA1A0E /* OWSIncomingMessageFinder.m in Sources */,
-				1E646F872B0CFDE6E07E05565A3F33A9 /* OWSIncomingSentMessageTranscript.m in Sources */,
-				9912EE153352A68334B6E3480943D01D /* OWSIncompleteCallsJob.m in Sources */,
-				660A40697AF8FAAED93117FF29843237 /* OWSLinkedDeviceReadReceipt.m in Sources */,
-				9A6EE11A511AAADF418C8D5CE5E855D5 /* OWSLogger.m in Sources */,
-				6A5BA50058DDEBA47CD0F81CE2DCE9B0 /* OWSMediaGalleryFinder.m in Sources */,
-				849F0DB70DF9A98BDC04B9D8009FE4BF /* OWSMessageDecrypter.m in Sources */,
-				D1BBA73C0FC575BD0B98A6D393BBAB90 /* OWSMessageHandler.m in Sources */,
-				AE47EC7BB0A730DE6C65A914C94A3F3B /* OWSMessageManager.m in Sources */,
-				DA5CD21A847F7F93536FED1B9EEA0050 /* OWSMessageReceiver.m in Sources */,
-				E73D38BF901A3FAB598432CF956611B7 /* OWSMessageSender.m in Sources */,
-				CEA85A29657010CA307E689A8D2E0E16 /* OWSMessageServiceParams.m in Sources */,
-				79959ED13F3F582D4C9313369657C263 /* OWSMessageUtils.m in Sources */,
-				6716EFA0332FC529AFE0667B5FE72F87 /* OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.m in Sources */,
-				5A545879DF3E12266E6BE14746CD679C /* OWSOperation.m in Sources */,
-				23E1CD659566AB524A6F2BD235172AA5 /* OWSOrphanedDataCleaner.m in Sources */,
-				A489B79FE731751902352E5B142515AF /* OWSOutgoingCallMessage.m in Sources */,
-				3DD99343C3469CE0E0C2DA2BA0BAB2D3 /* OWSOutgoingNullMessage.m in Sources */,
-				65DBE1B20C216E82ADD70B5E726906A5 /* OWSOutgoingSentMessageTranscript.m in Sources */,
-				9EB4A9344B7BF267D53BC5CCD9B728A8 /* OWSOutgoingSyncMessage.m in Sources */,
-				ED3F58E154BF9AE5250F38BC1B2A8564 /* OWSPrimaryStorage+Calling.m in Sources */,
-				C706D95FDE44F9CCEFE92376205D90A0 /* OWSPrimaryStorage+keyFromIntLong.m in Sources */,
-				4B827E9746D123F3837BF6C6801445D8 /* OWSPrimaryStorage+messageIDs.m in Sources */,
-				0AF6703021F10965022DA1F80B67BF65 /* OWSPrimaryStorage+PreKeyStore.m in Sources */,
-				D776F8D33ED37E8E614394496D4CE285 /* OWSPrimaryStorage+SessionStore.m in Sources */,
-				A9A406871150EC3F5C7BA90399D203DB /* OWSPrimaryStorage+SignedPreKeyStore.m in Sources */,
-				F4D2FB0657E0330F9F33903A000089E3 /* OWSPrimaryStorage.m in Sources */,
-				7DD81A3AA7D63AECA07DA4F162F379D2 /* OWSProfileKeyMessage.m in Sources */,
-				1D11AFB484CC6BB0F012988E2AED3C8A /* OWSProvisioningCipher.m in Sources */,
-				CF084DD06DC65BE3760C48860B266280 /* OWSProvisioningMessage.m in Sources */,
-				1920A9046C428B9C0E5AF5FC463DD17F /* OWSProvisioningProtos.pb.m in Sources */,
-				8561E14BE550B077F2FD6625AFEF903C /* OWSReadReceiptManager.m in Sources */,
-				3515649B6FF3594A60DBF972EBB3F129 /* OWSReadReceiptsForLinkedDevicesMessage.m in Sources */,
-				AD6030455DCD561F3BB5FFDA1D06CAA7 /* OWSReadReceiptsForSenderMessage.m in Sources */,
-				FBF57E0B3BE4C27990E343A151694FF9 /* OWSRecipientIdentity.m in Sources */,
-				BE68384F40F3A4619B48D0E8FCEE2E22 /* OWSRecordTranscriptJob.m in Sources */,
-				92FAE0D2F64B2D7B30ABE140B5B3427B /* OWSRequestBuilder.m in Sources */,
-				A6F02FF015BAEE67F42A8AFAAD22BAAD /* OWSRequestFactory.m in Sources */,
-				DE518F2BFECC83B76B134E9F3DC26458 /* OWSSignaliOSProtos.pb.m in Sources */,
-				F1ED5DF37233FA1CF361CC07C0B14235 /* OWSSignalService.m in Sources */,
-				CB85CFAA33E7A3683C9433ECB2D758D1 /* OWSStorage.m in Sources */,
-				63453520BCFC861AD5EE1E250EF3F22C /* OWSSwiftUtils.swift in Sources */,
-				B612C0191635DF697ED9D3D7002AA9C3 /* OWSSyncConfigurationMessage.m in Sources */,
-				F1F8C2A5EDED3B0BF54E1BB87F773320 /* OWSSyncContactsMessage.m in Sources */,
-				E56E9093B027F9867705A9BAB0DA802C /* OWSSyncGroupsMessage.m in Sources */,
-				7A31C90F07D5E0D0BF0405C6B25366E6 /* OWSSyncGroupsRequestMessage.m in Sources */,
-				DD486490CD73F36F85DA1269C71A6C11 /* OWSUnknownContactBlockOfferMessage.m in Sources */,
-				A7E5B26E15614CBE48B29264425557C7 /* OWSUploadOperation.m in Sources */,
-				29B155D951C85784540AEF3D87C97764 /* OWSVerificationStateChangeMessage.m in Sources */,
-				065161936BAA45AE12D1469B77DBBCDA /* OWSVerificationStateSyncMessage.m in Sources */,
-				99E9BF10C42A27E89B5018E14D1E4F99 /* OWSWebsocketSecurityPolicy.m in Sources */,
-				CE2EE656CA58C1A41475607498CE4A4E /* ParamParser.swift in Sources */,
-				6BB9F9A8DF2D6A02E6678B71D942501B /* PhoneNumber.m in Sources */,
-				D5FAE8C783A97697AFC8492C11211B6C /* PhoneNumberUtil.m in Sources */,
-				5B63659CCB38B102D4067FFD3CC54D0C /* PreKeyBundle+jsonDict.m in Sources */,
-				12B666C3134820D551042EEB70E2BE0C /* Promise+retainUntilComplete.swift in Sources */,
-				B47981FE11A37B660C57E7149C40F485 /* ProtoUtils.m in Sources */,
-				88DC54EF660DE387165EB052E06D30D0 /* Provisioning.pb.swift in Sources */,
-				583DAB0984898DB7935B58A199B39DC2 /* ProvisioningProto.swift in Sources */,
-				51A2522EC401E86C6261DBAFC5A931D1 /* SecurityUtils.m in Sources */,
-				773C9219A567207E93DDAF8C7F292F17 /* SignalAccount.m in Sources */,
-				436B243AD18FD0B06992BFFE177A48C2 /* SignalIOS.pb.swift in Sources */,
-				CCF4BF02A889AD604EB5C535B2554D91 /* SignalIOSProto.swift in Sources */,
-				75022451FE9CCDCB5F54EDAAA40A381B /* SignalRecipient.m in Sources */,
-				3CBB5BA60B70D94F63BFFBE4F6A1A687 /* SignalService.pb.swift in Sources */,
-				3DFAA7068E6A4B22774ADC601F03F835 /* SignalServiceKit-dummy.m in Sources */,
-				37C5B1BA4174212D594DAC58C82B3A3B /* SSKProto.swift in Sources */,
-				83A482E368995A62FCFD05FD62922574 /* TextSecureKitEnv.m in Sources */,
-				C50759DFC091E755F84B9DAB976C1056 /* Threading.m in Sources */,
-				24114016E48ED71F7A25EA8E0D9E6BE4 /* TSAccountManager.m in Sources */,
-				1EC574E887361C5BB17EF31A7FFCB437 /* TSAttachment.m in Sources */,
-				9DA104FCE0F0ADA9A7A245237C7075AA /* TSAttachmentPointer.m in Sources */,
-				A1532EE01261C65DDFB6B4671EBFB4B1 /* TSAttachmentStream.m in Sources */,
-				6E25874B5B7A5D458159EC71AD3648C3 /* TSAttributes.m in Sources */,
-				A305E8B9173384984EDDCB2E24975394 /* TSCall.m in Sources */,
-				27735D76CABBCC95BC8FF6CE6EBBD1F3 /* TSContactThread.m in Sources */,
-				947906FA199031BBA07857432A0F7836 /* TSDatabaseSecondaryIndexes.m in Sources */,
-				21C06C28CB58E6E27D87C146DACC6D88 /* TSDatabaseView.m in Sources */,
-				31953FC2D1E71131A4A082A98035B265 /* TSErrorMessage.m in Sources */,
-				1B91FC36107E3A5B56FE70C45F68DF7B /* TSGroupModel.m in Sources */,
-				F29B9E5CBEDA68DEF4E24320F3FD0544 /* TSGroupThread.m in Sources */,
-				019BD8983CD576658488E40BB3B21DF1 /* TSIncomingMessage.m in Sources */,
-				58CF711DA2007147737E0D8D0A02EBB9 /* TSInfoMessage.m in Sources */,
-				046474C87F82ECEA178B1649C6266CD4 /* TSInteraction.m in Sources */,
-				CC72D6BCC41E0098D53A1804174EFDDA /* TSInvalidIdentityKeyErrorMessage.m in Sources */,
-				59359299E28E7052D4F2A0922E0C1A62 /* TSInvalidIdentityKeyReceivingErrorMessage.m in Sources */,
-				1E41C1B696978FEA19031B77E70A27B7 /* TSInvalidIdentityKeySendingErrorMessage.m in Sources */,
-				9E0BD0FEAFFE3CC8EDA356EC1D2DA6AA /* TSMessage.m in Sources */,
-				02035686858611ADB521FF9C8BA3615D /* TSNetworkManager.m in Sources */,
-				0D5D8A63979F0ABBC19936DA554E88C7 /* TSOutgoingMessage.m in Sources */,
-				11ACB37C65FA68A4989DA7CE60B10C62 /* TSPreKeyManager.m in Sources */,
-				81D3B034EDA5AD71D4A59CF6869FEBB1 /* TSQuotedMessage.m in Sources */,
-				17037EBAA1F00A58B8BEA3989EF8F60D /* TSRequest.m in Sources */,
-				1E7A03995C562397B56F688EDE064E78 /* TSSocketManager.m in Sources */,
-				1DDA8F55EB48E6C9E361C530D619D20D /* TSThread.m in Sources */,
-				CE8A6D10DC79B0C251F0C439ACA131AC /* TSVerifyCodeRequest.m in Sources */,
-				3336AD79936AB06EC12298B7EB0AEEB4 /* TSYapDatabaseObject.m in Sources */,
-				0AFBEE9797E237353C52D9F83D9D4E04 /* UIImage+OWS.m in Sources */,
-				8723A09ED03B10671B9E8969BA80EA92 /* WeakTimer.swift in Sources */,
-				E0594BA15B4C6C4C2ED1DBBC4268485D /* WebSocketProto.swift in Sources */,
-				D6678A06AE51D66063144000B63846A8 /* WebSocketResources.pb.m in Sources */,
-				F3F72C8333CD1DD853FBB4558E8D9B07 /* WebSocketResources.pb.swift in Sources */,
-				C0E53B24E399C5F98F39706994D53C83 /* YapDatabaseConnection+OWS.m in Sources */,
-				C1A7F5F2EB5D40C4685BADEDCFC6214D /* YapDatabaseTransaction+OWS.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		BF999086069D9F78F4326DCC2464F5F3 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -10151,7 +10143,7 @@
 		};
 		9C471C7DFA1A7C2CE156415AF1D62EB1 /* App Store Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4E604A0F1CEA90BA2047FA996437D191 /* SignalServiceKit.xcconfig */;
+			baseConfigurationReference = DE9012C08AC3C6684E4D082158D849D9 /* SignalServiceKit.xcconfig */;
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CODE_SIGN_IDENTITY = "";
@@ -10287,7 +10279,7 @@
 		};
 		A16478FA9C6670867B3CE459D554034A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4E604A0F1CEA90BA2047FA996437D191 /* SignalServiceKit.xcconfig */;
+			baseConfigurationReference = DE9012C08AC3C6684E4D082158D849D9 /* SignalServiceKit.xcconfig */;
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CODE_SIGN_IDENTITY = "";
@@ -10823,7 +10815,7 @@
 		};
 		D9C592BA4A5B548A35665C001605A135 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4E604A0F1CEA90BA2047FA996437D191 /* SignalServiceKit.xcconfig */;
+			baseConfigurationReference = DE9012C08AC3C6684E4D082158D849D9 /* SignalServiceKit.xcconfig */;
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CODE_SIGN_IDENTITY = "";
diff --git a/Target Support Files/SignalServiceKit/SignalServiceKit-umbrella.h b/Target Support Files/SignalServiceKit/SignalServiceKit-umbrella.h
index 196dec80..f699ab46 100644
--- a/Target Support Files/SignalServiceKit/SignalServiceKit-umbrella.h	
+++ b/Target Support Files/SignalServiceKit/SignalServiceKit-umbrella.h	
@@ -121,7 +121,6 @@
 #import "ProfileManagerProtocol.h"
 #import "ProtoUtils.h"
 #import "OWSSignaliOSProtos.pb.h"
-#import "ECKeyPair+OWSPrivateKey.h"
 #import "OWSFingerprint.h"
 #import "OWSFingerprintBuilder.h"
 #import "OWSFingerprintProtos.pb.h"