signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Respond to CR.

Browse Source
This commit is contained in:
Matthew Chen 2019-09-27 09:50:40 -03:00
parent 28fbf98fea
commit 1d2d075e98
6 changed files with 52 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m
View File

@ -209,6 +209,9 @@ NS_ASSUME_NONNULL_BEGIN
nonUdRecipientAddresses:transcript.nonUdRecipientAddresses
isSentUpdate:NO
transaction:transaction];
// The insert and update methods above may start expiration for this message, but
// transcript.expirationStartedAt may be earlier, so we need to pass that to
// the OWSDisappearingMessagesJob in case it needs to back-date the expiration.
[[OWSDisappearingMessagesJob sharedJob] startAnyExpirationForMessage:outgoingMessage
expirationStartedAt:transcript.expirationStartedAt
transaction:transaction];

4
SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m
View File

@ -222,10 +222,6 @@ const NSUInteger TSIncomingMessageSchemaVersion = 1;
object:self];
}];
[[OWSDisappearingMessagesJob sharedJob] startAnyExpirationForMessage:self
expirationStartedAt:readTimestamp
transaction:transaction];
if (sendReadReceipt) {
[OWSReadReceiptManager.sharedManager messageWasReadLocally:self];
}

30
SignalServiceKit/src/Messages/Interactions/TSMessage.m
View File

@ -13,6 +13,7 @@
#import "TSThread.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/NSString+OWS.h>
#import <SignalServiceKit/OWSDisappearingMessagesJob.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN
@ -506,6 +507,13 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
[self updateStoredShouldStartExpireTimer];
}
- (void)anyDidInsertWithTransaction:(SDSAnyWriteTransaction *)transaction
{
[super anyDidInsertWithTransaction:transaction];
[self ensurePerConversationExpirationWithTransaction:transaction];
}
- (void)anyWillUpdateWithTransaction:(SDSAnyWriteTransaction *)transaction
{
[super anyWillUpdateWithTransaction:transaction];
@ -513,6 +521,28 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
[self updateStoredShouldStartExpireTimer];
}
- (void)anyDidUpdateWithTransaction:(SDSAnyWriteTransaction *)transaction
{
[super anyDidUpdateWithTransaction:transaction];
[self ensurePerConversationExpirationWithTransaction:transaction];
}
- (void)ensurePerConversationExpirationWithTransaction:(SDSAnyWriteTransaction *)transaction
{
if (self.expireStartedAt > 0) {
// Expiration already started.
return;
}
if (![self shouldStartExpireTimer]) {
return;
}
uint64_t nowMs = [NSDate ows_millisecondTimeStamp];
[[OWSDisappearingMessagesJob sharedJob] startAnyExpirationForMessage:self
expirationStartedAt:nowMs
transaction:transaction];
}
- (void)updateStoredShouldStartExpireTimer
{
_storedShouldStartExpireTimer = [self shouldStartExpireTimer];

68
SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
View File

@ -17,7 +17,6 @@
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/NSString+OWS.h>
#import <SignalServiceKit/AppReadiness.h>
#import <SignalServiceKit/OWSDisappearingMessagesJob.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
#import <YapDatabase/YapDatabase.h>
#import <YapDatabase/YapDatabaseTransaction.h>
@ -640,24 +639,26 @@ NSUInteger const TSOutgoingMessageSchemaVersion = 1;
//
// TODO: Revisit this decision.
if (!self.hasPerConversationExpiration) {
return NO;
} else if (self.messageState == TSOutgoingMessageStateSent) {
return YES;
} else {
if (self.expireStartedAt > 0) {
// Our initial migration to populate the recipient state map was incomplete. It's since been
// addressed, but it's possible there are edge cases where a previously sent message would
// no longer be considered sent.
// So here we take extra care not to stop any expiration that had previously started.
// This can also happen under normal cirumstances with an outgoing group message.
OWSFailDebug(@"expiration previously started");
return YES;
}
if (!super.shouldStartExpireTimer) {
return NO;
}
if (self.messageState == TSOutgoingMessageStateSent) {
return YES;
}
if (self.expireStartedAt > 0) {
// Our initial migration to populate the recipient state map was incomplete. It's since been
// addressed, but it's possible there are edge cases where a previously sent message would
// no longer be considered sent.
// So here we take extra care not to stop any expiration that had previously started.
// This can also happen under normal cirumstances with an outgoing group message.
OWSFailDebug(@"expiration previously started");
return YES;
}
return NO;
}
- (BOOL)isSilent
@ -764,8 +765,6 @@ NSUInteger const TSOutgoingMessageSchemaVersion = 1;
}
[message setMostRecentFailureText:error.localizedDescription];
}];
[self ensurePerConversationExpirationWithTransaction:transaction];
}
- (void)updateWithAllSendingRecipientsMarkedAsFailedWithTansaction:(SDSAnyWriteTransaction *)transaction
@ -783,8 +782,6 @@ NSUInteger const TSOutgoingMessageSchemaVersion = 1;
}
}
}];
[self ensurePerConversationExpirationWithTransaction:transaction];
}
- (void)updateAllUnsentRecipientsAsSendingWithTransaction:(SDSAnyWriteTransaction *)transaction;
@ -802,8 +799,6 @@ NSUInteger const TSOutgoingMessageSchemaVersion = 1;
}
}
}];
[self ensurePerConversationExpirationWithTransaction:transaction];
}
- (void)updateWithHasSyncedTranscript:(BOOL)hasSyncedTranscript transaction:(SDSAnyWriteTransaction *)transaction
@ -851,23 +846,6 @@ NSUInteger const TSOutgoingMessageSchemaVersion = 1;
recipientState.state = OWSOutgoingMessageRecipientStateSent;
recipientState.wasSentByUD = wasSentByUD;
}];
[self ensurePerConversationExpirationWithTransaction:transaction];
}
- (void)ensurePerConversationExpirationWithTransaction:(SDSAnyWriteTransaction *)transaction
{
if (![self shouldStartExpireTimer]) {
return;
}
if (self.expireStartedAt > 0) {
// Expiration already started.
return;
}
uint64_t nowMs = [NSDate ows_millisecondTimeStamp];
[[OWSDisappearingMessagesJob sharedJob] startAnyExpirationForMessage:self
expirationStartedAt:nowMs
transaction:transaction];
}
- (void)updateWithSkippedRecipient:(SignalServiceAddress *)recipientAddress
@ -887,8 +865,6 @@ NSUInteger const TSOutgoingMessageSchemaVersion = 1;
}
recipientState.state = OWSOutgoingMessageRecipientStateSkipped;
}];
[self ensurePerConversationExpirationWithTransaction:transaction];
}
- (void)updateWithDeliveredRecipient:(SignalServiceAddress *)recipientAddress
@ -918,8 +894,6 @@ NSUInteger const TSOutgoingMessageSchemaVersion = 1;
recipientState.state = OWSOutgoingMessageRecipientStateSent;
recipientState.deliveryTimestamp = deliveryTimestamp;
}];
[self ensurePerConversationExpirationWithTransaction:transaction];
}
- (void)updateWithReadRecipient:(SignalServiceAddress *)recipientAddress
@ -944,8 +918,6 @@ NSUInteger const TSOutgoingMessageSchemaVersion = 1;
recipientState.state = OWSOutgoingMessageRecipientStateSent;
recipientState.readTimestamp = @(readTimestamp);
}];
[self ensurePerConversationExpirationWithTransaction:transaction];
}
- (void)updateWithWasSentFromLinkedDeviceWithUDRecipientAddresses:
@ -1029,8 +1001,6 @@ NSUInteger const TSOutgoingMessageSchemaVersion = 1;
[message setIsFromLinkedDevice:YES];
}
}];
[self ensurePerConversationExpirationWithTransaction:transaction];
}
- (void)updateWithSendingToSingleGroupRecipient:(SignalServiceAddress *)singleGroupRecipient
@ -1048,8 +1018,6 @@ NSUInteger const TSOutgoingMessageSchemaVersion = 1;
singleGroupRecipient : recipientState,
}];
}];
[self ensurePerConversationExpirationWithTransaction:transaction];
}
- (nullable NSNumber *)firstRecipientReadTimestamp

2
SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m
View File

@ -182,7 +182,7 @@ void AssertIsOnDisappearingMessagesQueue()
{
OWSAssertDebug(transaction);
if (!message.hasPerConversationExpiration) {
if (!message.shouldStartExpireTimer) {
return;
}

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

@ -1521,10 +1521,6 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
return;
}
TSOutgoingMessage *latestMessage = (TSOutgoingMessage *)latestCopy;
[[OWSDisappearingMessagesJob sharedJob] startAnyExpirationForMessage:latestMessage
expirationStartedAt:[NSDate ows_millisecondTimeStamp]
transaction:transaction];
[ViewOnceMessages completeIfNecessaryWithMessage:latestMessage transaction:transaction];
}];