|
|
|
@ -17,6 +17,7 @@
|
|
|
|
#import "TSMessage.h"
|
|
|
|
#import "TSMessage.h"
|
|
|
|
|
|
|
|
|
|
|
|
NS_ASSUME_NONNULL_BEGIN
|
|
|
|
NS_ASSUME_NONNULL_BEGIN
|
|
|
|
|
|
|
|
|
|
|
|
// Can we move to Signal-iOS?
|
|
|
|
// Can we move to Signal-iOS?
|
|
|
|
@interface OWSDisappearingMessagesJob ()
|
|
|
|
@interface OWSDisappearingMessagesJob ()
|
|
|
|
|
|
|
|
|
|
|
|
@ -24,13 +25,25 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
|
|
|
|
|
|
|
|
@property (nonatomic, readonly) OWSDisappearingMessagesFinder *disappearingMessagesFinder;
|
|
|
|
@property (nonatomic, readonly) OWSDisappearingMessagesFinder *disappearingMessagesFinder;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+ (dispatch_queue_t)serialQueue;
|
|
|
|
|
|
|
|
|
|
|
|
// These three properties should only be accessed on the main thread.
|
|
|
|
// These three properties should only be accessed on the main thread.
|
|
|
|
@property (nonatomic) BOOL hasStarted;
|
|
|
|
@property (nonatomic) BOOL hasStarted;
|
|
|
|
@property (nonatomic, nullable) NSTimer *timer;
|
|
|
|
@property (nonatomic, nullable) NSTimer *nextDisappearanceTimer;
|
|
|
|
@property (nonatomic, nullable) NSDate *timerScheduleDate;
|
|
|
|
@property (nonatomic, nullable) NSDate *nextDisappearanceDate;
|
|
|
|
|
|
|
|
@property (nonatomic, nullable) NSTimer *fallbackTimer;
|
|
|
|
|
|
|
|
|
|
|
|
@end
|
|
|
|
@end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void AssertIsOnDisappearingMessagesQueue()
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
|
|
|
if (@available(iOS 10.0, *)) {
|
|
|
|
|
|
|
|
dispatch_assert_queue(OWSDisappearingMessagesJob.serialQueue);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#pragma mark -
|
|
|
|
#pragma mark -
|
|
|
|
|
|
|
|
|
|
|
|
@implementation OWSDisappearingMessagesJob
|
|
|
|
@implementation OWSDisappearingMessagesJob
|
|
|
|
@ -55,6 +68,18 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
_databaseConnection = primaryStorage.newDatabaseConnection;
|
|
|
|
_databaseConnection = primaryStorage.newDatabaseConnection;
|
|
|
|
_disappearingMessagesFinder = [OWSDisappearingMessagesFinder new];
|
|
|
|
_disappearingMessagesFinder = [OWSDisappearingMessagesFinder new];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// suspenders in case a deletion schedule is missed.
|
|
|
|
|
|
|
|
NSTimeInterval kFallBackTimerInterval = 5 * kMinuteInterval;
|
|
|
|
|
|
|
|
[AppReadiness runNowOrWhenAppIsReady:^{
|
|
|
|
|
|
|
|
if (CurrentAppContext().isMainApp) {
|
|
|
|
|
|
|
|
self.fallbackTimer = [NSTimer weakScheduledTimerWithTimeInterval:kFallBackTimerInterval
|
|
|
|
|
|
|
|
target:self
|
|
|
|
|
|
|
|
selector:@selector(fallbackTimerDidFire)
|
|
|
|
|
|
|
|
userInfo:nil
|
|
|
|
|
|
|
|
repeats:YES];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}];
|
|
|
|
|
|
|
|
|
|
|
|
OWSSingletonAssert();
|
|
|
|
OWSSingletonAssert();
|
|
|
|
|
|
|
|
|
|
|
|
[[NSNotificationCenter defaultCenter] addObserver:self
|
|
|
|
[[NSNotificationCenter defaultCenter] addObserver:self
|
|
|
|
@ -84,96 +109,79 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
return queue;
|
|
|
|
return queue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// This method should only be called on the serialQueue.
|
|
|
|
- (NSUInteger)deleteExpiredMessages
|
|
|
|
- (void)run
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
AssertIsOnDisappearingMessagesQueue();
|
|
|
|
|
|
|
|
|
|
|
|
uint64_t now = [NSDate ows_millisecondTimeStamp];
|
|
|
|
uint64_t now = [NSDate ows_millisecondTimeStamp];
|
|
|
|
|
|
|
|
|
|
|
|
OWSBackgroundTask *_Nullable backgroundTask = [OWSBackgroundTask backgroundTaskWithLabelStr:__PRETTY_FUNCTION__];
|
|
|
|
OWSBackgroundTask *_Nullable backgroundTask = [OWSBackgroundTask backgroundTaskWithLabelStr:__PRETTY_FUNCTION__];
|
|
|
|
|
|
|
|
|
|
|
|
__block uint expirationCount = 0;
|
|
|
|
__block NSUInteger expirationCount = 0;
|
|
|
|
[self.databaseConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
|
|
|
|
[self.databaseConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
|
|
|
|
[self.disappearingMessagesFinder enumerateExpiredMessagesWithBlock:^(TSMessage *message) {
|
|
|
|
[self.disappearingMessagesFinder enumerateExpiredMessagesWithBlock:^(TSMessage *message) {
|
|
|
|
// sanity check
|
|
|
|
// sanity check
|
|
|
|
if (message.expiresAt > now) {
|
|
|
|
if (message.expiresAt > now) {
|
|
|
|
DDLogError(
|
|
|
|
OWSFail(
|
|
|
|
@"%@ Refusing to remove message which doesn't expire until: %lld", self.logTag, message.expiresAt);
|
|
|
|
@"%@ Refusing to remove message which doesn't expire until: %lld", self.logTag, message.expiresAt);
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
DDLogDebug(@"%@ Removing message which expired at: %lld", self.logTag, message.expiresAt);
|
|
|
|
DDLogInfo(@"%@ Removing message which expired at: %lld", self.logTag, message.expiresAt);
|
|
|
|
[message removeWithTransaction:transaction];
|
|
|
|
[message removeWithTransaction:transaction];
|
|
|
|
expirationCount++;
|
|
|
|
expirationCount++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
transaction:transaction];
|
|
|
|
transaction:transaction];
|
|
|
|
}];
|
|
|
|
}];
|
|
|
|
|
|
|
|
|
|
|
|
DDLogDebug(@"%@ Removed %u expired messages", self.logTag, expirationCount);
|
|
|
|
DDLogDebug(@"%@ Removed %tu expired messages", self.logTag, expirationCount);
|
|
|
|
|
|
|
|
|
|
|
|
backgroundTask = nil;
|
|
|
|
backgroundTask = nil;
|
|
|
|
|
|
|
|
return expirationCount;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// This method should only be called on the serialQueue.
|
|
|
|
// deletes any expired messages and schedules the next run.
|
|
|
|
- (void)runLoop
|
|
|
|
- (NSUInteger)runLoop
|
|
|
|
{
|
|
|
|
{
|
|
|
|
DDLogVerbose(@"%@ Run", self.logTag);
|
|
|
|
DDLogVerbose(@"%@ in runLoop", self.logTag);
|
|
|
|
|
|
|
|
AssertIsOnDisappearingMessagesQueue();
|
|
|
|
|
|
|
|
|
|
|
|
[self run];
|
|
|
|
NSUInteger deletedCount = [self deleteExpiredMessages];
|
|
|
|
|
|
|
|
|
|
|
|
uint64_t now = [NSDate ows_millisecondTimeStamp];
|
|
|
|
|
|
|
|
__block NSNumber *nextExpirationTimestampNumber;
|
|
|
|
__block NSNumber *nextExpirationTimestampNumber;
|
|
|
|
[self.databaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
|
|
|
|
[self.databaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
|
|
|
|
nextExpirationTimestampNumber =
|
|
|
|
nextExpirationTimestampNumber =
|
|
|
|
[self.disappearingMessagesFinder nextExpirationTimestampWithTransaction:transaction];
|
|
|
|
[self.disappearingMessagesFinder nextExpirationTimestampWithTransaction:transaction];
|
|
|
|
}];
|
|
|
|
}];
|
|
|
|
|
|
|
|
|
|
|
|
if (!nextExpirationTimestampNumber) {
|
|
|
|
if (!nextExpirationTimestampNumber) {
|
|
|
|
// In theory we could kill the loop here. It should resume when the next expiring message is saved,
|
|
|
|
|
|
|
|
// But this is a safeguard for any race conditions that exist while running the job as a new message is saved.
|
|
|
|
|
|
|
|
DDLogDebug(@"%@ No more expiring messages.", self.logTag);
|
|
|
|
DDLogDebug(@"%@ No more expiring messages.", self.logTag);
|
|
|
|
[self runLater];
|
|
|
|
return deletedCount;
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
uint64_t nextExpirationAt = [nextExpirationTimestampNumber unsignedLongLongValue];
|
|
|
|
uint64_t nextExpirationAt = nextExpirationTimestampNumber.unsignedLongLongValue;
|
|
|
|
[self runByDate:[NSDate ows_dateWithMillisecondsSince1970:MAX(nextExpirationAt, now)]];
|
|
|
|
NSDate *nextEpirationDate = [NSDate ows_dateWithMillisecondsSince1970:nextExpirationAt];
|
|
|
|
}
|
|
|
|
[self scheduleRunByDate:nextEpirationDate];
|
|
|
|
|
|
|
|
|
|
|
|
+ (void)setExpirationForMessage:(TSMessage *)message
|
|
|
|
return deletedCount;
|
|
|
|
{
|
|
|
|
|
|
|
|
dispatch_async(self.serialQueue, ^{
|
|
|
|
|
|
|
|
[[self sharedJob] setExpirationForMessage:message];
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- (void)setExpirationForMessage:(TSMessage *)message
|
|
|
|
- (void)startAnyExpirationForMessage:(TSMessage *)message
|
|
|
|
|
|
|
|
expirationStartedAt:(uint64_t)expirationStartedAt
|
|
|
|
|
|
|
|
transaction:(YapDatabaseReadWriteTransaction *_Nonnull)transaction
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (!message.isExpiringMessage) {
|
|
|
|
if (!message.isExpiringMessage) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
OWSDisappearingMessagesConfiguration *disappearingConfig =
|
|
|
|
OWSDisappearingMessagesConfiguration *disappearingConfig =
|
|
|
|
[OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:message.uniqueThreadId];
|
|
|
|
[OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:message.uniqueThreadId transaction:transaction];
|
|
|
|
|
|
|
|
|
|
|
|
if (!disappearingConfig.isEnabled) {
|
|
|
|
if (!disappearingConfig.isEnabled) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
[self setExpirationForMessage:message expirationStartedAt:[NSDate ows_millisecondTimeStamp]];
|
|
|
|
[self setExpirationForMessage:message expirationStartedAt:expirationStartedAt transaction:transaction];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+ (void)setExpirationForMessage:(TSMessage *)message expirationStartedAt:(uint64_t)expirationStartedAt
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
dispatch_async(self.serialQueue, ^{
|
|
|
|
|
|
|
|
[[self sharedJob] setExpirationForMessage:message expirationStartedAt:expirationStartedAt];
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// This method should only be called on the serialQueue.
|
|
|
|
|
|
|
|
- (void)setExpirationForMessage:(TSMessage *)message expirationStartedAt:(uint64_t)expirationStartedAt
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
[self.databaseConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
|
|
|
|
|
|
|
|
[self setExpirationForMessage:message expirationStartedAt:expirationStartedAt transaction:transaction];
|
|
|
|
|
|
|
|
}];
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- (void)setExpirationForMessage:(TSMessage *)message
|
|
|
|
- (void)setExpirationForMessage:(TSMessage *)message
|
|
|
|
@ -186,114 +194,80 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int startedSecondsAgo = [NSDate new].timeIntervalSince1970 - expirationStartedAt / 1000.0;
|
|
|
|
NSTimeInterval startedSecondsAgo = ([NSDate ows_millisecondTimeStamp] - expirationStartedAt) / 1000.0;
|
|
|
|
DDLogDebug(@"%@ Starting expiration for message read %d seconds ago", self.logTag, startedSecondsAgo);
|
|
|
|
DDLogDebug(@"%@ Starting expiration for message read %f seconds ago", self.logTag, startedSecondsAgo);
|
|
|
|
|
|
|
|
|
|
|
|
// Don't clobber if multiple actions simultaneously triggered expiration.
|
|
|
|
// Don't clobber if multiple actions simultaneously triggered expiration.
|
|
|
|
if (message.expireStartedAt == 0 || message.expireStartedAt > expirationStartedAt) {
|
|
|
|
if (message.expireStartedAt == 0 || message.expireStartedAt > expirationStartedAt) {
|
|
|
|
[message updateWithExpireStartedAt:expirationStartedAt transaction:transaction];
|
|
|
|
[message updateWithExpireStartedAt:expirationStartedAt transaction:transaction];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Necessary that the async expiration run happens *after* the message is saved with expiration configuration.
|
|
|
|
[transaction addCompletionQueue:nil
|
|
|
|
[self runByDate:[NSDate ows_dateWithMillisecondsSince1970:message.expiresAt]];
|
|
|
|
completionBlock:^{
|
|
|
|
}
|
|
|
|
// Necessary that the async expiration run happens *after* the message is saved with it's new
|
|
|
|
|
|
|
|
// expiration configuration.
|
|
|
|
+ (void)setExpirationsForThread:(TSThread *)thread
|
|
|
|
[self scheduleRunByDate:[NSDate ows_dateWithMillisecondsSince1970:message.expiresAt]];
|
|
|
|
{
|
|
|
|
}];
|
|
|
|
dispatch_async(self.serialQueue, ^{
|
|
|
|
|
|
|
|
[[self sharedJob] setExpirationsForThread:thread];
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// This method should only be called on the serialQueue.
|
|
|
|
|
|
|
|
- (void)setExpirationsForThread:(TSThread *)thread
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
OWSBackgroundTask *_Nullable backgroundTask = [OWSBackgroundTask backgroundTaskWithLabelStr:__PRETTY_FUNCTION__];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
uint64_t now = [NSDate ows_millisecondTimeStamp];
|
|
|
|
|
|
|
|
[self.databaseConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
|
|
|
|
|
|
|
|
[self.disappearingMessagesFinder
|
|
|
|
|
|
|
|
enumerateUnstartedExpiringMessagesInThread:thread
|
|
|
|
|
|
|
|
block:^(TSMessage *_Nonnull message) {
|
|
|
|
|
|
|
|
DDLogWarn(
|
|
|
|
|
|
|
|
@"%@ Starting expiring message which should have already "
|
|
|
|
|
|
|
|
@"been started.",
|
|
|
|
|
|
|
|
self.logTag);
|
|
|
|
|
|
|
|
// specify "now" in case D.M. have since been disabled, but we have
|
|
|
|
|
|
|
|
// existing unstarted expiring messages that still need to expire.
|
|
|
|
|
|
|
|
[self setExpirationForMessage:message
|
|
|
|
|
|
|
|
expirationStartedAt:now
|
|
|
|
|
|
|
|
transaction:transaction];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
transaction:transaction];
|
|
|
|
|
|
|
|
}];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
backgroundTask = nil;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+ (void)becomeConsistentWithConfigurationForMessage:(TSMessage *)message
|
|
|
|
|
|
|
|
contactsManager:(id<ContactsManagerProtocol>)contactsManager
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
[[self sharedJob] becomeConsistentWithConfigurationForMessage:message contactsManager:contactsManager];
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- (void)becomeConsistentWithConfigurationForMessage:(TSMessage *)message
|
|
|
|
- (void)becomeConsistentWithConfigurationForMessage:(TSMessage *)message
|
|
|
|
contactsManager:(id<ContactsManagerProtocol>)contactsManager
|
|
|
|
contactsManager:(id<ContactsManagerProtocol>)contactsManager
|
|
|
|
|
|
|
|
transaction:(YapDatabaseReadWriteTransaction *)transaction
|
|
|
|
{
|
|
|
|
{
|
|
|
|
OWSAssert(message);
|
|
|
|
OWSAssert(message);
|
|
|
|
OWSAssert(contactsManager);
|
|
|
|
OWSAssert(contactsManager);
|
|
|
|
|
|
|
|
|
|
|
|
__block OWSBackgroundTask *_Nullable backgroundTask = [OWSBackgroundTask backgroundTaskWithLabelStr:__PRETTY_FUNCTION__];
|
|
|
|
__block OWSBackgroundTask *_Nullable backgroundTask = [OWSBackgroundTask backgroundTaskWithLabelStr:__PRETTY_FUNCTION__];
|
|
|
|
|
|
|
|
|
|
|
|
dispatch_async(OWSDisappearingMessagesJob.serialQueue, ^{
|
|
|
|
// Become eventually consistent in the case that the remote changed their settings at the same time.
|
|
|
|
// Become eventually consistent in the case that the remote changed their settings at the same time.
|
|
|
|
// Also in case remote doesn't support expiring messages
|
|
|
|
// Also in case remote doesn't support expiring messages
|
|
|
|
OWSDisappearingMessagesConfiguration *disappearingMessagesConfiguration =
|
|
|
|
OWSDisappearingMessagesConfiguration *disappearingMessagesConfiguration =
|
|
|
|
[OWSDisappearingMessagesConfiguration fetchOrCreateDefaultWithThreadId:message.uniqueThreadId
|
|
|
|
[OWSDisappearingMessagesConfiguration fetchOrCreateDefaultWithThreadId:message.uniqueThreadId];
|
|
|
|
transaction:transaction];
|
|
|
|
|
|
|
|
|
|
|
|
BOOL changed = NO;
|
|
|
|
BOOL changed = NO;
|
|
|
|
if (message.expiresInSeconds == 0) {
|
|
|
|
if (message.expiresInSeconds == 0) {
|
|
|
|
if (disappearingMessagesConfiguration.isEnabled) {
|
|
|
|
if (disappearingMessagesConfiguration.isEnabled) {
|
|
|
|
changed = YES;
|
|
|
|
|
|
|
|
DDLogWarn(@"%@ Received remote message which had no expiration set, disabling our expiration to become "
|
|
|
|
|
|
|
|
@"consistent.",
|
|
|
|
|
|
|
|
self.logTag);
|
|
|
|
|
|
|
|
disappearingMessagesConfiguration.enabled = NO;
|
|
|
|
|
|
|
|
[disappearingMessagesConfiguration save];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} else if (message.expiresInSeconds != disappearingMessagesConfiguration.durationSeconds) {
|
|
|
|
|
|
|
|
changed = YES;
|
|
|
|
changed = YES;
|
|
|
|
DDLogInfo(@"%@ Received remote message with different expiration set, updating our expiration to become "
|
|
|
|
DDLogWarn(@"%@ Received remote message which had no expiration set, disabling our expiration to become "
|
|
|
|
@"consistent.",
|
|
|
|
@"consistent.",
|
|
|
|
self.logTag);
|
|
|
|
self.logTag);
|
|
|
|
disappearingMessagesConfiguration.enabled = YES;
|
|
|
|
disappearingMessagesConfiguration.enabled = NO;
|
|
|
|
disappearingMessagesConfiguration.durationSeconds = message.expiresInSeconds;
|
|
|
|
[disappearingMessagesConfiguration saveWithTransaction:transaction];
|
|
|
|
[disappearingMessagesConfiguration save];
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} else if (message.expiresInSeconds != disappearingMessagesConfiguration.durationSeconds) {
|
|
|
|
|
|
|
|
changed = YES;
|
|
|
|
|
|
|
|
DDLogInfo(@"%@ Received remote message with different expiration set, updating our expiration to become "
|
|
|
|
|
|
|
|
@"consistent.",
|
|
|
|
|
|
|
|
self.logTag);
|
|
|
|
|
|
|
|
disappearingMessagesConfiguration.enabled = YES;
|
|
|
|
|
|
|
|
disappearingMessagesConfiguration.durationSeconds = message.expiresInSeconds;
|
|
|
|
|
|
|
|
[disappearingMessagesConfiguration saveWithTransaction:transaction];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!changed) {
|
|
|
|
if (!changed) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if ([message isKindOfClass:[TSIncomingMessage class]]) {
|
|
|
|
if ([message isKindOfClass:[TSIncomingMessage class]]) {
|
|
|
|
TSIncomingMessage *incomingMessage = (TSIncomingMessage *)message;
|
|
|
|
TSIncomingMessage *incomingMessage = (TSIncomingMessage *)message;
|
|
|
|
NSString *contactName = [contactsManager displayNameForPhoneIdentifier:incomingMessage.messageAuthorId];
|
|
|
|
NSString *contactName = [contactsManager displayNameForPhoneIdentifier:incomingMessage.messageAuthorId];
|
|
|
|
|
|
|
|
|
|
|
|
// We want the info message to appear _before_ the message.
|
|
|
|
// We want the info message to appear _before_ the message.
|
|
|
|
[[[OWSDisappearingConfigurationUpdateInfoMessage alloc] initWithTimestamp:message.timestamp - 1
|
|
|
|
[[[OWSDisappearingConfigurationUpdateInfoMessage alloc] initWithTimestamp:message.timestampForSorting - 1
|
|
|
|
thread:message.thread
|
|
|
|
thread:message.thread
|
|
|
|
configuration:disappearingMessagesConfiguration
|
|
|
|
configuration:disappearingMessagesConfiguration
|
|
|
|
createdByRemoteName:contactName] save];
|
|
|
|
createdByRemoteName:contactName]
|
|
|
|
} else {
|
|
|
|
saveWithTransaction:transaction];
|
|
|
|
// We want the info message to appear _before_ the message.
|
|
|
|
} else {
|
|
|
|
[[[OWSDisappearingConfigurationUpdateInfoMessage alloc] initWithTimestamp:message.timestamp - 1
|
|
|
|
// We want the info message to appear _before_ the message.
|
|
|
|
thread:message.thread
|
|
|
|
[[[OWSDisappearingConfigurationUpdateInfoMessage alloc] initWithTimestamp:message.timestampForSorting - 1
|
|
|
|
configuration:disappearingMessagesConfiguration]
|
|
|
|
thread:message.thread
|
|
|
|
save];
|
|
|
|
configuration:disappearingMessagesConfiguration]
|
|
|
|
}
|
|
|
|
saveWithTransaction:transaction];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
backgroundTask = nil;
|
|
|
|
backgroundTask = nil;
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- (void)startIfNecessary
|
|
|
|
- (void)startIfNecessary
|
|
|
|
@ -304,33 +278,27 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
}
|
|
|
|
}
|
|
|
|
self.hasStarted = YES;
|
|
|
|
self.hasStarted = YES;
|
|
|
|
|
|
|
|
|
|
|
|
[self runNow];
|
|
|
|
dispatch_async(OWSDisappearingMessagesJob.serialQueue, ^{
|
|
|
|
|
|
|
|
[self runLoop];
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- (void)runNow
|
|
|
|
- (NSDateFormatter *)dateFormatter
|
|
|
|
{
|
|
|
|
{
|
|
|
|
[self runByDate:[NSDate new] ignoreMinDelay:YES];
|
|
|
|
static NSDateFormatter *dateFormatter;
|
|
|
|
}
|
|
|
|
static dispatch_once_t onceToken;
|
|
|
|
|
|
|
|
dispatch_once(&onceToken, ^{
|
|
|
|
- (NSTimeInterval)maxDelaySeconds
|
|
|
|
dateFormatter = [NSDateFormatter new];
|
|
|
|
{
|
|
|
|
dateFormatter.dateStyle = NSDateFormatterNoStyle;
|
|
|
|
// Don't run less often than once per N minutes.
|
|
|
|
dateFormatter.timeStyle = kCFDateFormatterMediumStyle;
|
|
|
|
return 5 * kMinuteInterval;
|
|
|
|
dateFormatter.locale = [NSLocale systemLocale];
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
// Waits the maximum amount of time to run again.
|
|
|
|
|
|
|
|
- (void)runLater
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
[self runByDate:[NSDate dateWithTimeIntervalSinceNow:self.maxDelaySeconds] ignoreMinDelay:YES];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- (void)runByDate:(NSDate *)date
|
|
|
|
return dateFormatter;
|
|
|
|
{
|
|
|
|
|
|
|
|
[self runByDate:date ignoreMinDelay:NO];
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- (void)runByDate:(NSDate *)date ignoreMinDelay:(BOOL)ignoreMinDelay
|
|
|
|
- (void)scheduleRunByDate:(NSDate *)date
|
|
|
|
{
|
|
|
|
{
|
|
|
|
OWSAssert(date);
|
|
|
|
OWSAssert(date);
|
|
|
|
|
|
|
|
|
|
|
|
@ -340,44 +308,39 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
NSDateFormatter *dateFormatter = [NSDateFormatter new];
|
|
|
|
|
|
|
|
dateFormatter.dateStyle = NSDateFormatterNoStyle;
|
|
|
|
|
|
|
|
dateFormatter.timeStyle = kCFDateFormatterMediumStyle;
|
|
|
|
|
|
|
|
dateFormatter.locale = [NSLocale systemLocale];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Don't run more often than once per second.
|
|
|
|
// Don't run more often than once per second.
|
|
|
|
const NSTimeInterval kMinDelaySeconds = ignoreMinDelay ? 0.f : 1.f;
|
|
|
|
const NSTimeInterval kMinDelaySeconds = 1.0;
|
|
|
|
NSTimeInterval delaySeconds
|
|
|
|
NSTimeInterval delaySeconds = MAX(kMinDelaySeconds, date.timeIntervalSinceNow);
|
|
|
|
= MAX(kMinDelaySeconds, MIN(self.maxDelaySeconds, [date timeIntervalSinceDate:[NSDate new]]));
|
|
|
|
NSDate *newTimerScheduleDate = [NSDate dateWithTimeIntervalSinceNow:delaySeconds];
|
|
|
|
NSDate *timerScheduleDate = [NSDate dateWithTimeIntervalSinceNow:delaySeconds];
|
|
|
|
if (self.nextDisappearanceDate && [self.nextDisappearanceDate isBeforeDate:newTimerScheduleDate]) {
|
|
|
|
if (self.timerScheduleDate && [timerScheduleDate timeIntervalSinceDate:self.timerScheduleDate] > 0) {
|
|
|
|
DDLogVerbose(@"%@ Request to run at %@ (%d sec.) ignored due to earlier scheduled run at %@ (%d sec.)",
|
|
|
|
DDLogVerbose(@"%@ Request to run at %@ (%d sec.) ignored due to scheduled run at %@ (%d sec.)",
|
|
|
|
|
|
|
|
self.logTag,
|
|
|
|
self.logTag,
|
|
|
|
[dateFormatter stringFromDate:date],
|
|
|
|
[self.dateFormatter stringFromDate:date],
|
|
|
|
(int)round(MAX(0, [date timeIntervalSinceDate:[NSDate new]])),
|
|
|
|
(int)round(MAX(0, [date timeIntervalSinceDate:[NSDate new]])),
|
|
|
|
[dateFormatter stringFromDate:self.timerScheduleDate],
|
|
|
|
[self.dateFormatter stringFromDate:self.nextDisappearanceDate],
|
|
|
|
(int)round(MAX(0, [self.timerScheduleDate timeIntervalSinceDate:[NSDate new]])));
|
|
|
|
(int)round(MAX(0, [self.nextDisappearanceDate timeIntervalSinceDate:[NSDate new]])));
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Update Schedule
|
|
|
|
// Update Schedule
|
|
|
|
DDLogVerbose(@"%@ Scheduled run at %@ (%d sec.)",
|
|
|
|
DDLogVerbose(@"%@ Scheduled run at %@ (%d sec.)",
|
|
|
|
self.logTag,
|
|
|
|
self.logTag,
|
|
|
|
[dateFormatter stringFromDate:timerScheduleDate],
|
|
|
|
[self.dateFormatter stringFromDate:newTimerScheduleDate],
|
|
|
|
(int)round(MAX(0, [timerScheduleDate timeIntervalSinceDate:[NSDate new]])));
|
|
|
|
(int)round(MAX(0, [newTimerScheduleDate timeIntervalSinceDate:[NSDate new]])));
|
|
|
|
[self resetTimer];
|
|
|
|
[self resetNextDisappearanceTimer];
|
|
|
|
self.timerScheduleDate = timerScheduleDate;
|
|
|
|
self.nextDisappearanceDate = newTimerScheduleDate;
|
|
|
|
self.timer = [NSTimer weakScheduledTimerWithTimeInterval:delaySeconds
|
|
|
|
self.nextDisappearanceTimer = [NSTimer weakScheduledTimerWithTimeInterval:delaySeconds
|
|
|
|
target:self
|
|
|
|
target:self
|
|
|
|
selector:@selector(timerDidFire)
|
|
|
|
selector:@selector(disappearanceTimerDidFire)
|
|
|
|
userInfo:nil
|
|
|
|
userInfo:nil
|
|
|
|
repeats:NO];
|
|
|
|
repeats:NO];
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- (void)timerDidFire
|
|
|
|
- (void)disappearanceTimerDidFire
|
|
|
|
{
|
|
|
|
{
|
|
|
|
OWSAssertIsOnMainThread();
|
|
|
|
OWSAssertIsOnMainThread();
|
|
|
|
|
|
|
|
DDLogDebug(@"%@ in %s", self.logTag, __PRETTY_FUNCTION__);
|
|
|
|
|
|
|
|
|
|
|
|
if (!CurrentAppContext().isMainAppAndActive) {
|
|
|
|
if (!CurrentAppContext().isMainAppAndActive) {
|
|
|
|
// Don't schedule run when inactive or not in main app.
|
|
|
|
// Don't schedule run when inactive or not in main app.
|
|
|
|
@ -385,20 +348,43 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
[self resetTimer];
|
|
|
|
[self resetNextDisappearanceTimer];
|
|
|
|
|
|
|
|
|
|
|
|
dispatch_async(OWSDisappearingMessagesJob.serialQueue, ^{
|
|
|
|
dispatch_async(OWSDisappearingMessagesJob.serialQueue, ^{
|
|
|
|
[self runLoop];
|
|
|
|
[self runLoop];
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- (void)resetTimer
|
|
|
|
- (void)fallbackTimerDidFire
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
OWSAssertIsOnMainThread();
|
|
|
|
|
|
|
|
DDLogDebug(@"%@ in %s", self.logTag, __PRETTY_FUNCTION__);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
BOOL recentlyScheduledDisappearanceTimer = NO;
|
|
|
|
|
|
|
|
if (fabs(self.nextDisappearanceDate.timeIntervalSinceNow) < 1.0) {
|
|
|
|
|
|
|
|
recentlyScheduledDisappearanceTimer = YES;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dispatch_async(OWSDisappearingMessagesJob.serialQueue, ^{
|
|
|
|
|
|
|
|
NSUInteger deletedCount = [self runLoop];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Normally deletions should happen via the disappearanceTimer, to make sure that they're timely.
|
|
|
|
|
|
|
|
// So, if we're deleting something via the fallback timer, something may have gone wrong. The
|
|
|
|
|
|
|
|
// exception is if we're in close proximity to the disappearanceTimer, in which case a race condition
|
|
|
|
|
|
|
|
// is inevitable.
|
|
|
|
|
|
|
|
if (!recentlyScheduledDisappearanceTimer && deletedCount > 0) {
|
|
|
|
|
|
|
|
OWSProdLogAndFail(@"%@ unexpectedly deleted disappearing messages via fallback timer.");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- (void)resetNextDisappearanceTimer
|
|
|
|
{
|
|
|
|
{
|
|
|
|
OWSAssertIsOnMainThread();
|
|
|
|
OWSAssertIsOnMainThread();
|
|
|
|
|
|
|
|
|
|
|
|
[self.timer invalidate];
|
|
|
|
[self.nextDisappearanceTimer invalidate];
|
|
|
|
self.timer = nil;
|
|
|
|
self.nextDisappearanceTimer = nil;
|
|
|
|
self.timerScheduleDate = nil;
|
|
|
|
self.nextDisappearanceDate = nil;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#pragma mark - Notifications
|
|
|
|
#pragma mark - Notifications
|
|
|
|
@ -408,7 +394,9 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
OWSAssertIsOnMainThread();
|
|
|
|
OWSAssertIsOnMainThread();
|
|
|
|
|
|
|
|
|
|
|
|
[AppReadiness runNowOrWhenAppIsReady:^{
|
|
|
|
[AppReadiness runNowOrWhenAppIsReady:^{
|
|
|
|
[self runNow];
|
|
|
|
dispatch_async(OWSDisappearingMessagesJob.serialQueue, ^{
|
|
|
|
|
|
|
|
[self runLoop];
|
|
|
|
|
|
|
|
});
|
|
|
|
}];
|
|
|
|
}];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -416,7 +404,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
{
|
|
|
|
{
|
|
|
|
OWSAssertIsOnMainThread();
|
|
|
|
OWSAssertIsOnMainThread();
|
|
|
|
|
|
|
|
|
|
|
|
[self resetTimer];
|
|
|
|
[self resetNextDisappearanceTimer];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@end
|
|
|
|
@end
|
|
|
|
|
Michael Kirk
7 years ago