Merge branch 'charlesmchen/temporaryAttachmentsVsAppReady_' into release/2.43.0

This commit is contained in:
Matthew Chen 2019-09-20 21:10:46 -03:00
commit 5da9bbb997

View File

@ -16,6 +16,7 @@
#import "TSQuotedMessage.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/NSString+OWS.h>
#import <SignalServiceKit/AppReadiness.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
#import <YapDatabase/YapDatabase.h>
#import <YapDatabase/YapDatabaseTransaction.h>
@ -512,6 +513,11 @@ NSUInteger const TSOutgoingMessageSchemaVersion = 1;
// Message is not transient; no need to clean up attachments.
return;
}
if (!AppReadiness.isAppReady) {
// We don't want or need to do this clean up while registering extensions,
// migrating, etc.
return;
}
NSArray<NSString *> *_Nullable attachmentIds = self.attachmentIds;
if (attachmentIds.count < 1) {
return;