oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Send delivery receipts.

This commit is contained in:
Matthew Chen 2018-10-11 12:51:58 -04:00
parent b5f6670dee
commit 13373db3bc
12 changed files with 431 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SignalMessaging/environment/AppSetup.m
View File

@ -14,11 +14,13 @@
#import <SignalServiceKit/OWSBackgroundTask.h>
#import <SignalServiceKit/OWSBatchMessageProcessor.h>
#import <SignalServiceKit/OWSBlockingManager.h>
#import <SignalServiceKit/OWSDeliveryReceiptManager.h>
#import <SignalServiceKit/OWSDisappearingMessagesJob.h>
#import <SignalServiceKit/OWSIdentityManager.h>
#import <SignalServiceKit/OWSMessageDecrypter.h>
#import <SignalServiceKit/OWSMessageManager.h>
#import <SignalServiceKit/OWSMessageReceiver.h>
#import <SignalServiceKit/OWSReadReceiptManager.h>
#import <SignalServiceKit/OWSStorage.h>
#import <SignalServiceKit/SSKEnvironment.h>
#import <SignalServiceKit/TSSocketManager.h>
@ -68,6 +70,10 @@ NS_ASSUME_NONNULL_BEGIN
OWSDisappearingMessagesJob *disappearingMessagesJob =
[[OWSDisappearingMessagesJob alloc] initWithPrimaryStorage:primaryStorage];
ContactDiscoveryService *contactDiscoveryService = [[ContactDiscoveryService alloc] initDefault];
OWSReadReceiptManager *readReceiptManager =
[[OWSReadReceiptManager alloc] initWithPrimaryStorage:primaryStorage];
OWSDeliveryReceiptManager *deliveryReceiptManager =
[[OWSDeliveryReceiptManager alloc] initWithPrimaryStorage:primaryStorage];
[Environment setShared:[[Environment alloc] initWithPreferences:preferences]];
@ -88,7 +94,9 @@ NS_ASSUME_NONNULL_BEGIN
tsAccountManager:tsAccountManager
ows2FAManager:ows2FAManager
disappearingMessagesJob:disappearingMessagesJob
contactDiscoveryService:contactDiscoveryService]];
contactDiscoveryService:contactDiscoveryService
disappearingMessagesJob:readReceiptManager
contactDiscoveryService:deliveryReceiptManager]];
appSpecificSingletonBlock();

10
SignalServiceKit/src/Devices/OWSReadReceiptsForSenderMessage.h → SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.h
View File

@ -6,9 +6,9 @@
NS_ASSUME_NONNULL_BEGIN
@class OWSReadReceipt;
@class OWSDeliveryReceipt;
@interface OWSReadReceiptsForSenderMessage : TSOutgoingMessage
@interface OWSReceiptsForSenderMessage : TSOutgoingMessage
- (instancetype)initOutgoingMessageWithTimestamp:(uint64_t)timestamp
inThread:(nullable TSThread *)thread
@ -21,7 +21,11 @@ NS_ASSUME_NONNULL_BEGIN
quotedMessage:(nullable TSQuotedMessage *)quotedMessage
contactShare:(nullable OWSContact *)contactShare NS_UNAVAILABLE;
- (instancetype)initWithThread:(nullable TSThread *)thread messageTimestamps:(NSArray<NSNumber *> *)messageTimestamps;
+ (OWSReceiptsForSenderMessage *)deliveryReceiptsForSenderMessageWithThread:(nullable TSThread *)thread
messageTimestamps:(NSArray<NSNumber *> *)messageTimestamps;
+ (OWSReceiptsForSenderMessage *)readReceiptsForSenderMessageWithThread:(nullable TSThread *)thread
messageTimestamps:(NSArray<NSNumber *> *)messageTimestamps;
@end

50
SignalServiceKit/src/Devices/OWSReadReceiptsForSenderMessage.m → SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.m
View File

@ -2,25 +2,42 @@
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import "OWSReadReceiptsForSenderMessage.h"
#import "OWSReceiptsForSenderMessage.h"
#import "SignalRecipient.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN
@interface OWSReadReceiptsForSenderMessage ()
@interface OWSReceiptsForSenderMessage ()
@property (nonatomic, readonly) NSArray<NSNumber *> *messageTimestamps;
@property (nonatomic, readonly) SSKProtoReceiptMessageType receiptType;
@end
#pragma mark -
@implementation OWSReadReceiptsForSenderMessage
@implementation OWSReceiptsForSenderMessage
- (instancetype)initWithThread:(nullable TSThread *)thread messageTimestamps:(NSArray<NSNumber *> *)messageTimestamps
{
+ (OWSReceiptsForSenderMessage *)deliveryReceiptsForSenderMessageWithThread:(nullable TSThread *)thread
messageTimestamps:(NSArray<NSNumber *> *)messageTimestamps {
return [[OWSReceiptsForSenderMessage alloc] initWithThread:thread
messageTimestamps:messageTimestamps
receiptType:SSKProtoReceiptMessageTypeDelivery];
}
+ (OWSReceiptsForSenderMessage *)readReceiptsForSenderMessageWithThread:(nullable TSThread *)thread
messageTimestamps:(NSArray<NSNumber *> *)messageTimestamps {
return [[OWSReceiptsForSenderMessage alloc] initWithThread:thread
messageTimestamps:messageTimestamps
receiptType:SSKProtoReceiptMessageTypeRead];
}
- (instancetype)initWithThread:(nullable TSThread *)thread
messageTimestamps:(NSArray<NSNumber *> *)messageTimestamps
receiptType:(SSKProtoReceiptMessageType)receiptType {
self = [super initOutgoingMessageWithTimestamp:[NSDate ows_millisecondTimeStamp]
inThread:thread
messageBody:nil
@ -42,20 +59,17 @@ NS_ASSUME_NONNULL_BEGIN
#pragma mark - TSOutgoingMessage overrides
- (BOOL)shouldSyncTranscript
{
- (BOOL)shouldSyncTranscript {
return NO;
}
- (BOOL)isSilent
{
- (BOOL)isSilent {
// Avoid "phantom messages" for "recipient read receipts".
return YES;
}
- (nullable NSData *)buildPlainTextData:(SignalRecipient *)recipient
{
- (nullable NSData *)buildPlainTextData:(SignalRecipient *)recipient {
OWSAssertDebug(recipient);
SSKProtoReceiptMessage *_Nullable receiptMessage = [self buildReceiptMessage:recipient.recipientId];
@ -76,9 +90,8 @@ NS_ASSUME_NONNULL_BEGIN
return contentData;
}
- (nullable SSKProtoReceiptMessage *)buildReceiptMessage:(NSString *)recipientId
{
SSKProtoReceiptMessageBuilder *builder = [SSKProtoReceiptMessage builderWithType:SSKProtoReceiptMessageTypeRead];
- (nullable SSKProtoReceiptMessage *)buildReceiptMessage:(NSString *)recipientId {
SSKProtoReceiptMessageBuilder *builder = [SSKProtoReceiptMessage builderWithType:self.receiptType];
OWSAssertDebug(self.messageTimestamps.count > 0);
for (NSNumber *messageTimestamp in self.messageTimestamps) {
@ -96,14 +109,13 @@ NS_ASSUME_NONNULL_BEGIN
#pragma mark - TSYapDatabaseObject overrides
- (BOOL)shouldBeSaved
{
- (BOOL)shouldBeSaved {
return NO;
}
- (NSString *)debugDescription
{
return [NSString stringWithFormat:@"%@ with message timestamps: %lu", self.logTag, (unsigned long)self.messageTimestamps.count];
- (NSString *)debugDescription {
return [NSString
stringWithFormat:@"%@ with message timestamps: %lu", self.logTag, (unsigned long)self.messageTimestamps.count];
}
@end

90
SignalServiceKit/src/Messages/OWSDeliveryReceiptManager.h Normal file
View File

@ -0,0 +1,90 @@
//
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
NS_ASSUME_NONNULL_BEGIN
//@class SSKProtoSyncMessageRead;
//@class TSIncomingMessage;
//@class TSOutgoingMessage;
//@class TSThread;
//@class YapDatabaseReadTransaction;
//@class YapDatabaseReadWriteTransaction;
@class OWSPrimaryStorage;
@class SSKProtoEnvelope;
// extern NSString *const kIncomingMessageMarkedAsReadNotification;
// There are four kinds of read receipts:
//
// * Read receipts that this client sends to linked
// devices to inform them that a message has been read.
// * Read receipts that this client receives from linked
// devices that inform this client that a message has been read.
// * These read receipts are saved so that they can be applied
// if they arrive before the corresponding message.
// * Read receipts that this client sends to other users
// to inform them that a message has been read.
// * Read receipts that this client receives from other users
// that inform this client that a message has been read.
// * These read receipts are saved so that they can be applied
// if they arrive before the corresponding message.
//
// This manager is responsible for handling and emitting all four kinds.
@interface OWSDeliveryReceiptManager : NSObject
- (instancetype)init NS_UNAVAILABLE;
- (instancetype)initWithPrimaryStorage:(OWSPrimaryStorage *)primaryStorage NS_DESIGNATED_INITIALIZER;
+ (instancetype)sharedManager;
//#pragma mark - Sender/Recipient Read Receipts
//
//// This method should be called when we receive a read receipt
//// from a user to whom we have sent a message.
////
//// This method can be called from any thread.
//- (void)processDeliveryReceiptsFromRecipientId:(NSString *)recipientId
// sentTimestamps:(NSArray<NSNumber *> *)sentTimestamps
// readTimestamp:(uint64_t)readTimestamp;
//
//- (void)applyEarlyDeliveryReceiptsForOutgoingMessageFromLinkedDevice:(TSOutgoingMessage *)message
// transaction:(YapDatabaseReadWriteTransaction *)transaction;
//
//#pragma mark - Linked Device Read Receipts
//
//- (void)processDeliveryReceiptsFromLinkedDevice:(NSArray<SSKProtoSyncMessageRead *> *)DeliveryReceiptProtos
// readTimestamp:(uint64_t)readTimestamp
// transaction:(YapDatabaseReadWriteTransaction *)transaction;
//
//- (void)applyEarlyDeliveryReceiptsForIncomingMessage:(TSIncomingMessage *)message
// transaction:(YapDatabaseReadWriteTransaction *)transaction;
//
//#pragma mark - Locally Read
//
//// This method cues this manager:
////
//// * ...to inform the sender that this message was read (if read receipts
//// are enabled).
//// * ...to inform the local user's other devices that this message was read.
////
//// Both types of messages are deduplicated.
////
//// This method can be called from any thread.
//- (void)messageWasReadLocally:(TSIncomingMessage *)message;
//
//- (void)markAsReadLocallyBeforeTimestamp:(uint64_t)timestamp thread:(TSThread *)thread;
//
//#pragma mark - Settings
//
//- (void)prepareCachedValues;
//
//- (BOOL)areDeliveryReceiptsEnabled;
//- (BOOL)areDeliveryReceiptsEnabledWithTransaction:(YapDatabaseReadTransaction *)transaction;
//- (void)setAreDeliveryReceiptsEnabled:(BOOL)value;
- (void)envelopeWasReceived:(SSKProtoEnvelope *)envelope;
@end
NS_ASSUME_NONNULL_END

228
SignalServiceKit/src/Messages/OWSDeliveryReceiptManager.m Normal file
View File

@ -0,0 +1,228 @@
//
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import "OWSDeliveryReceiptManager.h"
#import "AppReadiness.h"
#import "OWSMessageSender.h"
#import "OWSPrimaryStorage.h"
#import "OWSReceiptsForSenderMessage.h"
#import "SSKEnvironment.h"
#import "TSContactThread.h"
#import "TSYapDatabaseObject.h"
#import <SignalServiceKit/SignalServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN
NSString *const kDeliveryReceiptManagerCollection = @"kDeliveryReceiptManagerCollection";
@interface OWSDeliveryReceiptManager ()
@property (nonatomic, readonly) YapDatabaseConnection *dbConnection;
// Should only be accessed on the serialQueue.
@property (nonatomic) BOOL isProcessing;
// A map of "recipient id"-to-"timestamp list" for delivery receipts that
// we will send to senders.
//
// Should only be accessed on the serialQueue.
@property (nonatomic, readonly) NSMutableDictionary<NSString *, NSMutableSet<NSNumber *> *> *deliveryReceiptMap;
@end
#pragma mark -
@implementation OWSDeliveryReceiptManager
+ (instancetype)sharedManager {
OWSAssert(SSKEnvironment.shared.deliveryReceiptManager);
return SSKEnvironment.shared.deliveryReceiptManager;
}
- (instancetype)initWithPrimaryStorage:(OWSPrimaryStorage *)primaryStorage {
self = [super init];
if (!self) {
return self;
}
_dbConnection = primaryStorage.newDatabaseConnection;
_deliveryReceiptMap = [NSMutableDictionary new];
OWSSingletonAssert();
// Start processing.
[AppReadiness runNowOrWhenAppIsReady:^{
[self scheduleProcessing];
}];
return self;
}
- (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self];
}
#pragma mark - Dependencies
- (OWSMessageSender *)messageSender {
OWSAssertDebug(SSKEnvironment.shared.messageSender);
return SSKEnvironment.shared.messageSender;
}
#pragma mark -
- (dispatch_queue_t)serialQueue {
static dispatch_queue_t _serialQueue;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
_serialQueue = dispatch_queue_create("org.whispersystems.deliveryReceipts", DISPATCH_QUEUE_SERIAL);
});
return _serialQueue;
}
// Schedules a processing pass, unless one is already scheduled.
- (void)scheduleProcessing {
OWSAssertDebug(AppReadiness.isAppReady);
dispatch_async(self.serialQueue, ^{
if (self.isProcessing) {
return;
}
self.isProcessing = YES;
[self process];
});
}
- (void)process {
OWSLogVerbose(@"Processing outbound delivery receipts.");
NSMutableDictionary<NSString *, NSSet<NSNumber *> *> *deliveryReceiptMap = [NSMutableDictionary new];
[self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
[transaction enumerateKeysAndObjectsInCollection:kDeliveryReceiptManagerCollection
usingBlock:^(NSString *key, id object, BOOL *stop) {
NSString *recipientId = key;
NSSet<NSNumber *> *timestamps = object;
deliveryReceiptMap[recipientId] = timestamps;
}];
}];
BOOL didWork = NO;
for (NSString *recipientId in deliveryReceiptMap) {
NSSet<NSNumber *> *timestamps = deliveryReceiptMap[recipientId];
if (timestamps.count < 1) {
OWSFailDebug(@"Missing timestamps.");
continue;
}
TSThread *thread = [TSContactThread getOrCreateThreadWithContactId:recipientId];
OWSReceiptsForSenderMessage *message =
[OWSReceiptsForSenderMessage deliveryReceiptsForSenderMessageWithThread:thread
messageTimestamps:timestamps.allObjects];
[self.messageSender enqueueMessage:message
success:^{
OWSLogInfo(@"Successfully sent %lu delivery receipts to sender.", (unsigned long)timestamps.count);
}
failure:^(NSError *error) {
OWSLogError(@"Failed to send delivery receipts to sender with error: %@", error);
}];
didWork = YES;
}
// Now that they've been processed, remove all enqueued delivery receipts.
//
// NOTE: we don't need to worry about race conditions; this
// collection will only be mutated on serialQueue.
[self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
[transaction removeAllObjectsInCollection:kDeliveryReceiptManagerCollection];
}];
if (!didWork) {
self.isProcessing = NO;
return;
}
// Wait N seconds before processing delivery receipts again.
// This allows time for a batch to accumulate.
//
// We want a value high enough to allow us to effectively de-duplicate,
// delivery receipts without being so high that we risk not sending delivery
// receipts due to app exit.
const CGFloat kProcessingFrequencySeconds = 3.f;
dispatch_after(
dispatch_time(DISPATCH_TIME_NOW, (int64_t)(kProcessingFrequencySeconds * NSEC_PER_SEC)), self.serialQueue, ^{
[self process];
});
}
- (void)envelopeWasReceived:(SSKProtoEnvelope *)envelope {
OWSLogVerbose(@"");
[self enqueueDeliveryReceiptWithRecipientId:envelope.source timestamp:envelope.timestamp];
}
- (void)enqueueDeliveryReceiptWithRecipientId:(NSString *)recipientId timestamp:(uint64_t)timestamp {
OWSLogVerbose(@"");
if (recipientId.length < 1) {
OWSFailDebug(@"Invalid recipient id.");
return;
}
if (timestamp < 1) {
OWSFailDebug(@"Invalid timestamp.");
return;
}
dispatch_async(self.serialQueue, ^{
[self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
NSSet<NSNumber *> *_Nullable oldTimestamps = [transaction objectForKey:recipientId
inCollection:kDeliveryReceiptManagerCollection];
NSMutableSet<NSNumber *> *newTimestamps
= (oldTimestamps ? [oldTimestamps mutableCopy] : [NSMutableSet new]);
[newTimestamps addObject:@(timestamp)];
[transaction setObject:newTimestamps forKey:recipientId inCollection:kDeliveryReceiptManagerCollection];
}];
[self scheduleProcessing];
});
}
- (void)dequeueDeliveryReceiptsWithRecipientId:(NSString *)recipientId timestamps:(NSSet<NSNumber *> *)timestamps {
if (recipientId.length < 1) {
OWSFailDebug(@"Invalid recipient id.");
return;
}
if (timestamps.count < 1) {
OWSFailDebug(@"Invalid timestamps.");
return;
}
dispatch_async(self.serialQueue, ^{
[self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
NSSet<NSNumber *> *_Nullable oldTimestamps = [transaction objectForKey:recipientId
inCollection:kDeliveryReceiptManagerCollection];
NSMutableSet<NSNumber *> *newTimestamps
= (oldTimestamps ? [oldTimestamps mutableCopy] : [NSMutableSet new]);
[newTimestamps minusSet:timestamps];
if (newTimestamps.count > 0) {
[transaction setObject:newTimestamps forKey:recipientId inCollection:kDeliveryReceiptManagerCollection];
} else {
[transaction removeObjectForKey:recipientId inCollection:kDeliveryReceiptManagerCollection];
}
}];
});
}
@end
NS_ASSUME_NONNULL_END

4
SignalServiceKit/src/Messages/OWSIdentityManager.m
View File

@ -98,6 +98,8 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
[[NSNotificationCenter defaultCenter] removeObserver:self];
}
#pragma mark - Dependencies
- (OWSMessageSender *)messageSender
{
OWSAssertDebug(SSKEnvironment.shared.messageSender);
@ -105,6 +107,8 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
return SSKEnvironment.shared.messageSender;
}
#pragma mark -
- (void)observeNotifications
{
[[NSNotificationCenter defaultCenter] addObserver:self

18
SignalServiceKit/src/Messages/OWSMessageManager.m
View File

@ -12,6 +12,7 @@
#import "OWSBlockingManager.h"
#import "OWSCallMessageHandler.h"
#import "OWSContact.h"
#import "OWSDeliveryReceiptManager.h"
#import "OWSDevice.h"
#import "OWSDisappearingConfigurationUpdateInfoMessage.h"
#import "OWSDisappearingMessagesConfiguration.h"
@ -131,6 +132,14 @@ NS_ASSUME_NONNULL_BEGIN
return SSKEnvironment.shared.networkManager;
}
- (OWSDeliveryReceiptManager *)deliveryReceiptManager {
OWSAssertDebug(SSKEnvironment.shared.deliveryReceiptManager);
return SSKEnvironment.shared.deliveryReceiptManager;
}
#pragma mark -
- (void)startObserving
{
[[NSNotificationCenter defaultCenter] addObserver:self
@ -490,6 +499,15 @@ NS_ASSUME_NONNULL_BEGIN
[self handleReceivedGroupAvatarUpdateWithEnvelope:envelope dataMessage:dataMessage transaction:transaction];
}
}
// Send delivery receipts for "valid data" messages.
[self.deliveryReceiptManager envelopeWasReceived:envelope];
}
- (void)sendDeliveryReceiptForEnvelope:(SSKProtoEnvelope *)envelope {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
^ {
});
}
- (void)sendGroupInfoRequest:(NSData *)groupId

2
SignalServiceKit/src/Messages/OWSReadReceiptManager.h
View File

@ -4,6 +4,7 @@
NS_ASSUME_NONNULL_BEGIN
@class OWSPrimaryStorage;
@class SSKProtoSyncMessageRead;
@class TSIncomingMessage;
@class TSOutgoingMessage;
@ -32,6 +33,7 @@ extern NSString *const kIncomingMessageMarkedAsReadNotification;
@interface OWSReadReceiptManager : NSObject
- (instancetype)init NS_UNAVAILABLE;
- (instancetype)initWithPrimaryStorage:(OWSPrimaryStorage *)primaryStorage NS_DESIGNATED_INITIALIZER;
+ (instancetype)sharedManager;
#pragma mark - Sender/Recipient Read Receipts

42
SignalServiceKit/src/Messages/OWSReadReceiptManager.m
View File

@ -9,7 +9,7 @@
#import "OWSMessageSender.h"
#import "OWSPrimaryStorage.h"
#import "OWSReadReceiptsForLinkedDevicesMessage.h"
#import "OWSReadReceiptsForSenderMessage.h"
#import "OWSReceiptsForSenderMessage.h"
#import "OWSStorage.h"
#import "OWSSyncConfigurationMessage.h"
#import "SSKEnvironment.h"
@ -117,8 +117,6 @@ NSString *const OWSReadReceiptManagerAreReadReceiptsEnabled = @"areReadReceiptsE
@interface OWSReadReceiptManager ()
@property (nonatomic, readonly) OWSMessageSender *messageSender;
@property (nonatomic, readonly) YapDatabaseConnection *dbConnection;
// A map of "thread unique id"-to-"read receipt" for read receipts that
@ -146,32 +144,18 @@ NSString *const OWSReadReceiptManagerAreReadReceiptsEnabled = @"areReadReceiptsE
+ (instancetype)sharedManager
{
static OWSReadReceiptManager *sharedMyManager = nil;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
sharedMyManager = [[self alloc] initDefault];
});
return sharedMyManager;
OWSAssert(SSKEnvironment.shared.readReceiptManager);
return SSKEnvironment.shared.readReceiptManager;
}
- (instancetype)initDefault
{
OWSMessageSender *messageSender = SSKEnvironment.shared.messageSender;
OWSPrimaryStorage *primaryStorage = [OWSPrimaryStorage sharedManager];
return [self initWithMessageSender:messageSender primaryStorage:primaryStorage];
}
- (instancetype)initWithMessageSender:(OWSMessageSender *)messageSender
primaryStorage:(OWSPrimaryStorage *)primaryStorage
{
- (instancetype)initWithPrimaryStorage:(OWSPrimaryStorage *)primaryStorage {
self = [super init];
if (!self) {
return self;
}
_messageSender = messageSender;
_dbConnection = primaryStorage.newDatabaseConnection;
_toLinkedDevicesReadReceiptMap = [NSMutableDictionary new];
@ -192,6 +176,16 @@ NSString *const OWSReadReceiptManagerAreReadReceiptsEnabled = @"areReadReceiptsE
[[NSNotificationCenter defaultCenter] removeObserver:self];
}
#pragma mark - Dependencies
- (OWSMessageSender *)messageSender {
OWSAssertDebug(SSKEnvironment.shared.messageSender);
return SSKEnvironment.shared.messageSender;
}
#pragma mark -
// Schedules a processing pass, unless one is already scheduled.
- (void)scheduleProcessing
{
@ -243,9 +237,9 @@ NSString *const OWSReadReceiptManagerAreReadReceiptsEnabled = @"areReadReceiptsE
OWSAssertDebug(timestamps.count > 0);
TSThread *thread = [TSContactThread getOrCreateThreadWithContactId:recipientId];
OWSReadReceiptsForSenderMessage *message =
[[OWSReadReceiptsForSenderMessage alloc] initWithThread:thread
messageTimestamps:timestamps.allObjects];
OWSReceiptsForSenderMessage *message =
[OWSReceiptsForSenderMessage readReceiptsForSenderMessageWithThread:thread
messageTimestamps:timestamps.allObjects];
[self.messageSender enqueueMessage:message
success:^{

8
SignalServiceKit/src/SSKEnvironment.h
View File

@ -9,6 +9,7 @@ NS_ASSUME_NONNULL_BEGIN
@class OWS2FAManager;
@class OWSBatchMessageProcessor;
@class OWSBlockingManager;
@class OWSDeliveryReceiptManager;
@class OWSDisappearingMessagesJob;
@class OWSIdentityManager;
@class OWSMessageDecrypter;
@ -16,6 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
@class OWSMessageReceiver;
@class OWSMessageSender;
@class OWSPrimaryStorage;
@class OWSReadReceiptManager;
@class TSAccountManager;
@class TSNetworkManager;
@class TSSocketManager;
@ -46,7 +48,9 @@ NS_ASSUME_NONNULL_BEGIN
tsAccountManager:(TSAccountManager *)tsAccountManager
ows2FAManager:(OWS2FAManager *)ows2FAManager
disappearingMessagesJob:(OWSDisappearingMessagesJob *)disappearingMessagesJob
contactDiscoveryService:(ContactDiscoveryService *)contactDiscoveryService NS_DESIGNATED_INITIALIZER;
contactDiscoveryService:(ContactDiscoveryService *)contactDiscoveryService
disappearingMessagesJob:(OWSReadReceiptManager *)readReceiptManager
contactDiscoveryService:(OWSDeliveryReceiptManager *)deliveryReceiptManager NS_DESIGNATED_INITIALIZER;
- (instancetype)init NS_UNAVAILABLE;
@ -77,6 +81,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, readonly) OWS2FAManager *ows2FAManager;
@property (nonatomic, readonly) OWSDisappearingMessagesJob *disappearingMessagesJob;
@property (nonatomic, readonly) ContactDiscoveryService *contactDiscoveryService;
@property (nonatomic, readonly) OWSReadReceiptManager *readReceiptManager;
@property (nonatomic, readonly) OWSDeliveryReceiptManager *deliveryReceiptManager;
// This property is configured after Environment is created.
@property (atomic, nullable) id<OWSCallMessageHandler> callMessageHandler;

10
SignalServiceKit/src/SSKEnvironment.m
View File

@ -30,6 +30,8 @@ static SSKEnvironment *sharedSSKEnvironment;
@property (nonatomic) OWS2FAManager *ows2FAManager;
@property (nonatomic) OWSDisappearingMessagesJob *disappearingMessagesJob;
@property (nonatomic) ContactDiscoveryService *contactDiscoveryService;
@property (nonatomic) OWSReadReceiptManager *readReceiptManager;
@property (nonatomic) OWSDeliveryReceiptManager *deliveryReceiptManager;
@end
@ -58,7 +60,9 @@ static SSKEnvironment *sharedSSKEnvironment;
tsAccountManager:(TSAccountManager *)tsAccountManager
ows2FAManager:(OWS2FAManager *)ows2FAManager
disappearingMessagesJob:(OWSDisappearingMessagesJob *)disappearingMessagesJob
contactDiscoveryService:(ContactDiscoveryService *)contactDiscoveryService {
contactDiscoveryService:(ContactDiscoveryService *)contactDiscoveryService
disappearingMessagesJob:(OWSReadReceiptManager *)readReceiptManager
contactDiscoveryService:(OWSDeliveryReceiptManager *)deliveryReceiptManager {
self = [super init];
if (!self) {
return self;
@ -82,6 +86,8 @@ static SSKEnvironment *sharedSSKEnvironment;
OWSAssertDebug(ows2FAManager);
OWSAssertDebug(disappearingMessagesJob);
OWSAssertDebug(contactDiscoveryService);
OWSAssertDebug(readReceiptManager);
OWSAssertDebug(deliveryReceiptManager);
_contactsManager = contactsManager;
_messageSender = messageSender;
@ -101,6 +107,8 @@ static SSKEnvironment *sharedSSKEnvironment;
_ows2FAManager = ows2FAManager;
_disappearingMessagesJob = disappearingMessagesJob;
_contactDiscoveryService = contactDiscoveryService;
_readReceiptManager = readReceiptManager;
_deliveryReceiptManager = deliveryReceiptManager;
return self;
}

9
SignalServiceKit/src/Tests/MockSSKEnvironment.m
View File

@ -7,6 +7,7 @@
#import "OWS2FAManager.h"
#import "OWSBatchMessageProcessor.h"
#import "OWSBlockingManager.h"
#import "OWSDeliveryReceiptManager.h"
#import "OWSDisappearingMessagesJob.h"
#import "OWSFakeCallMessageHandler.h"
#import "OWSFakeContactsManager.h"
@ -20,6 +21,7 @@
#import "OWSMessageManager.h"
#import "OWSMessageReceiver.h"
#import "OWSPrimaryStorage.h"
#import "OWSReadReceiptManager.h"
#import "TSAccountManager.h"
#import "TSSocketManager.h"
#import <SignalServiceKit/SignalServiceKit-Swift.h>
@ -67,6 +69,9 @@ NS_ASSUME_NONNULL_BEGIN
OWSDisappearingMessagesJob *disappearingMessagesJob =
[[OWSDisappearingMessagesJob alloc] initWithPrimaryStorage:primaryStorage];
ContactDiscoveryService *contactDiscoveryService = [[ContactDiscoveryService alloc] initDefault];
OWSReadReceiptManager *readReceiptManager = [[OWSReadReceiptManager alloc] initWithPrimaryStorage:primaryStorage];
OWSDeliveryReceiptManager *deliveryReceiptManager =
[[OWSDeliveryReceiptManager alloc] initWithPrimaryStorage:primaryStorage];
self = [super initWithContactsManager:contactsManager
messageSender:messageSender
@ -85,7 +90,9 @@ NS_ASSUME_NONNULL_BEGIN
tsAccountManager:tsAccountManager
ows2FAManager:ows2FAManager
disappearingMessagesJob:disappearingMessagesJob
contactDiscoveryService:contactDiscoveryService];
contactDiscoveryService:contactDiscoveryService
disappearingMessagesJob:readReceiptManager
contactDiscoveryService:deliveryReceiptManager];
if (!self) {
return nil;
}