Fix note to self

pull/70/head
Niels Andriesse 6 years ago
parent c40a5f933e
commit 2a054c34ba

@ -1649,12 +1649,14 @@ typedef enum : NSUInteger {
if ([self.thread isKindOfClass:TSContactThread.class]) { if ([self.thread isKindOfClass:TSContactThread.class]) {
NSString *senderID = ((TSContactThread *)self.thread).contactIdentifier; NSString *senderID = ((TSContactThread *)self.thread).contactIdentifier;
__block NSSet<TSContactThread *> *linkedDeviceThreads; __block NSSet<TSContactThread *> *linkedDeviceThreads;
__block BOOL isNoteToSelf;
[OWSPrimaryStorage.sharedManager.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { [OWSPrimaryStorage.sharedManager.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
linkedDeviceThreads = [LKDatabaseUtilities getLinkedDeviceThreadsFor:senderID in:transaction]; linkedDeviceThreads = [LKDatabaseUtilities getLinkedDeviceThreadsFor:senderID in:transaction];
isNoteToSelf = [LKDatabaseUtilities isUserLinkedDevice:senderID in:transaction];
}]; }];
if ([linkedDeviceThreads contains:^BOOL(TSContactThread *thread) { if ([linkedDeviceThreads contains:^BOOL(TSContactThread *thread) {
return thread.isContactFriend; return thread.isContactFriend;
}]) { }] || isNoteToSelf) {
isEnabled = true; isEnabled = true;
isAttachmentButtonHidden = false; isAttachmentButtonHidden = false;
} else if (![linkedDeviceThreads contains:^BOOL(TSContactThread *thread) { } else if (![linkedDeviceThreads contains:^BOOL(TSContactThread *thread) {

@ -678,7 +678,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
[OWSPrimaryStorage.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) { [OWSPrimaryStorage.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
isNoteToSelf = [LKDatabaseUtilities isUserLinkedDevice:((TSContactThread *)thread).contactIdentifier in:transaction]; isNoteToSelf = [LKDatabaseUtilities isUserLinkedDevice:((TSContactThread *)thread).contactIdentifier in:transaction];
}]; }];
if (isNoteToSelf && message.shouldSyncTranscript) { if (isNoteToSelf) {
[self sendSyncTranscriptForMessage:message isRecipientUpdate:NO success:^{ } failure:^(NSError *error) { }]; [self sendSyncTranscriptForMessage:message isRecipientUpdate:NO success:^{ } failure:^(NSError *error) { }];
successHandler(); successHandler();
return; return;

Loading…
Cancel
Save